Skip to content

Commit ac432ea

Browse files
bgraingerbgrainger
committed
Target .NET 4.5. Fixes #295
The SideBySide tests have to target .NET 4.5.1 (due to other dependencies) but will still test the net45 build of the library.
1 parent 8a68950 commit ac432ea

File tree

7 files changed

+21
-26
lines changed

7 files changed

+21
-26
lines changed

‎src/MySqlConnector/MySqlConnector.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AssemblyTitle>Async MySQL Connector</AssemblyTitle>
88
<VersionPrefix>0.22.0</VersionPrefix>
99
<Authors>Bradley Grainger;Caleb Lloyd</Authors>
10-
<TargetFrameworks>net451;net46;netstandard1.3</TargetFrameworks>
10+
<TargetFrameworks>net45;net46;netstandard1.3</TargetFrameworks>
1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1212
<AssemblyName>MySqlConnector</AssemblyName>
1313
<PackageId>MySqlConnector</PackageId>
@@ -20,7 +20,7 @@
2020
<RepositoryUrl>https://github.com/mysql-net/MySqlConnector.git</RepositoryUrl>
2121
</PropertyGroup>
2222

23-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net46' ">
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46' ">
2424
<PackageReference Include="System.Buffers" Version="4.0.0" />
2525
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
2626
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.0.0" />

