Skip to content

Commit 51658c9

Browse files
committed
Update SideBySide tests to .NET 4.6.2.
This allows xunit to be updated to the latest 2.x version. Signed-off-by: Bradley Grainger <[email protected]>
1 parent c5fb5b1 commit 51658c9

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.ci/test.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ pushd .\tests\SideBySide
2828

2929
echo "Executing tests with No Compression, No SSL"
3030
Copy-Item -Force ..\..\.ci\config\config.json config.json
31-
dotnet test -c Release -f net452
31+
dotnet test -c Release -f net462
3232
if ($LASTEXITCODE -ne 0){
3333
exit $LASTEXITCODE;
3434
}
35-
dotnet test -c Release -f net461
35+
dotnet test -c Release -f net7.0
3636
if ($LASTEXITCODE -ne 0){
3737
exit $LASTEXITCODE;
3838
}

tests/SideBySide/ClientFactoryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void CreateDataAdapter()
4646
[Fact]
4747
public void DbProviderFactoriesGetFactory()
4848
{
49-
#if !NET461 && !NET472
49+
#if !NET462 && !NET472
5050
DbProviderFactories.RegisterFactory("MySqlConnector", MySqlConnectorFactory.Instance);
5151
#endif
5252
#if BASELINE

tests/SideBySide/SideBySide.csproj

Lines changed: 4 additions & 4 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>net461;net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
55
<CheckEolTargetFramework>false</CheckEolTargetFramework>
66
</PropertyGroup>
77

@@ -29,8 +29,8 @@
2929
<ItemGroup>
3030
<!--testing packages-->
3131
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
32-
<PackageReference Include="xunit" Version="2.4.1" />
33-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
32+
<PackageReference Include="xunit" Version="2.4.2" />
33+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
3434
<!--app packages-->
3535
<PackageReference Include="Dapper.StrongName" Version="1.60.1" />
3636
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.2" />
@@ -56,7 +56,7 @@
5656
<Using Include="MySql.Data.MySqlClient" />
5757
</ItemGroup>
5858

59-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'net472' ">
59+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net472' ">
6060
<Reference Include="System" />
6161
<Reference Include="System.Transactions" />
6262
<Reference Include="Microsoft.CSharp" />

tests/SideBySide/SslTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public async Task ConnectSslTlsVersion()
226226
expectedProtocol == SslProtocols.Tls11 ? "TLSv1.1" : "TLSv1";
227227
#pragma warning restore SYSLIB0039 // SslProtocols.Tls11 is obsolete
228228

229-
#if !NET461 && !NET472
229+
#if !NET462 && !NET472
230230
// https://docs.microsoft.com/en-us/dotnet/core/whats-new/dotnet-core-3-0#tls-13--openssl-111-on-linux
231231
if (expectedProtocol == SslProtocols.Tls12 && AppConfig.SupportedFeatures.HasFlag(ServerFeatures.Tls13) && RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
232232
{

tests/SideBySide/Transaction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public async Task ReadWriteTransactionAsync()
169169
Assert.Equal(new[] { 1, 2 }, results);
170170
}
171171

172-
#if !NET461 && !NET472
172+
#if !NET462 && !NET472
173173
[Fact]
174174
public async Task DbConnectionCommitAsync()
175175
{
@@ -241,7 +241,7 @@ public async Task RollbackDisposeAsync()
241241
Assert.Equal(new int[0], results);
242242
}
243243

244-
#if !NET461 && !NET472
244+
#if !NET462 && !NET472
245245
[Fact]
246246
public async Task DbConnectionRollbackAsync()
247247
{

0 commit comments

Comments
 (0)