Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 20e9c9f

Browse files
mythzmythz
committed
Upgrade MySql to 6.9.5
1 parent cf82420 commit 20e9c9f

File tree

25 files changed

+95
-47
lines changed

25 files changed

+95
-47
lines changed

‎NuGet/ServiceStack.OrmLite.MySql/servicestack.ormlite.mysql.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<language>en-US</language>
1919
<copyright>ServiceStack 2013 and contributors</copyright>
2020
<dependencies>
21-
<dependency id="MySql.Data" version="6.9.3" />
21+
<dependency id="MySql.Data" version="6.9.5" />
2222
<dependency id="ServiceStack.OrmLite" version="4.0" />
2323
</dependencies>
2424
</metadata>

‎src/ServiceStack.OrmLite.MySql.Tests/ServiceStack.OrmLite.MySql.Tests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@
4747
<Prefer32Bit>false</Prefer32Bit>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="MySql.Data">
51-
<HintPath>..\packages\MySql.Data.6.9.3\lib\net45\MySql.Data.dll</HintPath>
50+
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
51+
<SpecificVersion>False</SpecificVersion>
52+
<HintPath>..\packages\MySql.Data.6.9.5\lib\net45\MySql.Data.dll</HintPath>
5253
</Reference>
5354
<Reference Include="nunit.framework">
5455
<HintPath>..\..\lib\tests\nunit.framework.dll</HintPath>

‎src/ServiceStack.OrmLite.MySql.Tests/app.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
</configSections>
55
<connectionStrings>
6-
<add name="testDb" connectionString="Server=localhost;Database=test;UID=root;Password=test" providerName="MySql.Data.MySqlClient"/>
6+
<add name="testDb" connectionString="Server=localhost;Database=test;UID=root;Password=test" providerName="MySql.Data.MySqlClient" />
77
</connectionStrings>
88

99
<appSettings>
10-
<add key="servicestack:license" value="1001-e1JlZjoxMDAxLE5hbWU6VGVzdCBCdXNpbmVzcyxUeXBlOkJ1c2luZXNzLEhhc2g6UHVNTVRPclhvT2ZIbjQ5MG5LZE1mUTd5RUMzQnBucTFEbTE3TDczVEF4QUNMT1FhNXJMOWkzVjFGL2ZkVTE3Q2pDNENqTkQyUktRWmhvUVBhYTBiekJGUUZ3ZE5aZHFDYm9hL3lydGlwUHI5K1JsaTBYbzNsUC85cjVJNHE5QVhldDN6QkE4aTlvdldrdTgyTk1relY2eis2dFFqTThYN2lmc0JveHgycFdjPSxFeHBpcnk6MjAxMy0wMS0wMX0="/>
10+
<add key="servicestack:license" value="1001-e1JlZjoxMDAxLE5hbWU6VGVzdCBCdXNpbmVzcyxUeXBlOkJ1c2luZXNzLEhhc2g6UHVNTVRPclhvT2ZIbjQ5MG5LZE1mUTd5RUMzQnBucTFEbTE3TDczVEF4QUNMT1FhNXJMOWkzVjFGL2ZkVTE3Q2pDNENqTkQyUktRWmhvUVBhYTBiekJGUUZ3ZE5aZHFDYm9hL3lydGlwUHI5K1JsaTBYbzNsUC85cjVJNHE5QVhldDN6QkE4aTlvdldrdTgyTk1relY2eis2dFFqTThYN2lmc0JveHgycFdjPSxFeHBpcnk6MjAxMy0wMS0wMX0=" />
1111
</appSettings>
12-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup><system.data>
12+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><system.data>
1313
<DbProviderFactories>
14-
<remove invariant="MySql.Data.MySqlClient"/>
15-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
14+
<remove invariant="MySql.Data.MySqlClient" />
15+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
1616
</DbProviderFactories>
1717
</system.data></configuration>

‎src/ServiceStack.OrmLite.MySql.Tests/packages.config

Lines changed: 1 addition & 1 deletion
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="MySql.Data" version="6.9.3" targetFramework="net451" />
3+
<package id="MySql.Data" version="6.9.5" targetFramework="net45" />
44
</packages>

‎src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
46+
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
4747
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\packages\MySql.Data.6.9.3\lib\net40\MySql.Data.dll</HintPath>
48+
<HintPath>..\packages\MySql.Data.6.9.5\lib\net40\MySql.Data.dll</HintPath>
4949
</Reference>
5050
<Reference Include="ServiceStack.Common, Version=3.5.5.7454, Culture=neutral, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>

‎src/ServiceStack.OrmLite.MySql/app.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33

4-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup><system.data>
4+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><system.data>
55
<DbProviderFactories>
6-
<remove invariant="MySql.Data.MySqlClient"/>
7-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
6+
<remove invariant="MySql.Data.MySqlClient" />
7+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
88
</DbProviderFactories>
99
</system.data></configuration>

‎src/ServiceStack.OrmLite.MySql/packages.config

Lines changed: 1 addition & 1 deletion
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="MySql.Data" version="6.9.3" targetFramework="net451" />
3+
<package id="MySql.Data" version="6.9.5" targetFramework="net40" />
44
</packages>

‎src/ServiceStack.OrmLite.MySqlV45/ServiceStack.OrmLite.MySqlV45.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@
4141
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="MySql.Data">
45-
<HintPath>..\packages\MySql.Data.6.9.3\lib\net45\MySql.Data.dll</HintPath>
44+
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>..\packages\MySql.Data.6.9.5\lib\net45\MySql.Data.dll</HintPath>
4647
</Reference>
4748
<Reference Include="ServiceStack.Common">
4849
<HintPath>..\..\lib\ServiceStack.Common.dll</HintPath>

‎src/ServiceStack.OrmLite.MySqlV45/app.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<system.data>
3+
4+
<system.data>
45
<DbProviderFactories>
56
<remove invariant="MySql.Data.MySqlClient" />
6-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
7+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
78
</DbProviderFactories>
8-
</system.data>
9-
</configuration>
9+
</system.data></configuration>

‎src/ServiceStack.OrmLite.MySqlV45/packages.config

Lines changed: 1 addition & 1 deletion
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="MySql.Data" version="6.9.3" targetFramework="net45" />
3+
<package id="MySql.Data" version="6.9.5" targetFramework="net45" />
44
</packages>

0 commit comments

Comments
 (0)