Skip to content

Commit 680a15d

Browse files
adriancs2adriancs2
committedMar 7, 2023
fix a bug where MySqlDateTime is not handled in MySqlConnector
fix a bug where MySqlDateTime is not handled in MySqlConnector remove the icon
1 parent 81ec1da commit 680a15d

File tree

16 files changed

+53
-57
lines changed

16 files changed

+53
-57
lines changed
 

‎source code/MySqlBackup(Devart-Express)/MySqlBackup(Devart-Express).csproj

+5-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<TargetFrameworks>net46;net47;net48;net481</TargetFrameworks>
55
<RootNamespace>Devart.Data.MySql</RootNamespace>
66
<AssemblyName>MySqlBackupNet.DevartExpress</AssemblyName>
7-
<ApplicationIcon>logo.ico</ApplicationIcon>
87
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
98
<PackageId>MySqlBackup.Net.DevartExpress</PackageId>
109
<Authors>adriancs</Authors>
@@ -16,9 +15,10 @@
1615
<RepositoryUrl>https://github.com/MySqlBackupNET/MySqlBackup.Net.git</RepositoryUrl>
1716
<RepositoryType>git</RepositoryType>
1817
<PackageTags>mysqlbackup;devart;mysql</PackageTags>
19-
<Version>2.3.7</Version>
20-
<AssemblyVersion>2.3.7</AssemblyVersion>
21-
<FileVersion>2.3.7</FileVersion>
18+
<Version>2.3.8</Version>
19+
<AssemblyVersion>2.3.8</AssemblyVersion>
20+
<FileVersion>2.3.8</FileVersion>
21+
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
2222
</PropertyGroup>
2323

2424
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
@@ -86,11 +86,7 @@
8686
</PropertyGroup>
8787

8888
<ItemGroup>
89-
<Content Include="logo.ico" />
90-
</ItemGroup>
91-
92-
<ItemGroup>
93-
<PackageReference Include="dotConnect.Express.for.MySQL" Version="9.0.0" />
89+
<PackageReference Include="dotConnect.Express.for.MySQL" Version="9.1.134" />
9490
</ItemGroup>
9591

9692
</Project>

‎source code/MySqlBackup(Devart-Express)/logo.ico

-264 KB
Binary file not shown.

‎source code/MySqlBackup(MySql.Data)/MySqlBackup(MySql.Data).csproj

+5-9
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,16 @@
1414
<PackageProjectUrl>https://github.com/MySqlBackupNET/MySqlBackup.Net</PackageProjectUrl>
1515
<RepositoryType>git</RepositoryType>
1616
<RepositoryUrl>https://github.com/MySqlBackupNET/MySqlBackup.Net</RepositoryUrl>
17-
<Version>2.3.7</Version>
18-
<AssemblyVersion>2.3.7</AssemblyVersion>
19-
<FileVersion>2.3.7</FileVersion>
17+
<Version>2.3.8</Version>
18+
<AssemblyVersion>2.3.8</AssemblyVersion>
19+
<FileVersion>2.3.8</FileVersion>
2020
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
2121
<AssemblyName>MySqlBackup</AssemblyName>
22-
<ApplicationIcon>logo.ico</ApplicationIcon>
22+
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<Content Include="logo.ico" />
27-
</ItemGroup>
28-
29-
<ItemGroup>
30-
<PackageReference Include="MySql.Data" Version="8.0.31" />
26+
<PackageReference Include="MySql.Data" Version="8.0.32" />
3127
</ItemGroup>
3228

3329
</Project>

‎source code/MySqlBackup(MySql.Data)/logo.ico

-264 KB
Binary file not shown.

‎source code/MySqlBackup(MySqlConnector)/MySqlBackup(MySqlConnector).csproj

