Skip to content

Commit 3510764

Browse files
lahmalahma
committed
Convert to xUnit v3
1 parent 8003d75 commit 3510764

File tree

14 files changed

+47
-19
lines changed

14 files changed

+47
-19
lines changed

‎.gitattributes‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,7 @@ makefile text
155155

156156
src/NSwag.AspNetCore/SwaggerUi/**/* linguist-vendored
157157
src/NSwag.AspNet.Owin/SwaggerUi/**/* linguist-vendored
158-
src/NSwag.Integration.*/**/* linguist-vendored
158+
src/NSwag.Integration.*/**/* linguist-vendored
159+
160+
# Verify
161+
*.verified.txt text eol=lf working-tree-encoding=UTF-8

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,7 @@ _ReSharper.Caches/
8585
*.gen
8686

8787
node_modules
88+
89+
# Verify
90+
*.received.*
91+
*.received/

‎Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
[SYSLIB0012] 'Assembly.CodeBase' is obsolete
5757
-->
5858
<NoWarn>$(NoWarn);CA1200;CA1510;CA1716;CA1720;CA1725;CA1845;SYSLIB0012</NoWarn>
59+
60+
<!-- Calls to methods which accept CancellationToken should use TestContext.Current.CancellationToken -->
61+
<NoWarn>$(NoWarn);xUnit1051</NoWarn>
62+
5963
</PropertyGroup>
6064

6165
</Project>

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.3.2" />
3232
<PackageVersion Include="NJsonSchema.Yaml" Version="11.3.2" />
3333
<PackageVersion Include="System.Runtime.Loader" Version="4.0.0" />
34-
<PackageVersion Include="Verify.Xunit" Version="30.5.0" />
35-
<PackageVersion Include="xunit" Version="2.9.3" />
34+
<PackageVersion Include="Verify.XunitV3" Version="30.5.0" />
35+
<PackageVersion Include="xunit.v3" Version="3.0.0" />
3636
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
3737
<PackageVersion Include="WixToolset.Util.wixext" Version="6.0.1" />
3838
<PackageVersion Include="WixToolset.UI.wixext" Version="6.0.1" />

‎src/NSwag.CodeGeneration.CSharp.Tests/CSharpCompiler.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ static CSharpCompiler()
1616
.Append(MetadataReference.CreateFromFile(typeof(Microsoft.AspNetCore.Mvc.FileResult).Assembly.Location))
1717
.Append(MetadataReference.CreateFromFile(typeof(Microsoft.AspNetCore.Http.IFormFile).Assembly.Location))
1818
.Append(MetadataReference.CreateFromFile(typeof(Newtonsoft.Json.JsonSerializer).Assembly.Location))
19+
.Append(MetadataReference.CreateFromFile(typeof(System.Net.HttpStatusCode).Assembly.Location))
1920
.Append(MetadataReference.CreateFromFile(typeof(System.ComponentModel.DataAnnotations.RangeAttribute).Assembly.Location))
2021
.Append(MetadataReference.CreateFromFile(typeof(System.Collections.ObjectModel.ObservableCollection<>).Assembly.Location))
2122
.Append(MetadataReference.CreateFromFile(typeof(System.Runtime.Serialization.EnumMemberAttribute).Assembly.Location))

‎src/NSwag.CodeGeneration.CSharp.Tests/NSwag.CodeGeneration.CSharp.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
<TargetFramework>net8.0</TargetFramework>
44
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
55
<NoWarn>$(NoWarn);CA1707;IDE1006</NoWarn>
6+
<OutputType>Exe</OutputType>
67
</PropertyGroup>
78

89
<ItemGroup>
910
<PackageReference Include="GitHubActionsTestLogger" />
1011
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
1112
<PackageReference Include="Microsoft.NET.Test.Sdk" />
12-
<PackageReference Include="Verify.Xunit" />
13-
<PackageReference Include="xunit" />
13+
<PackageReference Include="Verify.XunitV3" />
14+
<PackageReference Include="xunit.v3" />
1415
<PackageReference Include="xunit.runner.visualstudio">
1516
<PrivateAssets>all</PrivateAssets>
1617
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
44
<NoWarn>$(NoWarn);CA1707</NoWarn>
5+
<OutputType>Exe</OutputType>
56
</PropertyGroup>
67

78
<ItemGroup>
89
<PackageReference Include="GitHubActionsTestLogger" />
910
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1011
<PackageReference Include="NJsonSchema.NewtonsoftJson" />
11-
<PackageReference Include="Verify.Xunit" />
12-
<PackageReference Include="xunit" />
12+
<PackageReference Include="Verify.XunitV3" />
13+
<PackageReference Include="xunit.v3" />
1314
<PackageReference Include="xunit.runner.visualstudio">
1415
<PrivateAssets>all</PrivateAssets>
1516
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/NSwag.CodeGeneration.Tests/VerifyChecksTests.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace NSwag.CodeGeneration.Tests;
2+
3+
public class VerifyChecksTests
4+
{
5+
[Fact]
6+
public Task Run() =>
7+
VerifyChecks.Run();
8+
}

‎src/NSwag.CodeGeneration.TypeScript.Tests/NSwag.CodeGeneration.TypeScript.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
<TargetFramework>net8.0</TargetFramework>
44
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
55
<NoWarn>$(NoWarn);CA1707;IDE1006</NoWarn>
6+
<OutputType>Exe</OutputType>
67
</PropertyGroup>
78

89
<ItemGroup>
910
<PackageReference Include="GitHubActionsTestLogger" />
1011
<PackageReference Include="Microsoft.NET.Test.Sdk" />
11-
<PackageReference Include="Verify.Xunit" />
12-
<PackageReference Include="xunit" />
12+
<PackageReference Include="Verify.XunitV3" />
13+
<PackageReference Include="xunit.v3" />
1314
<PackageReference Include="xunit.runner.visualstudio">
1415
<PrivateAssets>all</PrivateAssets>
1516
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/NSwag.ConsoleCore.Tests/NSwag.ConsoleCore.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
<PropertyGroup>
33
<TargetFramework>net9.0</TargetFramework>
44
<NoWarn>$(NoWarn);CA1707</NoWarn>
5+
<OutputType>Exe</OutputType>
56
</PropertyGroup>
67

78
<ItemGroup>
89
<PackageReference Include="GitHubActionsTestLogger" />
910
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10-
<PackageReference Include="xunit" />
11+
<PackageReference Include="xunit.v3" />
1112
<PackageReference Include="xunit.runner.visualstudio">
1213
<PrivateAssets>all</PrivateAssets>
1314
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1415
</PackageReference>
15-
<PackageReference Include="Verify.XUnit" />
16+
<PackageReference Include="Verify.XunitV3" />
1617
</ItemGroup>
1718

1819
<ItemGroup>

0 commit comments

Comments
 (0)