Skip to content

Commit a4f7f6c

Browse files
authored
Update to xUnit 2.3.
1 parent d828ef4 commit a4f7f6c

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ script:
3232
- pushd tests/MySqlConnector.Tests && dotnet xunit -c Release && popd
3333
- pushd tests/SideBySide
3434
- dotnet build SideBySide.csproj -c Release -f netcoreapp2.0
35-
- echo 'Executing netcoreapp1.1.2 tests with No Compression, No SSL' && ../../.ci/use-config.sh config.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet xunit -c Release -f netcoreapp1.1.2
36-
- echo 'Executing netcoreapp2.0 tests with No Compression, No SSL' && ../../.ci/use-config.sh config.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet xunit -c Release -f netcoreapp2.0
37-
- echo 'Executing netcoreapp2.0 Debug Only tests' && time dotnet xunit -c Debug -f netcoreapp2.0 -class SideBySide.DebugOnlyTests
38-
- echo 'Executing netcoreapp2.0 tests with Compression, No SSL' && ../../.ci/use-config.sh config.compression.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet xunit -c Release -f netcoreapp2.0
39-
- echo 'Executing netcoreapp2.0 tests with No Compression, SSL' && ../../.ci/use-config.sh config.ssl.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet xunit -c Release -f netcoreapp2.0
40-
- echo 'Executing netcoreapp2.0 tests with Compression, SSL' && ../../.ci/use-config.sh config.compression+ssl.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet xunit -c Release -f netcoreapp2.0
41-
- echo 'Executing netcoreapp2.0 tests with Unix Domain Socket, No Compression, No SSL' && ../../.ci/use-config.sh config.uds.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet xunit -c Release -f netcoreapp2.0
42-
- echo 'Executing netcoreapp2.0 tests with Buffering, No Compression, No SSL' && ../../.ci/use-config.sh config.buffer.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet xunit -c Release -f netcoreapp2.0
35+
- echo 'Executing netcoreapp1.1.2 tests with No Compression, No SSL' && ../../.ci/use-config.sh config.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet test -c Release -f netcoreapp1.1.2
36+
- echo 'Executing netcoreapp2.0 tests with No Compression, No SSL' && ../../.ci/use-config.sh config.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet test -c Release -f netcoreapp2.0
37+
- echo 'Executing netcoreapp2.0 Debug Only tests' && time dotnet test -c Debug -f netcoreapp2.0 --filter="FullyQualifiedName~SideBySide.DebugOnlyTests"
38+
- echo 'Executing netcoreapp2.0 tests with Compression, No SSL' && ../../.ci/use-config.sh config.compression.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet test -c Release -f netcoreapp2.0
39+
- echo 'Executing netcoreapp2.0 tests with No Compression, SSL' && ../../.ci/use-config.sh config.ssl.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet test -c Release -f netcoreapp2.0
40+
- echo 'Executing netcoreapp2.0 tests with Compression, SSL' && ../../.ci/use-config.sh config.compression+ssl.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet test -c Release -f netcoreapp2.0
41+
- echo 'Executing netcoreapp2.0 tests with Unix Domain Socket, No Compression, No SSL' && ../../.ci/use-config.sh config.uds.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet test -c Release -f netcoreapp2.0
42+
- echo 'Executing netcoreapp2.0 tests with Buffering, No Compression, No SSL' && ../../.ci/use-config.sh config.buffer.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet test -c Release -f netcoreapp2.0
4343
- popd
4444

4545
after_script:

tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
22-
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-build3769" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
21+
<PackageReference Include="xunit" Version="2.3.0" />
22+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
2425
</ItemGroup>
2526

2627
<ItemGroup Condition=" '$(Configuration)' != 'Baseline' ">

tests/SideBySide/AppConfig.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4+
using System.Reflection;
45
using Microsoft.Extensions.Configuration;
56

67
using MySql.Data.MySqlClient;
@@ -21,6 +22,11 @@ public static class AppConfig
2122

2223
private static IConfiguration ConfigBuilder { get; } = new ConfigurationBuilder()
2324
.AddInMemoryCollection(DefaultConfig)
25+
#if NETCOREAPP1_1_2
26+
.SetBasePath(Path.GetDirectoryName(typeof(AppConfig).GetTypeInfo().Assembly.Location))
27+
#elif NETCOREAPP2_0
28+
.SetBasePath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location))
29+
#endif
2430
.AddJsonFile("config.json")
2531
.Build();
2632

tests/SideBySide/SideBySide.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
<ItemGroup>
2424
<!--testing packages-->
2525
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
26-
<PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
28-
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-build3769" />
26+
<PackageReference Include="xunit" Version="2.3.0" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
28+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
2929
<!--app packages-->
3030
<PackageReference Include="Dapper" Version="1.50.2" />
3131
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.1" />

0 commit comments

Comments
 (0)