适配达梦最新驱动

Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj

@@ -21,8 +21,8 @@
 	<ItemGroup>
 		<None Include="../../logo.png" Pack="true" PackagePath="\" />
 		<None Include="lib\DmProvider\netstandard2.0\DmProvider.dll" Pack="true" PackagePath="\lib\netstandard2.0\" />
-		<None Include="lib\DmProvider\netcoreapp31\DmProvider.dll" Pack="true" PackagePath="\lib\netcoreapp31\" />
-		<None Include="lib\DmProvider\net40\DmProvider.dll" Pack="true" PackagePath="\lib\net45\" />
+		<None Include="lib\DmProvider\netcoreapp3.1\DmProvider.dll" Pack="true" PackagePath="\lib\netcoreapp3.1\" />
+		<None Include="lib\DmProvider\net45\DmProvider.dll" Pack="true" PackagePath="\lib\net45\" />
 		<None Include="lib\DmProvider\net40\DmProvider.dll" Pack="true" PackagePath="\lib\net40\" />
 		<None Include="lib/**/*.dll">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -33,6 +33,11 @@
 		<ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
 	</ItemGroup>
 
+	<ItemGroup >
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0"  Condition="'$(TargetFramework)' == 'netcoreapp3.1'"/>
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0"  Condition="'$(TargetFramework)' == 'netstandard2.0'"/>
+	</ItemGroup>
+
 	<ItemGroup>
 		<Reference Include="DmProvider">
 			<HintPath>lib\DmProvider\netstandard2.0\DmProvider.dll</HintPath>

Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.11058.nuspec

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>DmProvider</id>
+    <version>1.1.0.11058</version>
+    <authors>DM</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>DM .NET PROVIDER</description>
+    <copyright>Copy right(C) DM</copyright>
+    <dependencies>
+      <group targetFramework=".NETFramework4.0" />
+      <group targetFramework=".NETFramework4.5" />
+      <group targetFramework=".NETCoreApp2.0">
+        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Build,Analyzers" />
+      </group>
+      <group targetFramework=".NETCoreApp3.1">
+        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Build,Analyzers" />
+      </group>
+      <group targetFramework="net5.0" />
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Transactions.dll" targetFramework=".NETFramework4.0, .NETFramework4.5" />
+    </frameworkAssemblies>
+  </metadata>
+</package>

Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.nuspec

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    <id>DmProvider</id>
-    <version>1.1.0</version>
-    <authors>DM</authors>
-    <owners>DM</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>DM .NET PROVIDER</description>
-    <copyright>Copy right(C) DM</copyright>
-    <dependencies>
-      <group targetFramework=".NETFramework2.0" />
-      <group targetFramework=".NETStandard2.0">
-        <dependency id="System.Text.Encoding.CodePages" version="4.4.0" exclude="Build,Analyzers" />
-      </group>
-    </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.Transactions" targetFramework=".NETFramework2.0" />
-    </frameworkAssemblies>
-  </metadata>
-</package>