Skip to content

Commit 76239f8

Browse files
committed
Merge pull request #111524 from Joy-less/update-source-generator-packages
Update Godot.SourceGenerators packages
2 parents e4c9950 + 580a225 commit 76239f8

16 files changed

+71
-57
lines changed

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/CSharpAnalyzerVerifier.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.CodeAnalysis.CSharp.Testing;
88
using Microsoft.CodeAnalysis.Diagnostics;
99
using Microsoft.CodeAnalysis.Testing;
10-
using Microsoft.CodeAnalysis.Testing.Verifiers;
1110
using Microsoft.CodeAnalysis.Text;
1211

1312
namespace Godot.SourceGenerators.Tests;
@@ -17,7 +16,7 @@ public static class CSharpAnalyzerVerifier<TAnalyzer>
1716
{
1817
public const LanguageVersion LangVersion = LanguageVersion.CSharp11;
1918

20-
public class Test : CSharpAnalyzerTest<TAnalyzer, XUnitVerifier>
19+
public class Test : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
2120
{
2221
public Test()
2322
{

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/CSharpCodeFixVerifier.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
using System.IO;
2-
using System.Threading.Tasks;
31
using Microsoft.CodeAnalysis;
42
using Microsoft.CodeAnalysis.CodeFixes;
53
using Microsoft.CodeAnalysis.CSharp.Testing;
64
using Microsoft.CodeAnalysis.Diagnostics;
7-
using Microsoft.CodeAnalysis.Testing.Verifiers;
5+
using Microsoft.CodeAnalysis.Testing;
6+
using System.IO;
7+
using System.Threading.Tasks;
88

99
namespace Godot.SourceGenerators.Tests;
1010

1111
public static class CSharpCodeFixVerifier<TCodeFix, TAnalyzer>
1212
where TCodeFix : CodeFixProvider, new()
1313
where TAnalyzer : DiagnosticAnalyzer, new()
1414
{
15-
public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
15+
public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
1616
{
1717
public Test()
1818
{

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/CSharpSourceGeneratorVerifier.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
using Microsoft.CodeAnalysis;
77
using Microsoft.CodeAnalysis.CSharp.Testing;
88
using Microsoft.CodeAnalysis.Testing;
9-
using Microsoft.CodeAnalysis.Testing.Verifiers;
109
using Microsoft.CodeAnalysis.Text;
1110

1211
namespace Godot.SourceGenerators.Tests;
1312

1413
public static class CSharpSourceGeneratorVerifier<TSourceGenerator>
1514
where TSourceGenerator : ISourceGenerator, new()
1615
{
17-
public class Test : CSharpSourceGeneratorTest<TSourceGenerator, XUnitVerifier>
16+
public class Test : CSharpSourceGeneratorTest<TSourceGenerator, DefaultVerifier>
1817
{
1918
public Test()
2019
{

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ClassPartialModifierAnalyzerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ await CSharpCodeFixVerifier<ClassPartialModifierCodeFixProvider, ClassPartialMod
1313
}
1414

1515
[Fact]
16-
public async void OuterClassPartialModifierAnalyzerTest()
16+
public async Task OuterClassPartialModifierAnalyzerTest()
1717
{
1818
await CSharpAnalyzerVerifier<ClassPartialModifierAnalyzer>.Verify("OuterClassPartialModifierAnalyzer.GD0002.cs");
1919
}

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ExportDiagnosticsTests.cs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
using System.Threading.Tasks;
12
using Xunit;
23

34
namespace Godot.SourceGenerators.Tests;
45

56
public class ExportDiagnosticsTests
67
{
78
[Fact]
8-
public async void StaticMembers()
9+
public async Task StaticMembers()
910
{
1011
await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
1112
"ExportDiagnostics_GD0101.cs",
@@ -14,7 +15,7 @@ await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
1415
}
1516

1617
[Fact]
17-
public async void TypeIsNotSupported()
18+
public async Task TypeIsNotSupported()
1819
{
1920
await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
2021
"ExportDiagnostics_GD0102.cs",
@@ -23,7 +24,7 @@ await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
2324
}
2425

2526
[Fact]
26-
public async void ReadOnly()
27+
public async Task ReadOnly()
2728
{
2829
await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
2930
"ExportDiagnostics_GD0103.cs",
@@ -32,7 +33,7 @@ await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
3233
}
3334

3435
[Fact]
35-
public async void WriteOnly()
36+
public async Task WriteOnly()
3637
{
3738
await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
3839
"ExportDiagnostics_GD0104.cs",
@@ -41,7 +42,7 @@ await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
4142
}
4243

4344
[Fact]
44-
public async void Indexer()
45+
public async Task Indexer()
4546
{
4647
await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
4748
"ExportDiagnostics_GD0105.cs",
@@ -50,7 +51,7 @@ await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
5051
}
5152

5253
[Fact]
53-
public async void ExplicitInterfaceImplementation()
54+
public async Task ExplicitInterfaceImplementation()
5455
{
5556
await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
5657
new string[] { "ExportDiagnostics_GD0106.cs" },
@@ -63,7 +64,7 @@ await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
6364
}
6465

6566
[Fact]
66-
public async void NodeExports()
67+
public async Task NodeExports()
6768
{
6869
await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
6970
new string[] { "ExportDiagnostics_GD0107.cs" },
@@ -76,7 +77,7 @@ await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
7677
}
7778

7879
[Fact]
79-
public async void ExportToolButtonInNonToolClass()
80+
public async Task ExportToolButtonInNonToolClass()
8081
{
8182
await CSharpSourceGeneratorVerifier<ScriptPropertiesGenerator>.Verify(
8283
new string[] { "ExportDiagnostics_GD0108.cs" },
@@ -85,7 +86,7 @@ await CSharpSourceGeneratorVerifier<ScriptPropertiesGenerator>.Verify(
8586
}
8687

8788
[Fact]
88-
public async void ExportAndExportToolButtonOnSameMember()
89+
public async Task ExportAndExportToolButtonOnSameMember()
8990
{
9091
await CSharpSourceGeneratorVerifier<ScriptPropertiesGenerator>.Verify(
9192
new string[] { "ExportDiagnostics_GD0109.cs" },
@@ -94,7 +95,7 @@ await CSharpSourceGeneratorVerifier<ScriptPropertiesGenerator>.Verify(
9495
}
9596

9697
[Fact]
97-
public async void ExportToolButtonOnNonCallable()
98+
public async Task ExportToolButtonOnNonCallable()
9899
{
99100
await CSharpSourceGeneratorVerifier<ScriptPropertiesGenerator>.Verify(
100101
new string[] { "ExportDiagnostics_GD0110.cs" },
@@ -103,7 +104,7 @@ await CSharpSourceGeneratorVerifier<ScriptPropertiesGenerator>.Verify(
103104
}
104105

105106
[Fact]
106-
public async void ExportToolButtonStoringCallable()
107+
public async Task ExportToolButtonStoringCallable()
107108
{
108109
await CSharpSourceGeneratorVerifier<ScriptPropertiesGenerator>.Verify(
109110
new string[] { "ExportDiagnostics_GD0111.cs" },

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/GlobalClassAnalyzerTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1+
using System.Threading.Tasks;
12
using Xunit;
23

34
namespace Godot.SourceGenerators.Tests;
45

56
public class GlobalClassAnalyzerTests
67
{
78
[Fact]
8-
public async void GlobalClassMustDeriveFromGodotObjectTest()
9+
public async Task GlobalClassMustDeriveFromGodotObjectTest()
910
{
1011
const string GlobalClassGD0401 = "GlobalClass.GD0401.cs";
1112
await CSharpAnalyzerVerifier<GlobalClassAnalyzer>.Verify(GlobalClassGD0401);
1213
}
1314

1415
[Fact]
15-
public async void GlobalClassMustNotBeGenericTest()
16+
public async Task GlobalClassMustNotBeGenericTest()
1617
{
1718
const string GlobalClassGD0402 = "GlobalClass.GD0402.cs";
1819
await CSharpAnalyzerVerifier<GlobalClassAnalyzer>.Verify(GlobalClassGD0402);

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/Godot.SourceGenerators.Tests.csproj

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,27 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.1" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.1" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
18+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2" />
19+
20+
<!-- Must support oldest .NET 8.0 version (see https://github.com/dotnet/roslyn/blob/main/docs/wiki/NuGet-packages.md#versioning) -->
1921
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
20-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
22-
<PackageReference Include="Microsoft.CodeAnalysis.Testing.Verifiers.XUnit" Version="1.1.1" />
23-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.1" />
24-
<PackageReference Include="xunit" Version="2.4.2" />
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
22+
23+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
25+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.2" />
26+
<PackageReference Include="xunit" Version="2.9.3" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2628
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2729
<PrivateAssets>all</PrivateAssets>
2830
</PackageReference>
29-
<PackageReference Include="coverlet.collector" Version="3.2.0">
31+
<PackageReference Include="coverlet.collector" Version="6.0.4">
3032
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3133
<PrivateAssets>all</PrivateAssets>
3234
</PackageReference>
35+
36+
<!-- Explicit reference needed to fix vulnerability: https://github.com/dotnet/roslyn-sdk/issues/1191 -->
37+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.10" />
3338
</ItemGroup>
3439

3540
<ItemGroup>

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/KeywordClassNameAndNamespaceTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
using System.Threading.Tasks;
12
using Xunit;
23

34
namespace Godot.SourceGenerators.Tests;
45

56
public class KeywordClassAndNamespaceTest
67
{
78
[Fact]
8-
public async void GenerateScriptMethodsTest()
9+
public async Task GenerateScriptMethodsTest()
910
{
1011
await CSharpSourceGeneratorVerifier<ScriptMethodsGenerator>.Verify(
1112
"KeywordClassNameAndNamespace.cs",

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/MustBeVariantAnalyzerTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1+
using System.Threading.Tasks;
12
using Xunit;
23

34
namespace Godot.SourceGenerators.Tests;
45

56
public class MustBeVariantAnalyzerTests
67
{
78
[Fact]
8-
public async void GenericTypeArgumentMustBeVariantTest()
9+
public async Task GenericTypeArgumentMustBeVariantTest()
910
{
1011
const string MustBeVariantGD0301 = "MustBeVariant.GD0301.cs";
1112
await CSharpAnalyzerVerifier<MustBeVariantAnalyzer>.Verify(MustBeVariantGD0301);
1213
}
1314

1415
[Fact]
15-
public async void GenericTypeParameterMustBeVariantAnnotatedTest()
16+
public async Task GenericTypeParameterMustBeVariantAnnotatedTest()
1617
{
1718
const string MustBeVariantGD0302 = "MustBeVariant.GD0302.cs";
1819
await CSharpAnalyzerVerifier<MustBeVariantAnalyzer>.Verify(MustBeVariantGD0302);

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/NestedInGenericTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
using System.Threading.Tasks;
12
using Xunit;
23

34
namespace Godot.SourceGenerators.Tests;
45

56
public class NestedInGenericTest
67
{
78
[Fact]
8-
public async void GenerateScriptMethodsTest()
9+
public async Task GenerateScriptMethodsTest()
910
{
1011
await CSharpSourceGeneratorVerifier<ScriptMethodsGenerator>.Verify(
1112
"NestedInGeneric.cs",

0 commit comments

Comments
 (0)