From b1b65e4676aa1b66f66c4b46b6a2e66df9f108b7 Mon Sep 17 00:00:00 2001 From: Will Date: Sun, 17 Apr 2016 09:57:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1=E3=80=81=E8=AE=BE=E7=BD=AEMicrosoft.Web.I?= =?UTF-8?q?nfrastructure=20=E5=A4=8D=E5=88=B6=E5=88=B0=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=BAfalse=202=E3=80=81=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=9C=A8mono=E4=B8=8A=E8=BF=90=E8=A1=8C=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCode/App_Start/BlogEngineConfig.cs | 20 +++++++++---------- .../BlogEngine.NET/BlogEngine.NET.csproj | 4 ++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs b/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs index ddb0c1f77..4920f7072 100644 --- a/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs +++ b/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs @@ -36,14 +36,14 @@ public static void Initialize(HttpContext context) RegisterDiCintainer(); - ScriptManager.ScriptResourceMapping.AddDefinition("jquery", - new ScriptResourceDefinition - { - Path = "~/Scripts/jquery-2.1.4.min.js", - DebugPath = "~/Scripts/jquery-2.1.4.js", - CdnPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.4.min.js", - CdnDebugPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.4.js" - }); + //ScriptManager.ScriptResourceMapping.AddDefinition("jquery", + // new ScriptResourceDefinition + // { + // Path = "~/Scripts/jquery-2.1.4.min.js", + // DebugPath = "~/Scripts/jquery-2.1.4.js", + // CdnPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.4.min.js", + // CdnDebugPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.4.js" + // }); _initializedAlready = true; } @@ -105,7 +105,7 @@ static void RegisterBundles(BundleCollection bundles) bundles.Add( new ScriptBundle("~/scripts/blogadmin") - .Include("~/Scripts/jquery-{version}.js") + .Include("~/Scripts/jquery-2.1.4.js") .Include("~/Scripts/jquery.form.js") .Include("~/Scripts/jquery.validate.js") .Include("~/Scripts/jquery-ui.js") @@ -151,7 +151,7 @@ static void RegisterBundles(BundleCollection bundles) bundles.Add( new ScriptBundle("~/scripts/wysiwyg") - .Include("~/scripts/jquery-{version}.js") + .Include("~/scripts/jquery-2.1.4.js") .Include("~/scripts/jquery.form.js") .Include("~/scripts/jquery.validate.js") .Include("~/scripts/toastr.js") diff --git a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj index b9fdf837c..fe610ad78 100644 --- a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj +++ b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj @@ -48,6 +48,7 @@ False ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + False ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll @@ -613,6 +614,7 @@ + @@ -759,6 +761,8 @@ + + From 9b3d4c1d2efc403e81355d427af049551ec0d3b2 Mon Sep 17 00:00:00 2001 From: Will Date: Sun, 17 Apr 2016 15:35:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3linux=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCode/App_Start/BlogEngineConfig.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs b/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs index 4920f7072..fffba19c7 100644 --- a/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs +++ b/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs @@ -115,8 +115,8 @@ static void RegisterBundles(BundleCollection bundles) .Include("~/Scripts/Q.js") .Include("~/Scripts/angular.min.js") .Include("~/Scripts/angular-route.min.js") - .Include("~/Scripts/angular-sanitize.min.js") - + .Include("~/Scripts/angular-sanitize.min.js") + .Include("~/admin/app/app.js") .Include("~/admin/app/listpager.js") .Include("~/admin/app/grid-helpers.js") @@ -146,22 +146,22 @@ static void RegisterBundles(BundleCollection bundles) .Include("~/admin/app/settings/settingController.js") .Include("~/admin/app/settings/tools/toolController.js") .Include("~/admin/app/settings/controls/blogrollController.js") - .Include("~/admin/app/settings/controls/pingController.js") + .Include("~/admin/app/settings/controls/pingController.js") ); bundles.Add( new ScriptBundle("~/scripts/wysiwyg") - .Include("~/scripts/jquery-2.1.4.js") - .Include("~/scripts/jquery.form.js") - .Include("~/scripts/jquery.validate.js") - .Include("~/scripts/toastr.js") - .Include("~/scripts/Q.js") + .Include("~/Scripts/jquery-2.1.4.js") + .Include("~/Scripts/jquery.form.js") + .Include("~/Scripts/jquery.validate.js") + .Include("~/Scripts/toastr.js") + .Include("~/Scripts/Q.js") .Include("~/Scripts/angular.min.js") .Include("~/Scripts/angular-route.min.js") - .Include("~/Scripts/angular-sanitize.min.js") - .Include("~/scripts/bootstrap.js") - .Include("~/scripts/textext.js") - .Include("~/scripts/moment.js") + .Include("~/Scripts/angular-sanitize.min.js") + .Include("~/Scripts/bootstrap.js") + .Include("~/Scripts/textext.js") + .Include("~/Scripts/moment.js") .Include("~/admin/app/app.js") .Include("~/admin/app/grid-helpers.js") .Include("~/admin/app/editor/editor-helpers.js") From 37735c645379680a206ae97a67117f15753b93a2 Mon Sep 17 00:00:00 2001 From: Will Date: Fri, 22 Apr 2016 10:40:00 +0800 Subject: [PATCH 3/5] change syntaxhighlighter path --- BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs b/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs index fffba19c7..7b0955ffa 100644 --- a/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs +++ b/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs @@ -79,7 +79,7 @@ static void RegisterBundles(BundleCollection bundles) ); // syntax highlighter - var shRoot = "~/scripts/syntaxhighlighter/"; + var shRoot = "~/Scripts/syntaxhighlighter/"; bundles.Add(new StyleBundle("~/Content/highlighter").Include( shRoot + "styles/shCore.css", shRoot + "styles/shThemeDefault.css") From 7b90a7fa3f1f8eccb67f650e15e2d9b1dc1a17cd Mon Sep 17 00:00:00 2001 From: Will Date: Sun, 22 May 2016 10:21:52 +0800 Subject: [PATCH 4/5] merge --- BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj index c03dd6a30..a8bad1715 100644 --- a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj +++ b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj @@ -48,6 +48,7 @@ False ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + False ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll @@ -2444,7 +2445,7 @@ - True + False True 64079 / From 65fe01fdebfc06321c036dca4b7a483e750012fc Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 2 Mar 2023 16:32:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AF=8D=E7=89=88?= =?UTF-8?q?=E9=A1=B5=E7=BC=BA=E5=B0=91=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=20System.Linq=20=E5=BC=95=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E5=A4=8D=20Utils.RecycleIIS()=20=E5=9C=A8?= =?UTF-8?q?Linux=E4=B8=AD=E6=89=BE=E4=B8=8D=E5=88=B0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BlogEngine/BlogEngine.Core/Helpers/Utils.cs | 2 +- BlogEngine/BlogEngine.NET/Web.Config | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/BlogEngine/BlogEngine.Core/Helpers/Utils.cs b/BlogEngine/BlogEngine.Core/Helpers/Utils.cs index d790bd134..9ab844c9a 100644 --- a/BlogEngine/BlogEngine.Core/Helpers/Utils.cs +++ b/BlogEngine/BlogEngine.Core/Helpers/Utils.cs @@ -1425,7 +1425,7 @@ public static bool RecycleIIS() //} //catch { } - string webConfigPath = HttpContext.Current.Request.PhysicalApplicationPath + "\\web.config"; + string webConfigPath = Path.Combine(HttpContext.Current.Request.PhysicalApplicationPath, "web.config"); try { File.SetLastWriteTimeUtc(webConfigPath, DateTime.UtcNow); diff --git a/BlogEngine/BlogEngine.NET/Web.Config b/BlogEngine/BlogEngine.NET/Web.Config index e698ac4f5..8b2001250 100644 --- a/BlogEngine/BlogEngine.NET/Web.Config +++ b/BlogEngine/BlogEngine.NET/Web.Config @@ -99,6 +99,9 @@ + + +