+7-10
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,26 @@
66
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
77
<Nullable>disable</Nullable>
88
<PackageId>MySqlBackup.NET.MySqlConnector</PackageId>
9-
<Authors>Jean.R,adriancs</Authors>
9+
<Authors>adriancs,Jean.R</Authors>
1010
<Company>MySqlBackup.NET</Company>
1111
<Product>MySqlBackup.NET for MySqlConnector</Product>
1212
<Description>A tool to backup and restore MySQL database in C#/VB.NET/ASP.NET. This library runs with MySqlConnector (MIT)</Description>
1313
<Copyright>Public Domain</Copyright>
1414
<PackageProjectUrl>https://github.com/MySqlBackupNET/MySqlBackup.Net</PackageProjectUrl>
1515
<RepositoryType>git</RepositoryType>
1616
<RepositoryUrl>https://github.com/MySqlBackupNET/MySqlBackup.Net</RepositoryUrl>
17-
<Version>2.3.7</Version>
18-
<AssemblyVersion>2.3.7</AssemblyVersion>
19-
<FileVersion>2.3.7</FileVersion>
17+
<Version>2.3.8</Version>
18+
<AssemblyVersion>2.3.8</AssemblyVersion>
19+
<FileVersion>2.3.8</FileVersion>
2020
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
2121
<AssemblyName>MySqlBackupNet.MySqlConnector</AssemblyName>
22-
<ApplicationIcon>logo.ico</ApplicationIcon>
2322
<PackageTags>mysqlbackup;mysqlconnector</PackageTags>
23+
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
24+
<Title>MySqlBackup.NET for MySqlConnector</Title>
2425
</PropertyGroup>
2526

2627
<ItemGroup>
27-
<Content Include="logo.ico" />
28-
</ItemGroup>
29-
30-
<ItemGroup>
31-
<PackageReference Include="MySqlConnector" Version="2.1.13" />
28+
<PackageReference Include="MySqlConnector" Version="2.2.5" />
3229
</ItemGroup>
3330

3431
</Project>

‎source code/MySqlBackup(MySqlConnector)/logo.ico

-264 KB
Binary file not shown.

‎source code/Test_ASPNET/Test_ASP.NET.csproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<ItemGroup>
4646
<Reference Include="Microsoft.CSharp" />
4747
<Reference Include="MySqlConnector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
48-
<HintPath>..\packages\MySqlConnector.2.1.13\lib\net471\MySqlConnector.dll</HintPath>
48+
<HintPath>..\packages\MySqlConnector.2.2.5\lib\net471\MySqlConnector.dll</HintPath>
4949
</Reference>
5050
<Reference Include="System" />
5151
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -56,24 +56,24 @@
5656
<Reference Include="System.Configuration.Install" />
5757
<Reference Include="System.Data" />
5858
<Reference Include="System.Data.DataSetExtensions" />
59-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
60-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.5.0.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
59+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
60+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
6161
</Reference>
6262
<Reference Include="System.Drawing" />
6363
<Reference Include="System.Drawing.Design" />
6464
<Reference Include="System.Management" />
65-
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
66-
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
65+
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
66+
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
6767
</Reference>
6868
<Reference Include="System.Numerics" />
6969
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7070
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
7171
</Reference>
72-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
73-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
72+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
73+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
7474
</Reference>
75-
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
76-
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
75+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
76+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
7777
</Reference>
7878
<Reference Include="System.Transactions" />
7979
<Reference Include="System.Web" />

‎source code/Test_ASPNET/Web.config

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3030
<dependentAssembly>
3131
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
32-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
32+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
33+
</dependentAssembly>
34+
<dependentAssembly>
35+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
36+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.1" newVersion="7.0.0.1" />
3337
</dependentAssembly>
3438
</assemblyBinding>
3539
</runtime>

‎source code/Test_ASPNET/packages.config

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MySqlConnector" version="2.1.13" targetFramework="net48" />
3+
<package id="MySqlConnector" version="2.2.5" targetFramework="net48" />
44
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
5-
<package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net48" />
6-
<package id="System.Memory" version="4.5.4" targetFramework="net48" />
5+
<package id="System.Diagnostics.DiagnosticSource" version="7.0.1" targetFramework="net48" />
6+
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
77
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
8-
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net48" />
9-
<package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net48" />
8+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
9+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
1010
</packages>

‎source code/Test_WinForm_DevartExpress/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
</runtime>
1414
<system.data>
1515
<DbProviderFactories>
16-
<add name="dotConnect for MySql" invariant="Devart.Data.MySql" description="Devart dotConnect for MySql" type="Devart.Data.MySql.MySqlProviderFactory, Devart.Data.MySql, Version=9.0.0.0, Culture=neutral, PublicKeyToken=09af7300eec23701" />
16+
<add name="dotConnect for MySql" invariant="Devart.Data.MySql" description="Devart dotConnect for MySql" type="Devart.Data.MySql.MySqlProviderFactory, Devart.Data.MySql, Version=9.1.134.0, Culture=neutral, PublicKeyToken=09af7300eec23701" />
1717
</DbProviderFactories>
1818
</system.data></configuration>

