Skip to content

Commit 57e2efe

Browse files
BorisDogBorisDog
committed
CSHARP-4400: Upgrade xunit to 2.4.2
1 parent c687884 commit 57e2efe

File tree

20 files changed

+23
-179
lines changed

20 files changed

+23
-179
lines changed

‎CSharpDriver.sln

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30011.22
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.3.32728.150
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D2012971-32BB-4C5F-BFC4-30A9994AB152}"
77
EndProject
@@ -48,13 +48,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
4848
MongoDBTest.ruleset = MongoDBTest.ruleset
4949
EndProjectSection
5050
EndProject
51-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkippableTests", "tests\SkippableTests\SkippableTests.csproj", "{D198833A-6AC3-4327-8B02-5095455192D0}"
52-
EndProject
5351
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.TestConsoleApplication", "tests\MongoDB.Driver.TestConsoleApplication\MongoDB.Driver.TestConsoleApplication.csproj", "{2E5780D2-29A5-483C-9CA2-844F45A66D0C}"
5452
EndProject
5553
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AstrolabeWorkloadExecutor", "tests\AstrolabeWorkloadExecutor\AstrolabeWorkloadExecutor.csproj", "{B90F025F-89D3-436A-AD78-6AA304A6E240}"
5654
EndProject
57-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.SmokeTests.Sdk", "tests\SmokeTests\MongoDB.Driver.SmokeTests.Sdk\MongoDB.Driver.SmokeTests.Sdk.csproj", "{B711A69F-A337-452C-95E1-A6B15C727CBA}"
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.SmokeTests.Sdk", "tests\SmokeTests\MongoDB.Driver.SmokeTests.Sdk\MongoDB.Driver.SmokeTests.Sdk.csproj", "{B711A69F-A337-452C-95E1-A6B15C727CBA}"
5856
EndProject
5957
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SmokeTests", "SmokeTests", "{F64BF86A-1EF1-4596-84A6-6B4AB766CD77}"
6058
EndProject
@@ -128,10 +126,6 @@ Global
128126
{7A015030-6329-4FAD-B6E3-CED5ED53019C}.Debug|Any CPU.Build.0 = Debug|Any CPU
129127
{7A015030-6329-4FAD-B6E3-CED5ED53019C}.Release|Any CPU.ActiveCfg = Release|Any CPU
130128
{7A015030-6329-4FAD-B6E3-CED5ED53019C}.Release|Any CPU.Build.0 = Release|Any CPU
131-
{D198833A-6AC3-4327-8B02-5095455192D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
132-
{D198833A-6AC3-4327-8B02-5095455192D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
133-
{D198833A-6AC3-4327-8B02-5095455192D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
134-
{D198833A-6AC3-4327-8B02-5095455192D0}.Release|Any CPU.Build.0 = Release|Any CPU
135129
{2E5780D2-29A5-483C-9CA2-844F45A66D0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
136130
{2E5780D2-29A5-483C-9CA2-844F45A66D0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
137131
{2E5780D2-29A5-483C-9CA2-844F45A66D0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -165,7 +159,6 @@ Global
165159
{C50D554C-2771-4CC1-9B2C-BB17FB27F935} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
166160
{DAB8DFFD-0020-43B3-9C08-7723F5D68E90} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
167161
{7A015030-6329-4FAD-B6E3-CED5ED53019C} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
168-
{D198833A-6AC3-4327-8B02-5095455192D0} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
169162
{2E5780D2-29A5-483C-9CA2-844F45A66D0C} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
170163
{B90F025F-89D3-436A-AD78-6AA304A6E240} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
171164
{B711A69F-A337-452C-95E1-A6B15C727CBA} = {F64BF86A-1EF1-4596-84A6-6B4AB766CD77}

‎tests/AtlasConnectivity.Tests/AtlasConnectivity.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<PackageReference Include="FluentAssertions" Version="4.12.0" />
4444
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
4545
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
46-
<PackageReference Include="xunit" Version="2.4.0" />
47-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
46+
<PackageReference Include="xunit" Version="2.4.2" />
47+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
4848
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
4949
</ItemGroup>
5050

‎tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<ItemGroup>
3737
<PackageReference Include="FluentAssertions" Version="4.12.0" />
3838
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
39-
<PackageReference Include="xunit" Version="2.4.0" />
39+
<PackageReference Include="xunit" Version="2.4.2" />
4040
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
4141
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
4242
</ItemGroup>

‎tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
6363
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
6464
<PackageReference Include="Moq" Version="4.9.0" />
65-
<PackageReference Include="xunit" Version="2.4.0" />
66-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
65+
<PackageReference Include="xunit" Version="2.4.2" />
66+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
6767
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
6868
</ItemGroup>
6969

‎tests/MongoDB.Driver.Core.TestHelpers/MongoDB.Driver.Core.TestHelpers.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<ItemGroup>
5353
<PackageReference Include="FluentAssertions" Version="4.12.0" />
5454
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
55-
<PackageReference Include="xunit" Version="2.4.0" />
55+
<PackageReference Include="xunit" Version="2.4.2" />
5656
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
5757
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
5858
</ItemGroup>

‎tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestInvoker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ protected override async Task<decimal> InvokeTestMethodAsync(object testClassIns
7676
{
7777
var exception = Aggregator.ToException();
7878

79-
if (exception is not SkipException)
79+
if (exception is not Xunit.SkipException)
8080
{
8181
testLoggable.OnException(exception);
8282
}

‎tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestMethodRunner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing
2626
[DebuggerStepThrough]
2727
internal sealed class TimeoutEnforcingXunitTestMethodRunner : XunitTestMethodRunner
2828
{
29-
private static string[] __skippingExceptionNames = new string[] { typeof(SkipException).FullName };
29+
private static string[] __skippingExceptionNames = new string[] { typeof(Xunit.SkipException).FullName };
3030

3131
private readonly object[] _constructorArguments;
3232
private readonly IMessageSink _diagnosticMessageSink;

‎tests/MongoDB.Driver.Core.Tests/MongoDB.Driver.Core.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
5656
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
5757
<PackageReference Include="Moq" Version="4.9.0" />
58-
<PackageReference Include="xunit" Version="2.4.0" />
59-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
58+
<PackageReference Include="xunit" Version="2.4.2" />
59+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
6060
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
6161
</ItemGroup>
6262

‎tests/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<PackageReference Include="FluentAssertions" Version="4.12.0" />
3838
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
3939
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
40-
<PackageReference Include="xunit" Version="2.4.0" />
41-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
40+
<PackageReference Include="xunit" Version="2.4.2" />
41+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
4242
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
4343
</ItemGroup>
4444

‎tests/MongoDB.Driver.GridFS.Tests/MongoDB.Driver.GridFS.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
4646
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
4747
<PackageReference Include="Moq" Version="4.9.0" />
48-
<PackageReference Include="xunit" Version="2.4.0" />
49-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
48+
<PackageReference Include="xunit" Version="2.4.2" />
49+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
5050
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
5151
</ItemGroup>
5252

‎tests/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
5353
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
5454
<PackageReference Include="Moq" Version="4.9.0" />
55-
<PackageReference Include="xunit" Version="2.4.0" />
56-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
55+
<PackageReference Include="xunit" Version="2.4.2" />
56+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
5757
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
5858
</ItemGroup>
5959

‎tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
5656
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
5757
<PackageReference Include="Moq" Version="4.9.0" />
58-
<PackageReference Include="xunit" Version="2.4.0" />
59-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
58+
<PackageReference Include="xunit" Version="2.4.2" />
59+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
6060
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
6161
</ItemGroup>
6262

‎tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
using MongoDB.Driver.Core.Authentication.External;
3434
using MongoDB.Driver.Core.Bindings;
3535
using MongoDB.Driver.Core.Clusters;
36-
using MongoDB.Driver.Core.Configuration;
3736
using MongoDB.Driver.Core.Events;
3837
using MongoDB.Driver.Core.Misc;
3938
using MongoDB.Driver.Core.Operations;
@@ -47,6 +46,7 @@
4746
using Xunit.Abstractions;
4847
using Xunit.Sdk;
4948
using Reflector = MongoDB.Bson.TestHelpers.Reflector;
49+
using SkipException = Xunit.SkipException;
5050

5151
namespace MongoDB.Driver.Tests.Specifications.client_side_encryption.prose_tests
5252
{

‎tests/SkippableTests/FactTests.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎tests/SkippableTests/SkippableFactTests.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎tests/SkippableTests/SkippableTests.csproj

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎tests/SkippableTests/SkippableTheoryTests.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎tests/SkippableTests/TheoryTests.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎tests/SkippableTests/xunit.runner.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/MongoDB.Driver.SmokeTests.Sdk.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<PackageReference Include="FluentAssertions" Version="4.12.0" />
2222
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
2323
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
24-
<PackageReference Include="xunit" Version="2.4.1" />
24+
<PackageReference Include="xunit" Version="2.4.2" />
2525
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
2626
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
2727
</ItemGroup>

0 commit comments

Comments
 (0)