升级到 netstandard2.1 版本

Signed-off-by: virtual <1185513330@qq.com>
cocosip · Mar 17, 2020 · 6660e0a · 6660e0a
1 parent e409b0c
commit 6660e0a
Show file tree

Hide file tree

Showing 16 changed files with 1,001 additions and 673 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
     - task: DotNetCoreInstaller@0
       inputs:
-        version: '3.1.102'
+        version: '3.1.200'
     - powershell: .\build.ps1
       displayName: 'Run build.ps1'
 
@@ -28,7 +28,7 @@ jobs:
     steps:
     - task: DotNetCoreInstaller@0
       inputs:
-        version: '3.1.102'
+        version: '3.1.200'
     - script: |
         chmod +x ./build.sh
       displayName: 'Chmod build.sh'

diff --git a/build.config b/build.config
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 CAKE_VERSION=0.36.0
-DOTNET_VERSION=3.1.102
+DOTNET_VERSION=3.1.200
diff --git a/build/version.props b/build/version.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
-    <VersionMajor>3</VersionMajor>
-    <VersionMinor>1</VersionMinor>
-    <VersionPatch>6</VersionPatch>
-    <VersionQuality></VersionQuality>
+    <VersionMajor>4</VersionMajor>
+    <VersionMinor>0</VersionMinor>
+    <VersionPatch>0</VersionPatch>
+    <VersionQuality>0</VersionQuality>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
-    <VersionSuffix></VersionSuffix>
+    <VersionSuffix>Pre</VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/samples/DotCommon.ConsoleTest/DotCommon.ConsoleTest.csproj b/samples/DotCommon.ConsoleTest/DotCommon.ConsoleTest.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog.Extensions.Logging" Version="1.6.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.6.2" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/samples/DotCommon.ConsoleTest/Program.cs b/samples/DotCommon.ConsoleTest/Program.cs
@@ -94,8 +94,8 @@ static void Main(string[] args)
 
             //var p1 = RsaUtil.ReadPublicKeyInfo(publicKey1);
 
-            var privateKey2 = RSAHelper.ExportPrivateKeyPKCS1(privateParam);
-            var publicKey2 = RSAHelper.ExportPublicKey(publicParam);
+            var privateKey2 = Netstandard2RSAHelper.ExportPrivateKeyPKCS1(privateParam);
+            var publicKey2 = Netstandard2RSAHelper.ExportPublicKey(publicParam);
 
             Console.WriteLine("私钥:{0}", privateKey1);
             Console.WriteLine("私钥2:{0}", privateKey2);

diff --git a/src/DotCommon.AutoMapper/DotCommon.AutoMapper.csproj b/src/DotCommon.AutoMapper/DotCommon.AutoMapper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>DotCommon.AutoMapper</AssemblyName>
     <PackageId>DotCommon.AutoMapper</PackageId>
     <RootNamespace>DotCommon</RootNamespace>
@@ -11,11 +11,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
-    <DocumentationFile>bin\Debug\netstandard2.0\DotCommon.AutoMapper.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\netstandard2.1\DotCommon.AutoMapper.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\DotCommon.AutoMapper.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\netstandard2.1\DotCommon.AutoMapper.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>

diff --git a/src/DotCommon.Caching/DotCommon.Caching.csproj b/src/DotCommon.Caching/DotCommon.Caching.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>DotCommon.Caching</AssemblyName>
     <PackageId>DotCommon.Caching</PackageId>
     <RootNamespace>DotCommon</RootNamespace>
@@ -11,11 +11,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
-    <DocumentationFile>bin\Debug\netstandard2.0\DotCommon.Caching.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\netstandard2.1\DotCommon.Caching.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\DotCommon.Caching.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\netstandard2.1\DotCommon.Caching.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>

diff --git a/src/DotCommon.ImageUtility/DotCommon.ImageUtility.csproj b/src/DotCommon.ImageUtility/DotCommon.ImageUtility.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>DotCommon.ImageUtility</AssemblyName>
     <PackageId>DotCommon.ImageUtility</PackageId>
     <RootNamespace>DotCommon</RootNamespace>
@@ -11,11 +11,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
-    <DocumentationFile>bin\Debug\netstandard2.0\DotCommon.ImageUtility.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\netstandard2.1\DotCommon.ImageUtility.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\DotCommon.ImageUtility.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\netstandard2.1\DotCommon.ImageUtility.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>

diff --git a/src/DotCommon.Json4Net/DotCommon.Json4Net.csproj b/src/DotCommon.Json4Net/DotCommon.Json4Net.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>DotCommon.Json4Net</AssemblyName>
     <PackageId>DotCommon.Json4Net</PackageId>
     <RootNamespace>DotCommon</RootNamespace>
@@ -11,11 +11,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
-    <DocumentationFile>bin\Debug\netstandard2.0\DotCommon.Json4Net.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\netstandard2.1\DotCommon.Json4Net.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\DotCommon.Json4Net.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\netstandard2.1\DotCommon.Json4Net.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>

diff --git a/src/DotCommon.Log4Net/DotCommon.Log4Net.csproj b/src/DotCommon.Log4Net/DotCommon.Log4Net.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>DotCommon.Log4Net</AssemblyName>
     <PackageId>DotCommon.Log4Net</PackageId>
     <RootNamespace>DotCommon</RootNamespace>
@@ -11,11 +11,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
-    <DocumentationFile>bin\Debug\netstandard2.0\DotCommon.Log4Net.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\netstandard2.1\DotCommon.Log4Net.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\DotCommon.Log4Net.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\netstandard2.1\DotCommon.Log4Net.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>

diff --git a/src/DotCommon.ProtoBuf/DotCommon.ProtoBuf.csproj b/src/DotCommon.ProtoBuf/DotCommon.ProtoBuf.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>DotCommon.ProtoBuf</AssemblyName>
     <PackageId>DotCommon.ProtoBuf</PackageId>
     <RootNamespace>DotCommon</RootNamespace>

diff --git a/src/DotCommon/DotCommon.csproj b/src/DotCommon/DotCommon.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>DotCommon</AssemblyName>
     <PackageId>DotCommon</PackageId>
     <RootNamespace>DotCommon</RootNamespace>
@@ -11,11 +11,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
-    <DocumentationFile>bin\Debug\netstandard2.0\DotCommon.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\netstandard2.1\DotCommon.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\DotCommon.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\netstandard2.1\DotCommon.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>