.Net Core 3.1

SeriaWei · Dec 4, 2019 · 5bb1444 · 5bb1444
1 parent a727d79
commit 5bb1444
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ZKEACMS Build With Asp.Net Core 3.0
+# ZKEACMS Build With Asp.Net Core 3.1
 
 ZKEACMS is a visual design, **WYSIWYG** Content Management System.
 

diff --git a/src/EasyFrameWork/EasyFrameWork.csproj b/src/EasyFrameWork/EasyFrameWork.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>EasyFrameWork</AssemblyName>
     <PackageId>EasyFrameWork</PackageId>
     <Copyright>深圳市纸壳软件科技有限公司 ZKEASOFT</Copyright>
@@ -18,13 +18,13 @@
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.10.0-beta0002" />
     <PackageReference Include="IdGen" Version="2.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.0.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
     <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.6.0" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
     <PackageReference Include="CacheManager.Core" Version="2.0.0-beta-1629" />
   </ItemGroup>

diff --git a/src/EasyFrameWork/Mvc/Plugin/Loader.cs b/src/EasyFrameWork/Mvc/Plugin/Loader.cs
@@ -20,9 +20,9 @@ public class Loader : IPluginLoader
         public const string PluginFolder = "Plugins";
         private const string PluginInfoFile = "zkea.plugin";
 #if DEBUG
-        private string[] AltDevelopmentPath = new[] { "bin", "Debug", "netcoreapp3.0" };
+        private string[] AltDevelopmentPath = new[] { "bin", "Debug", "netcoreapp3.1" };
 #else
-        private string[] AltDevelopmentPath = new[] { "bin", "Release", "netcoreapp3.0" };
+        private string[] AltDevelopmentPath = new[] { "bin", "Release", "netcoreapp3.1" };
 #endif
         private static List<AssemblyLoader> Loaders = new List<AssemblyLoader>();
         private static Dictionary<string, Assembly> LoadedAssemblies = new Dictionary<string, Assembly>();

diff --git a/src/ZKEACMS.Article/ZKEACMS.Article.csproj b/src/ZKEACMS.Article/ZKEACMS.Article.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.Article</AssemblyName>
     <PackageId>ZKEACMS.Article</PackageId>

diff --git a/src/ZKEACMS.FormGenerator/ZKEACMS.FormGenerator.csproj b/src/ZKEACMS.FormGenerator/ZKEACMS.FormGenerator.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.FormGenerator</AssemblyName>
     <PackageId>ZKEACMS.FormGenerator</PackageId>

diff --git a/src/ZKEACMS.GlobalScripts/ZKEACMS.GlobalScripts.csproj b/src/ZKEACMS.GlobalScripts/ZKEACMS.GlobalScripts.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.GlobalScripts</AssemblyName>
     <PackageId>ZKEACMS.GlobalScripts</PackageId>

diff --git a/src/ZKEACMS.Message/ZKEACMS.Message.csproj b/src/ZKEACMS.Message/ZKEACMS.Message.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.Message</AssemblyName>
     <PackageId>ZKEACMS.Message</PackageId>

diff --git a/src/ZKEACMS.Product/ZKEACMS.Product.csproj b/src/ZKEACMS.Product/ZKEACMS.Product.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.Product</AssemblyName>
     <PackageId>ZKEACMS.Product</PackageId>

diff --git a/src/ZKEACMS.Redirection/ZKEACMS.Redirection.csproj b/src/ZKEACMS.Redirection/ZKEACMS.Redirection.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.Redirection</AssemblyName>
     <PackageId>ZKEACMS.Redirection</PackageId>

diff --git a/src/ZKEACMS.SectionWidget/ZKEACMS.SectionWidget.csproj b/src/ZKEACMS.SectionWidget/ZKEACMS.SectionWidget.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.SectionWidget</AssemblyName>
     <PackageId>ZKEACMS.SectionWidget</PackageId>

diff --git a/src/ZKEACMS.Shop/ZKEACMS.Shop.csproj b/src/ZKEACMS.Shop/ZKEACMS.Shop.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.Shop</AssemblyName>
     <PackageId>ZKEACMS.Shop</PackageId>

