diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cfad5ac..ec67001 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
- dotnet-version: 6.0.x
+ dotnet-version: 10.0.x
- name: Build Solution
run: dotnet test src\SourceGenerator.Foundations.sln
@@ -40,7 +40,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
- dotnet-version: 6.0.x
+ dotnet-version: 10.0.x
- name: Test | ${{ matrix.project.name }}
run: dotnet test src\${{ matrix.project.path }}${{ matrix.project.name }}\${{ matrix.project.name }}.csproj
@@ -65,7 +65,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
- dotnet-version: 6.0.x
+ dotnet-version: 10.0.x
- name: Restore
run: dotnet tool restore
- name: GitVersion
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index d66d22e..2e002e2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -38,4 +38,12 @@
+
+ false
+ net10.0
+ false
+ true
+ true
+ Exe
+
\ No newline at end of file
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 44c8a66..2125d4a 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -14,12 +14,14 @@
+
-
+
+
\ No newline at end of file
diff --git a/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj b/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj
index 4ca0e9d..ec71507 100644
--- a/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj
+++ b/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj
@@ -1,23 +1,13 @@
-
-
-
- net8.0
- enable
- enable
- 12
-
- false
- true
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
diff --git a/src/SourceGenerator.Foundations.Tests/CompiliationTestBase.cs b/src/SourceGenerator.Foundations.Tests/CompiliationTestBase.cs
index 08d3e89..fb6e795 100644
--- a/src/SourceGenerator.Foundations.Tests/CompiliationTestBase.cs
+++ b/src/SourceGenerator.Foundations.Tests/CompiliationTestBase.cs
@@ -5,7 +5,7 @@
using System.Collections.Immutable;
using System.Reflection;
using System.Text;
-using Xunit.Abstractions;
+using Xunit.Sdk;
namespace SGF
{
@@ -39,7 +39,7 @@ protected CompilationTestBase(ITestOutputHelper outputHelper)
ITest? test = testField?.GetValue(outputHelper) as ITest;
if (test != null)
{
- TestMethodName = test.TestCase.TestMethod.ToString()!;
+ TestMethodName = test.TestCase.TestMethod?.ToString()!;
}
AddAssemblyReference("System.Runtime");
diff --git a/src/SourceGenerator.Foundations.Tests/ExtendedAnalyzerRuleTests.cs b/src/SourceGenerator.Foundations.Tests/ExtendedAnalyzerRuleTests.cs
index c335f30..a739aa0 100644
--- a/src/SourceGenerator.Foundations.Tests/ExtendedAnalyzerRuleTests.cs
+++ b/src/SourceGenerator.Foundations.Tests/ExtendedAnalyzerRuleTests.cs
@@ -1,6 +1,5 @@
using Microsoft.CodeAnalysis.CSharp.Analyzers;
using SGF;
-using Xunit.Abstractions;
namespace SourceGenerator.Foundations.Tests
{
diff --git a/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj b/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
index 5e717da..7fc89c5 100644
--- a/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
+++ b/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
@@ -1,30 +1,10 @@
-
-
- net6.0
- enable
- 12
- enable
-
- false
-
-
+
-
-
-
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
diff --git a/src/SourceGenerator.Foundations.Tests/SourceGeneratorAnalyzerTests.cs b/src/SourceGenerator.Foundations.Tests/SourceGeneratorAnalyzerTests.cs
index d1fc893..5e03a97 100644
--- a/src/SourceGenerator.Foundations.Tests/SourceGeneratorAnalyzerTests.cs
+++ b/src/SourceGenerator.Foundations.Tests/SourceGeneratorAnalyzerTests.cs
@@ -1,7 +1,6 @@
using SGF;
using SGF.Analyzer;
using SGF.Analyzer.Rules;
-using Xunit.Abstractions;
namespace SourceGenerator.Foundations.Tests
{
diff --git a/src/SourceGenerator.Foundations.sln b/src/SourceGenerator.Foundations.sln
index 729e2f8..103dff0 100644
--- a/src/SourceGenerator.Foundations.sln
+++ b/src/SourceGenerator.Foundations.sln
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props
+ global.json = global.json
Nuget.Build.props = Nuget.Build.props
EndProjectSection
EndProject
diff --git a/src/global.json b/src/global.json
new file mode 100644
index 0000000..48af597
--- /dev/null
+++ b/src/global.json
@@ -0,0 +1,9 @@
+{
+ "sdk": {
+ "version": "10.0.100",
+ "rollForward": "latestFeature"
+ },
+ "test": {
+ "runner": "Microsoft.Testing.Platform"
+ }
+}
\ No newline at end of file