Skip to content

Commit de23f08

Browse files
ChaosEngineChaosEngine
committed
Merging dev branch with dotnet-3.1 SDK and with some bumps
2 parents e1c75de + c2ebcda commit de23f08

File tree

5 files changed

+28
-26
lines changed

5 files changed

+28
-26
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: csharp
22
mono: none
3-
dotnet: 2.2.104
3+
dotnet: 3.1.101
44
dist: bionic
55
addons:
66
apt:

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ build_script:
1313
clone_depth: 1
1414
test: off
1515
deploy: off
16-
os: Visual Studio 2017
16+
os: Visual Studio 2019

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1212
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1313
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
14-
<Version>2.0.2</Version>
14+
<Version>2.0.3</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="2.2.0" />
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
25-
<PackageReference Include="MySqlConnector" Version="0.49.3" />
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" />
2626
</ItemGroup>
2727

2828
</Project>

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

Lines changed: 4 additions & 4 deletions
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>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</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.2</Version>
21+
<Version>2.0.3</Version>
2222
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
2323
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
24-
<AssemblyVersion>2.0.2.0</AssemblyVersion>
24+
<AssemblyVersion>2.0.3.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.49.3" />
38+
<PackageReference Include="MySqlConnector" Version="0.61.0" />
3939
</ItemGroup>
4040

4141
</Project>

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,39 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
5-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6-
<AssemblyName>Pomelo.Extensions.Caching.MySql.Tests</AssemblyName>
7-
<PackageId>Pomelo.Extensions.Caching.MySql.Tests</PackageId>
8-
<UserSecretsId>Caching-MySQL-88E451EA-603F-417A-A190-62081E1B3A8C</UserSecretsId>
9-
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
10-
<Version>2.0.2</Version>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6+
<AssemblyName>Pomelo.Extensions.Caching.MySql.Tests</AssemblyName>
7+
<PackageId>Pomelo.Extensions.Caching.MySql.Tests</PackageId>
8+
<UserSecretsId>Caching-MySQL-88E451EA-603F-417A-A190-62081E1B3A8C</UserSecretsId>
9+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
10+
<IsPackable>false</IsPackable>
11+
<IsTestProject>true</IsTestProject>
12+
<Version>2.0.3</Version>
1113
</PropertyGroup>
1214

1315
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1416
<DefineConstants>DEBUG;TRACE</DefineConstants>
1517
</PropertyGroup>
1618

1719
<ItemGroup>
18-
<Content Include="config.json" CopyToOutputDirectory="PreserveNewest" />
20+
<Content Include="config.json" CopyToOutputDirectory="PreserveNewest" />
1921
</ItemGroup>
2022

2123
<ItemGroup>
22-
<ProjectReference Include="..\..\src\Pomelo.Extensions.Caching.MySqlConfig.Tools\Pomelo.Extensions.Caching.MySqlConfig.Tools.csproj" />
23-
<ProjectReference Include="..\..\src\Pomelo.Extensions.Caching.MySql\Pomelo.Extensions.Caching.MySql.csproj" />
24+
<ProjectReference Include="..\..\src\Pomelo.Extensions.Caching.MySqlConfig.Tools\Pomelo.Extensions.Caching.MySqlConfig.Tools.csproj" />
25+
<ProjectReference Include="..\..\src\Pomelo.Extensions.Caching.MySql\Pomelo.Extensions.Caching.MySql.csproj" />
2426
</ItemGroup>
2527

2628
<ItemGroup>
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
29+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
2830
<PackageReference Include="xunit" Version="2.4.1" />
2931
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
34-
<PackageReference Include="Moq" Version="4.10.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" />
3537
</ItemGroup>
3638

3739
</Project>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy