Skip to content

Commit

Permalink
升级 MySQL.Data 到 8.3.0 版本。 ⬆️
Browse files Browse the repository at this point in the history
  • Loading branch information
PopeyeZhong committed Apr 3, 2024
1 parent f904ae3 commit 6a8777a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Zongsoft.Data/drivers/mysql/.deploy
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Zongsoft.Data.MySql.plugin
bin/$(Edition)/$(Framework)/Zongsoft.Data.MySql.*

%NUGET_PACKAGES%/mysql.data/8.2.0/lib/netstandard2.1/*.dll <framework:net7.0^>
%NUGET_PACKAGES%/mysql.data/6.10.9/lib/netstandard2.0/*.dll <framework:net5.0,net6.0>
%NUGET_PACKAGES%/mysql.data/8.3.0/lib/netstandard2.1/*.dll <framework:net6.0^>
%NUGET_PACKAGES%/mysql.data/6.10.9/lib/netstandard2.0/*.dll <framework:net5.0>

%NUGET_PACKAGES%/portable.bouncycastle/1.9.0/lib/netstandard2.0/*.dll
%NUGET_PACKAGES%/google.protobuf/3.21.9/lib/netstandard2.0/*.dll
Expand All @@ -15,5 +15,5 @@ bin/$(Edition)/$(Framework)/Zongsoft.Data.MySql.*
%NUGET_PACKAGES%/system.text.encoding.codepages/4.4.0/lib/netstandard2.0/*.dll
%NUGET_PACKAGES%/system.configuration.configurationmanager/4.4.1/lib/netstandard2.0/*.dll

%NUGET_PACKAGES%/system.security.permissions/4.7.0/lib/netstandard2.0/*.dll <framework:net7.0^>
%NUGET_PACKAGES%/system.security.permissions/4.4.1/lib/netstandard2.0/*.dll <framework:net5.0,net6.0>
%NUGET_PACKAGES%/system.security.permissions/4.7.0/lib/netstandard2.0/*.dll <framework:net6.0^>
%NUGET_PACKAGES%/system.security.permissions/4.4.1/lib/netstandard2.0/*.dll <framework:net5.0>
2 changes: 1 addition & 1 deletion Zongsoft.Data/drivers/mysql/MySqlImporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public override async ValueTask ImportAsync(DataImportContext context, Cancellat
writer.Close();
file.Dispose();

#if NET7_0_OR_GREATER
#if NET6_0_OR_GREATER
context.Count = await bulker.LoadAsync(null, cancellation);
#else
context.Count = await bulker.LoadAsync(cancellation);
Expand Down
6 changes: 3 additions & 3 deletions Zongsoft.Data/drivers/mysql/Zongsoft.Data.MySql.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="MySql.Data" Version="6.10.9" />
<PackageReference Include="MySql.Data" Version="8.3.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="MySql.Data" Version="8.2.0" />
<PackageReference Include="MySql.Data" Version="8.3.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="MySql.Data" Version="8.2.0" />
<PackageReference Include="MySql.Data" Version="8.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 6a8777a

Please sign in to comment.