update to zkweb 2.0.0

Author: dudes-come

doc/other_todo.txt

@@ -10,6 +10,8 @@
 		考虑Finance.Payment.Cash的实现
 		考虑Finance.Payment.OnArrive的实现
 
+管理后台左边栏可以记住是否收缩
+
 ====================================================================
 
 优化查询性能，添加更多的索引

src/ZKWeb.Plugins/Common.PesudoStatic/src/Tests/HttpRequestHandlers/PesudoStaticHandlerTest.cs

@@ -1,5 +1,4 @@
-using NSubstitute;
-using System;
+using System;
 using ZKWeb.Plugins.Common.Base.src.Domain.Services;
 using ZKWeb.Plugins.Common.PesudoStatic.src.Components.GenericConfigs;
 using ZKWeb.Plugins.Common.PesudoStatic.src.Components.HttpRequestHandlers;
@@ -10,13 +9,27 @@
 namespace ZKWeb.Plugins.Common.PesudoStatic.src.Tests.HttpRequestHandlers {
 	[Tests]
 	class PesudoStaticHandlerTest {
+		public class GenericConfigManagerMock : GenericConfigManager {
+			private PesudoStaticSettings _settings;
+
+			public GenericConfigManagerMock(PesudoStaticSettings settings) {
+				_settings = settings;
+			}
+
+			public override T GetData<T>() {
+				if (typeof(T) == typeof(PesudoStaticSettings)) {
+					return (T)(object)_settings;
+				}
+				return base.GetData<T>();
+			}
+		}
+
 		public void OnRequest() {
 			var settings = new PesudoStaticSettings();
 			using (Application.OverrideIoc()) {
-				var configManagerMock = Substitute.For<GenericConfigManager>();
-				configManagerMock.GetData<PesudoStaticSettings>().Returns(settings);
 				Application.Ioc.Unregister<GenericConfigManager>();
-				Application.Ioc.RegisterInstance(configManagerMock);
+				Application.Ioc.RegisterInstance<GenericConfigManager>(
+					new GenericConfigManagerMock(new PesudoStaticSettings()));
 				var testUrl = new Func<string, string>(url => {
 					string parsedUrl = null;
 					var wrapper = new PesudoStaticHandlerWrapper();

src/ZKWeb.Plugins/Common.PesudoStatic/src/Tests/UrlFilters/PesudoStaticUrlFilterTest.cs

@@ -1,9 +1,9 @@
-using NSubstitute;
-using System;
+using System;
 using ZKWeb.Plugins.Common.Base.src.Domain.Services;
 using ZKWeb.Plugins.Common.PesudoStatic.src.Components.GenericConfigs;
 using ZKWeb.Plugins.Common.PesudoStatic.src.Components.PesudoStatic.Enums;
 using ZKWeb.Plugins.Common.PesudoStatic.src.Components.UrlFilters;
+using ZKWeb.Plugins.Common.PesudoStatic.src.Tests.HttpRequestHandlers;
 using ZKWebStandard.Testing;
 
 namespace ZKWeb.Plugins.Common.PesudoStatic.src.Tests.UrlFilters {
@@ -15,10 +15,9 @@ public void Filter() {
 			settings.ExcludeUrlPaths.Add("/exclude/me");
 			using (Application.OverrideIoc()) {
 				var filter = new PesudoStaticUrlFilter();
-				var configManagerMock = Substitute.For<GenericConfigManager>();
-				configManagerMock.GetData<PesudoStaticSettings>().Returns(settings);
 				Application.Ioc.Unregister<GenericConfigManager>();
-				Application.Ioc.RegisterInstance(configManagerMock);
+				Application.Ioc.RegisterInstance<GenericConfigManager>(
+					new PesudoStaticHandlerTest.GenericConfigManagerMock(settings));
 				var testUrl = new Func<string, string>(url => { filter.Filter(ref url); return url; });
 
 				Assert.Equals(testUrl(""), "");

src/ZKWeb.Plugins/ZKWeb.Plugins.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <AssemblyName>ZKWeb.Plugins</AssemblyName>
     <PackageId>ZKWeb.Plugins</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ZKWeb" Version="1.9.0.1" />
-    <PackageReference Include="ZKWeb.Fork.QRCoder" Version="1.2.8.1" />
+    <PackageReference Include="ZKWeb" Version="2.0.0" />
+    <PackageReference Include="ZKWeb.Fork.QRCoder" Version="1.3.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
     <PackageReference Include="System.Net.Requests " Version="4.3.0" />
   </ItemGroup>
@@ -24,7 +24,7 @@
     <Reference Include="System.Speech" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
   </PropertyGroup>
 
@@ -36,7 +36,7 @@
     <DocumentationFile>bin\Debug\netstandard1.6\ZKWeb.Plugins.xml</DocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
     <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />