Dev to master (#22)

Merging dev to master branch (Dotnet5 framework changes and MySqlConnector-1.x.x branch)
PomeloFoundation · Dec 6, 2020 · c5132e4 · c5132e4
1 parent de23f08
commit c5132e4
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: csharp
 mono: none
-dotnet: 3.1.101
+dotnet: 5.0.100
 dist: bionic
 addons:
   apt:
@@ -18,7 +18,7 @@ env:
 os:
   - linux
   - osx
-osx_image: xcode8.2
+osx_image: xcode10
 branches:
   only:
     - master

diff --git a/src/Pomelo.Extensions.Caching.MySql/DatabaseOperations.cs b/src/Pomelo.Extensions.Caching.MySql/DatabaseOperations.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Internal;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using System;
 using System.Data;
 using System.Linq;

diff --git a/src/Pomelo.Extensions.Caching.MySql/MonoDatabaseOperations.cs b/src/Pomelo.Extensions.Caching.MySql/MonoDatabaseOperations.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Internal;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using System.Data;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/src/Pomelo.Extensions.Caching.MySql/MonoSqlParameterCollectionExtensions.cs b/src/Pomelo.Extensions.Caching.MySql/MonoSqlParameterCollectionExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Pomelo Foundation. All rights reserved.
 // Licensed under the MIT License
 
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using System;
 
 namespace Pomelo.Extensions.Caching.MySql

diff --git a/src/Pomelo.Extensions.Caching.MySql/MySqlParameterCollectionExtensions.cs b/src/Pomelo.Extensions.Caching.MySql/MySqlParameterCollectionExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Pomelo Foundation. All rights reserved.
 // Licensed under the MIT License
 
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using System;
 
 namespace Pomelo.Extensions.Caching.MySql

diff --git a/src/Pomelo.Extensions.Caching.MySql/Pomelo.Extensions.Caching.MySql.csproj b/src/Pomelo.Extensions.Caching.MySql/Pomelo.Extensions.Caching.MySql.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using MySql.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Pomelo.Extensions.Caching.MySql</AssemblyName>
     <PackageId>Pomelo.Extensions.Caching.MySql</PackageId>
     <PackageTags>cache;distributedcache;mysql</PackageTags>
@@ -11,7 +11,7 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>2.0.3</Version>
+    <Version>2.1.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
@@ -20,9 +20,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
-    <PackageReference Include="MySqlConnector" Version="0.61.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
+    <PackageReference Include="MySqlConnector" Version="1.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/...o.Extensions.Caching.MySqlConfig.Tools/Pomelo.Extensions.Caching.MySqlConfig.Tools.csproj b/...o.Extensions.Caching.MySqlConfig.Tools/Pomelo.Extensions.Caching.MySqlConfig.Tools.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Command line tool to create tables and indexes in a MySql Server database for distributed caching.</Description>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -18,10 +18,10 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <RootNamespace>Pomelo.Extensions.Caching.MySqlConfig.Tools</RootNamespace>
-    <Version>2.0.3</Version>
+    <Version>2.1.0</Version>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <AssemblyVersion>2.0.3.0</AssemblyVersion>
+    <AssemblyVersion>2.1.0.0</AssemblyVersion>
     <IsPackable>true</IsPackable>
     <ToolCommandName>dotnet-mysql-cache</ToolCommandName>
     <PackAsTool>true</PackAsTool>
@@ -35,7 +35,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
-	  <PackageReference Include="MySqlConnector" Version="0.61.0" />
+	  <PackageReference Include="MySqlConnector" Version="1.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Pomelo.Extensions.Caching.MySqlConfig.Tools/Program.cs b/src/Pomelo.Extensions.Caching.MySqlConfig.Tools/Program.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License
 
 using Microsoft.Extensions.CommandLineUtils;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using System;
 using System.Data;
 using System.Reflection;

diff --git a/test/Pomelo.Extensions.Caching.MySql.Tests/DatabaseOptionsFixture.cs b/test/Pomelo.Extensions.Caching.MySql.Tests/DatabaseOptionsFixture.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using System;
 using System.Threading.Tasks;
 using Xunit;

diff --git a/test/Pomelo.Extensions.Caching.MySql.Tests/MySqlCacheWithDatabaseTest.cs b/test/Pomelo.Extensions.Caching.MySql.Tests/MySqlCacheWithDatabaseTest.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Internal;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using System;
 using System.Collections.Generic;
 using System.Data;

diff --git a/test/Pomelo.Extensions.Caching.MySql.Tests/Pomelo.Extensions.Caching.MySql.Tests.csproj b/test/Pomelo.Extensions.Caching.MySql.Tests/Pomelo.Extensions.Caching.MySql.Tests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net5.0</TargetFramework>
 	  <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	  <AssemblyName>Pomelo.Extensions.Caching.MySql.Tests</AssemblyName>
 	  <PackageId>Pomelo.Extensions.Caching.MySql.Tests</PackageId>
 	  <UserSecretsId>Caching-MySQL-88E451EA-603F-417A-A190-62081E1B3A8C</UserSecretsId>
 	  <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <Version>2.0.3</Version>
+    <Version>2.1.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -26,14 +26,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.1" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
-		<PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+		<PackageReference Include="Moq" Version="4.15.2" />
   </ItemGroup>
 
 </Project>