‎source code/Test_WinForm_DevartExpress/Test_WinForm_DevartExpress.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
<ApplicationIcon>logo.ico</ApplicationIcon>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="Devart.Data, Version=5.0.2938.0, Culture=neutral, PublicKeyToken=09af7300eec23701, processorArchitecture=MSIL">
41-
<HintPath>..\packages\dotConnect.Express.for.MySQL.9.0.0\lib\Devart.Data.dll</HintPath>
40+
<Reference Include="Devart.Data, Version=5.0.3075.0, Culture=neutral, PublicKeyToken=09af7300eec23701, processorArchitecture=MSIL">
41+
<HintPath>..\packages\dotConnect.Express.for.MySQL.9.1.134\lib\Devart.Data.dll</HintPath>
4242
</Reference>
43-
<Reference Include="Devart.Data.MySql, Version=9.0.0.0, Culture=neutral, PublicKeyToken=09af7300eec23701, processorArchitecture=MSIL">
44-
<HintPath>..\packages\dotConnect.Express.for.MySQL.9.0.0\lib\Devart.Data.MySql.dll</HintPath>
43+
<Reference Include="Devart.Data.MySql, Version=9.1.134.0, Culture=neutral, PublicKeyToken=09af7300eec23701, processorArchitecture=MSIL">
44+
<HintPath>..\packages\dotConnect.Express.for.MySQL.9.1.134\lib\Devart.Data.MySql.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System" />
4747
<Reference Include="System.Core" />

‎source code/Test_WinForm_DevartExpress/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="dotConnect.Express.for.MySQL" version="9.0.0" targetFramework="net48" />
3+
<package id="dotConnect.Express.for.MySQL" version="9.1.134" targetFramework="net48" />
44
</packages>

‎source code/Test_WinForm_MySqlConnector/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</dependentAssembly>
2424
<dependentAssembly>
2525
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
26-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
26+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.1" newVersion="7.0.0.1" />
2727
</dependentAssembly>
2828
</assemblyBinding>
2929
</runtime>

‎source code/Test_WinForm_MySqlConnector/Test_WinForm_MySqlConnector.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
</PropertyGroup>
4242
<ItemGroup>
4343
<Reference Include="MySqlConnector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MySqlConnector.2.1.13\lib\net471\MySqlConnector.dll</HintPath>
44+
<HintPath>..\packages\MySqlConnector.2.2.5\lib\net471\MySqlConnector.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System" />
4747
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
4848
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
4949
</Reference>
5050
<Reference Include="System.Core" />
51-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
52-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
51+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
52+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
5353
</Reference>
5454
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5555
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>

‎source code/Test_WinForm_MySqlConnector/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MySqlConnector" version="2.1.13" targetFramework="net48" />
3+
<package id="MySqlConnector" version="2.2.5" targetFramework="net48" />
44
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
5-
<package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net48" />
5+
<package id="System.Diagnostics.DiagnosticSource" version="7.0.1" targetFramework="net48" />
66
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
77
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
88
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />

‎source code/Test_WinForm_MySqlData/Test_WinForm_MySqlData.csproj

+5-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
<Prefer32Bit>false</Prefer32Bit>
5252
</PropertyGroup>
5353
<PropertyGroup>
54-
<ApplicationIcon>logo.ico</ApplicationIcon>
54+
<ApplicationIcon>
55+
</ApplicationIcon>
5556
</PropertyGroup>
5657
<ItemGroup>
5758
<Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
@@ -369,7 +370,6 @@
369370
<None Include="Resources\disk_edit.png" />
370371
</ItemGroup>
371372
<ItemGroup>
372-
<Content Include="logo.ico" />
373373
<None Include="Resources\logo128.png" />
374374
<None Include="Resources\q2.png" />
375375
</ItemGroup>
@@ -399,6 +399,9 @@
399399
<Name>MySqlBackup%28MySql.Data%29</Name>
400400
</ProjectReference>
401401
</ItemGroup>
402+
<ItemGroup>
403+
<Content Include="logo.ico" />
404+
</ItemGroup>
402405
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
403406
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
404407
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)
Failed to load comments.