Skip to content

Commit 561d30f

Browse files
committed
Update to .NET Core 3.0.0-preview8.
1 parent 11cd36d commit 561d30f

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ before_install:
3535
- tar zxf dotnet-runtime-2.1.12-linux-x64.tar.gz -C $HOME/dotnet
3636
- wget -q https://download.microsoft.com/download/3/a/3/3a3bda26-560d-4d8e-922e-6f6bc4553a84/dotnet-runtime-2.0.9-linux-x64.tar.gz
3737
- tar zxf dotnet-runtime-2.0.9-linux-x64.tar.gz -C $HOME/dotnet
38-
- wget -q https://download.visualstudio.microsoft.com/download/pr/c624c5d6-0e9c-4dd9-9506-6b197ef44dc8/ad61b332f3abcc7dec3a49434e4766e1/dotnet-sdk-3.0.100-preview7-012821-linux-x64.tar.gz
39-
- tar zxf dotnet-sdk-3.0.100-preview7-012821-linux-x64.tar.gz -C $HOME/dotnet
38+
- wget -q https://download.visualstudio.microsoft.com/download/pr/a0e368ac-7161-4bde-a139-1a3ef5a82bbe/439cdbb58950916d3718771c5d986c35/dotnet-sdk-3.0.100-preview8-013656-linux-x64.tar.gz
39+
- tar zxf dotnet-sdk-3.0.100-preview8-013656-linux-x64.tar.gz -C $HOME/dotnet
4040
- export DOTNET_ROOT=$HOME/dotnet
4141
- export PATH=$HOME/dotnet:$PATH
4242
- dotnet --info

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cache:
1010
install:
1111
# The following can be used to install a custom version of .NET Core
1212
- ps: Invoke-WebRequest -Uri "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1" -OutFile "install-dotnet.ps1"
13-
- ps: .\install-dotnet.ps1 -Version 3.0.100-preview7-012821 -InstallDir "dotnetcli"
13+
- ps: .\install-dotnet.ps1 -Version 3.0.100-preview8-013656 -InstallDir "dotnetcli"
1414
build_script:
1515
- dotnet --info
1616
before_test:

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
DotNetCoreSdkVersion: '3.0.100-preview7-012821'
2+
DotNetCoreSdkVersion: '3.0.100-preview8-013656'
33
NUGET_PACKAGES: '$(Pipeline.Workspace)/.nuget/packages'
44

55
jobs:

src/MySqlConnector/Core/ConnectionPool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ static ConnectionPool()
536536
static readonly ConcurrentDictionary<string, ConnectionPool?> s_pools = new ConcurrentDictionary<string, ConnectionPool?>();
537537

538538
static int s_poolId;
539-
static ConnectionStringPool s_mruCache;
539+
static ConnectionStringPool? s_mruCache;
540540

541541
int m_generation;
542542
readonly SemaphoreSlim m_cleanSemaphore;

src/MySqlConnector/MySql.Data.MySqlClient/MySqlException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public override IDictionary Data
3939
{
4040
m_data = base.Data;
4141
m_data["Server Error Code"] = Number;
42-
m_data["SqlState"] = SqlState!; // BUG? Should be safe for value to be null
42+
m_data["SqlState"] = SqlState;
4343
}
4444
return m_data;
4545
}

src/MySqlConnector/MySqlConnector.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' != '3.0.100-preview7-012821' ">net45;net461;net471;netstandard1.3;netstandard2.0;netcoreapp2.1</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' == '3.0.100-preview7-012821' ">net45;net461;net471;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' != '3.0.100-preview8-013656' ">net45;net461;net471;netstandard1.3;netstandard2.0;netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' == '3.0.100-preview8-013656' ">net45;net461;net471;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
66
<Title>Async MySQL ADO.NET Connector</Title>
77
<Description>A truly async MySQL ADO.NET provider, supporting MySQL Server, MariaDB, Percona Server, Amazon Aurora, Azure Database for MySQL and more.</Description>
88
<Copyright>Copyright 2016–2019 Bradley Grainger</Copyright>

src/MySqlConnector/Utilities/NullableAttributes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Supports using nullable attributes on older frameworks.
22
// Copied from https://github.com/dotnet/corefx/blob/master/src/Common/src/CoreLib/System/Diagnostics/CodeAnalysis/NullableAttributes.cs
33

4-
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_1
4+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
55
namespace System.Diagnostics.CodeAnalysis
66
{
77
/// <summary>Specifies that an output will not be null even if the corresponding type allows it.</summary>

src/MySqlConnector/Utilities/Utility.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public static Task CompletedTask
338338
return s_completedTask;
339339
}
340340
}
341-
static Task s_completedTask;
341+
static Task? s_completedTask;
342342

343343
public static Task TaskFromException(Exception exception) => TaskFromException<object>(exception);
344344
public static Task<T> TaskFromException<T>(Exception exception)

tests/SideBySide/SideBySide.csproj

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

33
<PropertyGroup Condition=" '$(Configuration)' != 'Baseline' ">
4-
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' != '3.0.100-preview7-012821' ">net452;net461;net472;netcoreapp1.1.2;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' == '3.0.100-preview7-012821' ">net452;net461;net472;netcoreapp1.1.2;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' != '3.0.100-preview8-013656' ">net452;net461;net472;netcoreapp1.1.2;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' == '3.0.100-preview8-013656' ">net452;net461;net472;netcoreapp1.1.2;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<PropertyGroup Condition=" '$(Configuration)' == 'Baseline' ">

0 commit comments

Comments
 (0)