Skip to content

Commit 7030baf

Browse files
bgraingerbgrainger
committed
Install System.Memory package.
Update net46 build to target net461 to consolidate dependencies. Signed-off-by: Bradley Grainger <[email protected]>
1 parent 07ea807 commit 7030baf

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

‎src/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<SignAssembly>true</SignAssembly>
66
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
77
<AssemblyOriginatorKeyFile>..\..\MySqlConnector.snk</AssemblyOriginatorKeyFile>
8-
<TargetFrameworks>net45;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
98
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
109
<PackageReleaseNotes>https://mysql-net.github.io/MySqlConnector/overview/version-history/</PackageReleaseNotes>
1110
<PackageProjectUrl>https://mysql-net.github.io/MySqlConnector/</PackageProjectUrl>

‎src/MySqlConnector.Logging.NLog/MySqlConnector.Logging.NLog.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net45;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
55
<Title>MySqlConnector Logging Adapter for NLog</Title>
66
<Description>Writes lightly-structured MySqlConnector logging output to NLog.</Description>
77
<Copyright>Copyright 2018 Bradley Grainger</Copyright>

‎src/MySqlConnector.Logging.Serilog/MySqlConnector.Logging.Serilog.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net45;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
55
<Title>MySqlConnector Logging Adapter for Serilog</Title>
66
<Description>Writes lightly-structured MySqlConnector logging output to Serilog.</Description>
77
<Copyright>Copyright 2017 Bradley Grainger</Copyright>

‎src/MySqlConnector.Logging.log4net/MySqlConnector.Logging.log4net.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net45;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
55
<Title>MySqlConnector Logging Adapter for log4net</Title>
66
<Description>Writes MySqlConnector logging output to log4net with one line of code.</Description>
77
<Copyright>Copyright 2017 Bradley Grainger</Copyright>

‎src/MySqlConnector/MySql.Data.MySqlClient/MySqlDbColumn.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using MySqlConnector.Protocol.Payloads;
66
using MySqlConnector.Protocol.Serialization;
77

8-
#if !NETSTANDARD1_3 && !NETSTANDARD2_0
8+
#if !NET461 && !NETSTANDARD1_3 && !NETSTANDARD2_0
99
namespace System.Data.Common
1010
{
1111
public abstract class DbColumn

‎src/MySqlConnector/MySqlConnector.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net45;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net45;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
55
<Title>Async MySQL ADO.NET Connector</Title>
66
<Description>A truly async MySQL ADO.NET provider, supporting MySQL Server, MariaDB, Percona Server, Amazon Aurora, Azure Database for MySQL and more.</Description>
77
<Copyright>Copyright 2016–2018 Bradley Grainger</Copyright>
@@ -11,17 +11,19 @@
1111
<PackageTags>mysql;mysqlconnector;async;ado.net;database;netcore</PackageTags>
1212
</PropertyGroup>
1313

14-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46' ">
15-
<PackageReference Include="System.Buffers" Version="4.3.0" />
14+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net461' ">
15+
<PackageReference Include="System.Buffers" Version="4.4.0" />
16+
<PackageReference Include="System.Memory" Version="4.5.0" />
1617
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" />
1718
<Reference Include="System.Data" />
1819
<Reference Include="System.Transactions" />
1920
</ItemGroup>
2021

2122
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' OR '$(TargetFramework)' == 'netstandard2.0' ">
22-
<PackageReference Include="System.Buffers" Version="4.3.0" />
23+
<PackageReference Include="System.Buffers" Version="4.4.0" />
2324
<PackageReference Include="System.Data.Common" Version="4.3.0" />
2425
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
26+
<PackageReference Include="System.Memory" Version="4.5.0" />
2527
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
2628
<PackageReference Include="System.Net.Security" Version="4.3.0" />
2729
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />

‎src/MySqlConnector/Utilities/Utility.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#if NETSTANDARD1_3 || NETSTANDARD2_0
77
using System.Runtime.InteropServices;
88
#endif
9-
#if NET45 || NET46
9+
#if NET45 || NET461
1010
using System.Reflection;
1111
#endif
1212
using System.Security.Authentication;
@@ -273,7 +273,7 @@ public static void SwapBytes(byte[] bytes, int offset1, int offset2)
273273
bytes[offset2] = swap;
274274
}
275275

276-
#if NET45 || NET46
276+
#if NET45 || NET461
277277
public static bool IsWindows() => Environment.OSVersion.Platform == PlatformID.Win32NT;
278278

279279
public static void GetOSDetails(out string os, out string osDescription, out string architecture)
@@ -308,13 +308,13 @@ public static void GetOSDetails(out string os, out string osDescription, out str
308308
}
309309
#endif
310310

311-
#if NET45 || NET46
311+
#if NET45 || NET461
312312
public static SslProtocols GetDefaultSslProtocols()
313313
{
314314
if (!s_defaultSslProtocols.HasValue)
315315
{
316316
// Prior to .NET Framework 4.7, SslProtocols.None is not a valid argument to SslStream.AuthenticateAsClientAsync.
317-
// If the NET46 build is loaded by an application that targets. NET 4.7 (or later), or if app.config has set
317+
// If the NET461 build is loaded by an application that targets. NET 4.7 (or later), or if app.config has set
318318
// Switch.System.Net.DontEnableSystemDefaultTlsVersions to false, then SslProtocols.None will work; otherwise,
319319
// if the application targets .NET 4.6.2 or earlier and hasn't changed the AppContext switch, then it will
320320
// fail at runtime. We attempt to determine if it will fail by accessing the internal static

0 commit comments

Comments
 (0)