Skip to content

Commit 00abe29

Browse files
agockeagocke
authored
Move to xunit3 (#307)
1 parent 0a70979 commit 00abe29

4 files changed

Lines changed: 15 additions & 14 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,21 @@
77
<PackageVersion Include="Antlr4.Runtime.Standard" Version="4.9.3" />
88
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
99
<PackageVersion Include="FsCheck" Version="3.3.2" />
10-
<PackageVersion Include="FsCheck.Xunit" Version="3.3.2" />
1110
<PackageVersion Include="NuGetizer" Version="1.4.7" />
1211
<PackageVersion Include="StaticCs" Version="0.3.1" />
1312
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
1413
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
1514
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.3" />
1615
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.3" />
17-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1817
<PackageVersion Include="Newtonsoft.JSON" Version="13.0.4" />
1918
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
2019
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
2120
<PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
2221
<PackageVersion Include="PolyKit.Embedded" Version="3.0.9" />
2322
<PackageVersion Include="Verify.SourceGenerators" Version="2.2.0" />
24-
<PackageVersion Include="Verify.XUnit" Version="25.0.4" />
25-
<PackageVersion Include="xunit" Version="2.8.1" />
26-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
23+
<PackageVersion Include="Verify.XunitV3" Version="31.9.4" />
24+
<PackageVersion Include="xunit.v3" Version="3.2.2" />
25+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
2726
</ItemGroup>
2827
</Project>

‎test/Serde.Generation.Test/Serde.Generation.Test.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>$(TestTfm)</TargetFramework>
55
<Nullable>enable</Nullable>
6+
<OutputType>Exe</OutputType>
67

78
<IsPackable>false</IsPackable>
89
<IsTestProject>true</IsTestProject>
@@ -19,8 +20,8 @@
1920
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
2021
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2122
<PackageReference Include="Verify.SourceGenerators" />
22-
<PackageReference Include="Verify.XUnit" />
23-
<PackageReference Include="xunit" />
23+
<PackageReference Include="Verify.XunitV3" />
24+
<PackageReference Include="xunit.v3" />
2425
<PackageReference Include="xunit.runner.visualstudio">
2526
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2627
<PrivateAssets>all</PrivateAssets>

‎test/Serde.Test/JsonFsCheck.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static void Run()
104104
{body}
105105
}}
106106
}}
107-
}}", path: "Driver.cs");
107+
}}", path: "Driver.cs", cancellationToken: TestContext.Current.CancellationToken);
108108

109109
var allTypes = SyntaxTree(CompilationUnit(
110110
externs: default,
@@ -131,15 +131,16 @@ public static void Run()
131131

132132
var comp = CSharpCompilation.Create(
133133
Guid.NewGuid().ToString("N"),
134-
syntaxTrees: new[] { mainTree, allTypes, SyntaxFactory.ParseSyntaxTree(DeepEquals, path: "DeepEquals.cs") },
135-
references: (await s_net10Refs.ResolveAsync(null, default)).Concat(refs),
134+
syntaxTrees: new[] { mainTree, allTypes, SyntaxFactory.ParseSyntaxTree(DeepEquals, path: "DeepEquals.cs", cancellationToken: TestContext.Current.CancellationToken) },
135+
references: (await s_net10Refs.ResolveAsync(null, TestContext.Current.CancellationToken)).Concat(refs),
136136
new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary, generalDiagnosticOption: ReportDiagnostic.Warn));
137137

138138
var driver = CSharpGeneratorDriver.Create(new[] { new SerdeImplRoslynGenerator() });
139139
driver.RunGeneratorsAndUpdateCompilation(
140140
comp,
141141
out var newComp,
142-
out var diagnostics);
142+
out var diagnostics,
143+
TestContext.Current.CancellationToken);
143144

144145
Assert.True(diagnostics.Length == 0, string.Join(Environment.NewLine, diagnostics));
145146

@@ -150,7 +151,7 @@ public static void Run()
150151
win32Resources: null,
151152
manifestResources: null,
152153
options: s_emitOptions,
153-
cancellationToken: default);
154+
cancellationToken: TestContext.Current.CancellationToken);
154155

155156
Assert.True(result.Success,
156157
string.Join(Environment.NewLine, result.Diagnostics));

‎test/Serde.Test/Serde.Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>$(TestTfm)</TargetFramework>
55
<Nullable>enable</Nullable>
6+
<OutputType>Exe</OutputType>
67
<IsPackable>false</IsPackable>
78
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
89
<CompilerGeneratedFilesOutputPath>generated</CompilerGeneratedFilesOutputPath>
@@ -17,7 +18,6 @@
1718

1819
<ItemGroup>
1920
<PackageReference Include="FsCheck" />
20-
<PackageReference Include="FsCheck.Xunit" />
2121
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
2222
<PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing" />
2323
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
@@ -26,7 +26,7 @@
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
<PrivateAssets>all</PrivateAssets>
2828
</PackageReference>
29-
<PackageReference Include="xunit" />
29+
<PackageReference Include="xunit.v3" />
3030
<PackageReference Include="xunit.runner.visualstudio">
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)