diff --git a/src/ZKEACMS.SiteSearch/ZKEACMS.SiteSearch.csproj b/src/ZKEACMS.SiteSearch/ZKEACMS.SiteSearch.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.SiteSearch</AssemblyName>
     <PackageId>ZKEACMS.SiteSearch</PackageId>

diff --git a/src/ZKEACMS.Sitemap/ZKEACMS.Sitemap.csproj b/src/ZKEACMS.Sitemap/ZKEACMS.Sitemap.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.Sitemap</AssemblyName>
     <PackageId>ZKEACMS.Sitemap</PackageId>

diff --git a/src/ZKEACMS.StyleEditor/ZKEACMS.StyleEditor.csproj b/src/ZKEACMS.StyleEditor/ZKEACMS.StyleEditor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.StyleEditor</AssemblyName>
     <PackageId>ZKEACMS.StyleEditor</PackageId>

diff --git a/src/ZKEACMS.TemplateImporter/ZKEACMS.TemplateImporter.csproj b/src/ZKEACMS.TemplateImporter/ZKEACMS.TemplateImporter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.TemplateImporter</AssemblyName>
     <PackageId>ZKEACMS.TemplateImporter</PackageId>
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.16" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.17" />
     <ProjectReference Include="..\ZKEACMS\ZKEACMS.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/ZKEACMS.Updater/CurrentDbContext.cs b/src/ZKEACMS.Updater/CurrentDbContext.cs
@@ -6,6 +6,7 @@
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
+using System;
 using ZKEACMS.Options;
 
 namespace ZKEACMS.Updater
@@ -29,8 +30,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
                     }
                 case Easy.DbTypes.MsSqlEarly:
                     {
-                        optionsBuilder.UseSqlServer(_dataBaseOption.ConnectionString, option => option.UseRowNumberForPaging());
-                        break;
+                        throw new Exception("Starting with EF Core 3.0, EF will only generate SQL for paging that is only compatible with later SQL Server versions. Because SQL Server 2008 is no longer a supported product.");
                     }
                 case Easy.DbTypes.Sqlite:
                     {

diff --git a/src/ZKEACMS.Updater/ZKEACMS.Updater.csproj b/src/ZKEACMS.Updater/ZKEACMS.Updater.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>ZKEACMS.Updater</AssemblyName>
     <PackageId>ZKEACMS.Updater</PackageId>

diff --git a/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj b/src/ZKEACMS.WebHost/ZKEACMS.WebHost.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>ZKEACMS.WebHost</AssemblyName>
     <PackageId>ZKEACMS.WebHost</PackageId>
     <Copyright>深圳市纸壳软件科技有限公司 纸壳CMS</Copyright>
@@ -22,7 +22,7 @@
     <PreserveCompilationReferences>true</PreserveCompilationReferences>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" />
     <ProjectReference Include="..\EasyFrameWork\EasyFrameWork.csproj" />
     <ProjectReference Include="..\ZKEACMS\ZKEACMS.csproj" />
   </ItemGroup>

diff --git a/src/ZKEACMS/Setting/ApplicationSettingService.cs b/src/ZKEACMS/Setting/ApplicationSettingService.cs
@@ -36,7 +36,7 @@ public override IQueryable<ApplicationSetting> Get()
 
         public override ServiceResult<ApplicationSetting> Add(ApplicationSetting item)
         {
-            if (Count(m => m.SettingKey == item.SettingKey) == 0)
+            if (base.Get(item.SettingKey) == null)
             {
                 _settingCache.TryAdd(item.SettingKey, item);
                 return base.Add(item);

diff --git a/src/ZKEACMS/ZKEACMS.csproj b/src/ZKEACMS/ZKEACMS.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>ZKEACMS</AssemblyName>
     <PackageId>ZKEACMS</PackageId>
     <Version>3.2.1</Version>
@@ -24,11 +24,11 @@
     <ProjectReference Include="..\EasyFrameWork\EasyFrameWork.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.0" />
-    <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
   </ItemGroup>
 </Project>
diff --git a/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj b/test/EasyFrameWork.Test/EasyFrameWork.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/test/ZKEACMS.Test/ZKEACMS.Test.csproj b/test/ZKEACMS.Test/ZKEACMS.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/tools/PackWidgetTemplate/PackWidgetTemplate.csproj b/tools/PackWidgetTemplate/PackWidgetTemplate.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
 </Project>