‎src/MySqlConnector/Serialization/MySqlSession.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ private async Task SwitchAuthenticationAsync(PayloadData payload, string passwor
317317

318318
if (!m_isSecureConnection && passwordBytes.Length > 1)
319319
{
320-
#if NET451
320+
#if NET45
321321
throw new MySqlException("Authentication method '{0}' requires a secure connection (prior to .NET 4.6).".FormatInvariant(switchRequest.Name));
322322
#else
323323
// request the RSA public key
@@ -593,7 +593,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
593593
try
594594
{
595595
var certificate = new X509Certificate2(cs.CertificateFile, cs.CertificatePassword);
596-
#if !NET451
596+
#if !NET45
597597
m_clientCertificate = certificate;
598598
#endif
599599
clientCertificates = new X509CertificateCollection {certificate};
@@ -612,7 +612,7 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
612612
try
613613
{
614614
var caCertificate = new X509Certificate2(cs.CACertificateFile);
615-
#if !NET451
615+
#if !NET45
616616
m_serverCertificate = caCertificate;
617617
#endif
618618
caCertificateChain = new X509Chain
@@ -711,7 +711,7 @@ private void ShutdownSocket()
711711
Utility.Dispose(ref m_networkStream);
712712
SafeDispose(ref m_tcpClient);
713713
SafeDispose(ref m_socket);
714-
#if !NET451
714+
#if !NET45
715715
Utility.Dispose(ref m_clientCertificate);
716716
Utility.Dispose(ref m_serverCertificate);
717717
#endif
@@ -855,7 +855,7 @@ private enum State
855855
TcpClient m_tcpClient;
856856
Socket m_socket;
857857
NetworkStream m_networkStream;
858-
#if !NET451
858+
#if !NET45
859859
IDisposable m_clientCertificate;
860860
IDisposable m_serverCertificate;
861861
#endif

‎tests/SideBySide/ConnectAsync.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public async Task Sha256WithoutSecureConnection()
234234
csb.SslMode = MySqlSslMode.None;
235235
using (var connection = new MySqlConnection(csb.ConnectionString))
236236
{
237-
#if BASELINE || NET451
237+
#if BASELINE || NET45
238238
await Assert.ThrowsAsync<NotImplementedException>(() => connection.OpenAsync());
239239
#else
240240
if (AppConfig.SupportedFeatures.HasFlag(ServerFeatures.OpenSsl))

‎tests/SideBySide/ConnectSync.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ public void Sha256WithoutSecureConnection()
341341
csb.SslMode = MySqlSslMode.None;
342342
using (var connection = new MySqlConnection(csb.ConnectionString))
343343
{
344-
#if BASELINE || NET451
344+
#if BASELINE || NET45
345345
Assert.Throws<NotImplementedException>(() => connection.Open());
346346
#else
347347
if (AppConfig.SupportedFeatures.HasFlag(ServerFeatures.OpenSsl))

‎tests/SideBySide/DataTypes.cs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Dapper;
88
using MySql.Data.MySqlClient;
99
using Xunit;
10-
using static System.FormattableString;
1110

1211
// mysql-connector-net will throw SqlNullValueException, which is an exception type related to SQL Server:
1312
// "The exception that is thrown when the Value property of a System.Data.SqlTypes structure is set to null."
@@ -96,7 +95,7 @@ public async Task DoGetValue<T>(string column, Func<DbDataReader, int, T> getInt
9695
{
9796
using (var cmd = m_database.Connection.CreateCommand())
9897
{
99-
cmd.CommandText = Invariant($"select {column} from datatypes_integers order by rowid");
98+
cmd.CommandText = $"select {column} from datatypes_integers order by rowid";
10099
using (var reader = await cmd.ExecuteReaderAsync().ConfigureAwait(false))
101100
{
102101
for (int i = 0; i < flags.Length; i++)
@@ -377,7 +376,7 @@ public async Task GetGuid(string column, Type fieldType)
377376
{
378377
using (var cmd = m_database.Connection.CreateCommand())
379378
{
380-
cmd.CommandText = Invariant($"select `{column}` from datatypes_guids order by rowid");
379+
cmd.CommandText = $"select `{column}` from datatypes_guids order by rowid";
381380
using (var reader = await cmd.ExecuteReaderAsync().ConfigureAwait(false))
382381
{
383382
Assert.Equal(fieldType, reader.GetFieldType(0));
@@ -524,7 +523,7 @@ public async Task InsertLargeBlobAsync(string column, int size)
524523
var isSupported = size < 1048576 || AppConfig.SupportedFeatures.HasFlag(ServerFeatures.LargePackets);
525524

526525
long lastInsertId;
527-
using (var cmd = new MySqlCommand(Invariant($"insert into datatypes_blobs(`{column}`) values(?)"), connection, transaction)
526+
using (var cmd = new MySqlCommand($"insert into datatypes_blobs(`{column}`) values(?)", connection, transaction)
528527
{
529528
Parameters = { new MySqlParameter { Value = data } }
530529
})
@@ -545,10 +544,10 @@ public async Task InsertLargeBlobAsync(string column, int size)
545544

546545
if (isSupported)
547546
{
548-
var queryResult = (await connection.QueryAsync<byte[]>(Invariant($"select `{column}` from datatypes_blobs where rowid = {lastInsertId}")).ConfigureAwait(false)).Single();
547+
var queryResult = (await connection.QueryAsync<byte[]>($"select `{column}` from datatypes_blobs where rowid = {lastInsertId}").ConfigureAwait(false)).Single();
549548
TestUtilities.AssertEqual(data, queryResult);
550549

551-
await connection.ExecuteAsync(Invariant($"delete from datatypes_blobs where rowid = {lastInsertId}")).ConfigureAwait(false);
550+
await connection.ExecuteAsync($"delete from datatypes_blobs where rowid = {lastInsertId}").ConfigureAwait(false);
552551
}
553552
}
554553
}
@@ -570,7 +569,7 @@ public void InsertLargeBlobSync(string column, int size)
570569
var isSupported = size < 1048576 || AppConfig.SupportedFeatures.HasFlag(ServerFeatures.LargePackets);
571570

572571
long lastInsertId;
573-
using (var cmd = new MySqlCommand(Invariant($"insert into datatypes_blobs(`{column}`) values(?)"), connection, transaction)
572+
using (var cmd = new MySqlCommand($"insert into datatypes_blobs(`{column}`) values(?)", connection, transaction)
574573
{
575574
Parameters = { new MySqlParameter { Value = data } }
576575
})
@@ -591,10 +590,10 @@ public void InsertLargeBlobSync(string column, int size)
591590

592591
if (isSupported)
593592
{
594-
var queryResult = connection.Query<byte[]>(Invariant($"select `{column}` from datatypes_blobs where rowid = {lastInsertId}")).Single();
593+
var queryResult = connection.Query<byte[]>($"select `{column}` from datatypes_blobs where rowid = {lastInsertId}").Single();
595594
TestUtilities.AssertEqual(data, queryResult);
596595

597-
connection.Execute(Invariant($"delete from datatypes_blobs where rowid = {lastInsertId}"));
596+
connection.Execute($"delete from datatypes_blobs where rowid = {lastInsertId}");
598597
}
599598
}
600599
}
@@ -671,7 +670,7 @@ private void DoQuery<TException>(
671670
connection = connection ?? m_database.Connection;
672671
using (var cmd = connection.CreateCommand())
673672
{
674-
cmd.CommandText = Invariant($"select {column} from datatypes_{table} order by rowid");
673+
cmd.CommandText = $"select {column} from datatypes_{table} order by rowid";
675674
using (var reader = cmd.ExecuteReader())
676675
{
677676
Assert.Equal(dataTypeName, reader.GetDataTypeName(0));
@@ -727,7 +726,7 @@ private void DoQuery<TException>(
727726

728727
if (!omitWhereTest)
729728
{
730-
cmd.CommandText = Invariant($"select rowid from datatypes_{table} where {column} = @value");
729+
cmd.CommandText = $"select rowid from datatypes_{table} where {column} = @value";
731730
var p = cmd.CreateParameter();
732731
p.ParameterName = "@value";
733732
p.Value = expected.Last();

‎tests/SideBySide/QueryTests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,7 @@ public async Task MultipleReaders()
159159
Assert.Throws<MySqlException>(() => cmd2.ExecuteReader());
160160
Assert.Throws<MySqlException>(() => cmd2.ExecuteScalar());
161161

162-
#if NET451
163-
reader1.Close();
164-
#else
165162
reader1.Dispose();
166-
#endif
167163
using (cmd2.ExecuteReader())
168164
{
169165
}

‎tests/SideBySide/SideBySide.csproj

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

33
<PropertyGroup Condition=" '$(Configuration)' != 'Baseline' ">
4-
<TargetFrameworks>netcoreapp1.1.1;net462</TargetFrameworks>
4+
<TargetFrameworks>net451;netcoreapp1.1.1;net462</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup Condition=" '$(Configuration)' == 'Baseline' ">
@@ -45,7 +45,7 @@
4545
<Compile Remove="DebugOnlyTests.cs" />
4646
</ItemGroup>
4747

48-
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
48+
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net462' ">
4949
<Reference Include="System" />
5050
<Reference Include="System.Transactions" />
5151
<Reference Include="Microsoft.CSharp" />

0 commit comments

Comments
 (0)