Skip to content

Commit c5132e4

Browse files
ChaosEngineChaosEngine
authored
Dev to master (#22)
Merging dev to master branch (Dotnet5 framework changes and MySqlConnector-1.x.x branch)
1 parent de23f08 commit c5132e4

11 files changed

+30
-27
lines changed

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: csharp
22
mono: none
3-
dotnet: 3.1.101
3+
dotnet: 5.0.100
44
dist: bionic
55
addons:
66
apt:
@@ -18,7 +18,7 @@ env:
1818
os:
1919
- linux
2020
- osx
21-
osx_image: xcode8.2
21+
osx_image: xcode10
2222
branches:
2323
only:
2424
- master

‎src/Pomelo.Extensions.Caching.MySql/DatabaseOperations.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using Microsoft.Extensions.Caching.Distributed;
55
using Microsoft.Extensions.Internal;
6-
using MySql.Data.MySqlClient;
6+
using MySqlConnector;
77
using System;
88
using System.Data;
99
using System.Linq;

‎src/Pomelo.Extensions.Caching.MySql/MonoDatabaseOperations.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using Microsoft.Extensions.Caching.Distributed;
55
using Microsoft.Extensions.Internal;
6-
using MySql.Data.MySqlClient;
6+
using MySqlConnector;
77
using System.Data;
88
using System.Threading;
99
using System.Threading.Tasks;

‎src/Pomelo.Extensions.Caching.MySql/MonoSqlParameterCollectionExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Pomelo Foundation. All rights reserved.
22
// Licensed under the MIT License
33

4-
using MySql.Data.MySqlClient;
4+
using MySqlConnector;
55
using System;
66

77
namespace Pomelo.Extensions.Caching.MySql

‎src/Pomelo.Extensions.Caching.MySql/MySqlParameterCollectionExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Pomelo Foundation. All rights reserved.
22
// Licensed under the MIT License
33

4-
using MySql.Data.MySqlClient;
4+
using MySqlConnector;
55
using System;
66

77
namespace Pomelo.Extensions.Caching.MySql

‎src/Pomelo.Extensions.Caching.MySql/Pomelo.Extensions.Caching.MySql.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using MySql.</Description>
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFramework>netstandard2.1</TargetFramework>
66
<AssemblyName>Pomelo.Extensions.Caching.MySql</AssemblyName>
77
<PackageId>Pomelo.Extensions.Caching.MySql</PackageId>
88
<PackageTags>cache;distributedcache;mysql</PackageTags>
@@ -11,7 +11,7 @@
1111
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1212
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1313
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
14-
<Version>2.0.3</Version>
14+
<Version>2.1.0</Version>
1515
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1616
</PropertyGroup>
1717

@@ -20,9 +20,9 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.1" />
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
25-
<PackageReference Include="MySqlConnector" Version="0.61.0" />
23+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
25+
<PackageReference Include="MySqlConnector" Version="1.2.0" />
2626
</ItemGroup>
2727

2828
</Project>

‎src/Pomelo.Extensions.Caching.MySqlConfig.Tools/Pomelo.Extensions.Caching.MySqlConfig.Tools.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Command line tool to create tables and indexes in a MySql Server database for distributed caching.</Description>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<NoWarn>$(NoWarn);CS1591</NoWarn>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -18,10 +18,10 @@
1818
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
1919
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
2020
<RootNamespace>Pomelo.Extensions.Caching.MySqlConfig.Tools</RootNamespace>
21-
<Version>2.0.3</Version>
21+
<Version>2.1.0</Version>
2222
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
2323
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
24-
<AssemblyVersion>2.0.3.0</AssemblyVersion>
24+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
2525
<IsPackable>true</IsPackable>
2626
<ToolCommandName>dotnet-mysql-cache</ToolCommandName>
2727
<PackAsTool>true</PackAsTool>
@@ -35,7 +35,7 @@
3535

3636
<ItemGroup>
3737
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
38-
<PackageReference Include="MySqlConnector" Version="0.61.0" />
38+
<PackageReference Include="MySqlConnector" Version="1.2.0" />
3939
</ItemGroup>
4040

4141
</Project>

‎src/Pomelo.Extensions.Caching.MySqlConfig.Tools/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT License
33

44
using Microsoft.Extensions.CommandLineUtils;
5-
using MySql.Data.MySqlClient;
5+
using MySqlConnector;
66
using System;
77
using System.Data;
88
using System.Reflection;

‎test/Pomelo.Extensions.Caching.MySql.Tests/DatabaseOptionsFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using Microsoft.Extensions.Configuration;
55
using Microsoft.Extensions.Options;
6-
using MySql.Data.MySqlClient;
6+
using MySqlConnector;
77
using System;
88
using System.Threading.Tasks;
99
using Xunit;

‎test/Pomelo.Extensions.Caching.MySql.Tests/MySqlCacheWithDatabaseTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using Microsoft.Extensions.Caching.Distributed;
55
using Microsoft.Extensions.Internal;
6-
using MySql.Data.MySqlClient;
6+
using MySqlConnector;
77
using System;
88
using System.Collections.Generic;
99
using System.Data;

‎test/Pomelo.Extensions.Caching.MySql.Tests/Pomelo.Extensions.Caching.MySql.Tests.csproj

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
66
<AssemblyName>Pomelo.Extensions.Caching.MySql.Tests</AssemblyName>
77
<PackageId>Pomelo.Extensions.Caching.MySql.Tests</PackageId>
88
<UserSecretsId>Caching-MySQL-88E451EA-603F-417A-A190-62081E1B3A8C</UserSecretsId>
99
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
1010
<IsPackable>false</IsPackable>
1111
<IsTestProject>true</IsTestProject>
12-
<Version>2.0.3</Version>
12+
<Version>2.1.0</Version>
1313
</PropertyGroup>
1414

1515
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -26,14 +26,17 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
29+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
3030
<PackageReference Include="xunit" Version="2.4.1" />
31-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.1" />
33-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.1" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.1" />
35-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
36-
<PackageReference Include="Moq" Version="4.13.1" />
31+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
32+
<PrivateAssets>all</PrivateAssets>
33+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
34+
</PackageReference>
35+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
38+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
39+
<PackageReference Include="Moq" Version="4.15.2" />
3740
</ItemGroup>
3841

3942
</Project>

0 commit comments

Comments
 (0)