From ec17091ef6b5d29e779d175523653d0ce37089b0 Mon Sep 17 00:00:00 2001
From: Byron Mayne <byronmayne@gmail.com>
Date: Sun, 4 Oct 2026 14:52:25 -0400
Subject: [PATCH 1/4] Upgraded the projects to .net 10

Also bumped the version of xUnit that is being used
---
 src/Directory.Build.props                     |  7 ++++++
 src/Directory.Packages.props                  |  1 +
 .../ConsoleApp.SourceGenerator.Tests.csproj   | 21 +++---------------
 .../CompiliationTestBase.cs                   |  4 ++--
 .../ExtendedAnalyzerRuleTests.cs              |  1 -
 .../SourceGenerator.Foundations.Tests.csproj  | 22 +------------------
 .../SourceGeneratorAnalyzerTests.cs           |  1 -
 7 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index d66d22e..98c2102 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -38,4 +38,11 @@
     <Message Importance="high" Text="SGFMSBuildProjectDir: $(SGFMSBuildProjectDir)"/>
     <Message Importance="high" Text="SGFWindowsPluginProjectDir: $(SGFWindowsPluginProjectDir)"/>
   </Target>
+	<PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Tests'))">
+        <IsPackable>false</IsPackable>
+		<TargetFramework>net10.0</TargetFramework>
+		<IsPackable>false</IsPackable>
+		<IsTestProject>true</IsTestProject>
+		<ImplicitUsings>true</ImplicitUsings>
+	</PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 44c8a66..86c0ed7 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -21,5 +21,6 @@
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="xunit" Version="2.5.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageVersion Include="xunit.v3" Version="4.0.1" />
   </ItemGroup>
 </Project>
\ 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..95fa14a 100644
--- a/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj
+++ b/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj
@@ -1,23 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <LangVersion>12</LangVersion>
-
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk"  />
-    <PackageReference Include="Newtonsoft.Json"  />
-    <PackageReference Include="System.Net.Http" />
-    <PackageReference Include="System.Text.RegularExpressions" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="xunit.v3" />
   </ItemGroup>
 
   <ItemGroup>
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..f313bae 100644
--- a/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
+++ b/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
@@ -1,30 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <LangVersion>12</LangVersion>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Newtonsoft.Json" />
-    <PackageReference Include="System.Net.Http"/>
-    <PackageReference Include="System.Text.RegularExpressions"/>
-    <PackageReference Include="xunit"/>
-    <PackageReference Include="xunit.runner.visualstudio">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
 
     <!-- ==== Referencing Analyzers ====
       Normally you never actually reference the analyzer they just get used by the compiler internally.
@@ -32,6 +11,7 @@
       to reference the type, so that is this weird workaround of using the path and navigating to the dll
     -->
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" GeneratePathProperty="true" />
+    <PackageReference Include="xunit.v3" />
     <Reference Include="$(PkgMicrosoft_CodeAnalysis_Analyzers)\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
     <Reference Include="$(PkgMicrosoft_CodeAnalysis_Analyzers)\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
   </ItemGroup>
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
 {

From 6feee5725635665f40d72a5ea16b7d58ca7d908d Mon Sep 17 00:00:00 2001
From: Byron Mayne <byronmayne@gmail.com>
Date: Sun, 4 Oct 2026 15:02:36 -0400
Subject: [PATCH 2/4] Continued the upgrade for the xunit tests

---
 src/Directory.Build.props                                | 1 +
 src/Directory.Packages.props                             | 1 +
 .../ConsoleApp.SourceGenerator.Tests.csproj              | 3 ++-
 .../SourceGenerator.Foundations.Tests.csproj             | 1 +
 src/SourceGenerator.Foundations.sln                      | 1 +
 src/global.json                                          | 9 +++++++++
 6 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/global.json

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 98c2102..2e002e2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -44,5 +44,6 @@
 		<IsPackable>false</IsPackable>
 		<IsTestProject>true</IsTestProject>
 		<ImplicitUsings>true</ImplicitUsings>
+		<OutputType>Exe</OutputType>
 	</PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 86c0ed7..885d94f 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -14,6 +14,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.3.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.Testing.Platform" Version="2.4.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.4.33103.184" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageVersion Include="System.Management" Version="7.0.0" />
diff --git a/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj b/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj
index 95fa14a..d692100 100644
--- a/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj
+++ b/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj
@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Microsoft.Testing.Platform" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="xunit.v3" />
   </ItemGroup>
diff --git a/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj b/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
index f313bae..8dc0611 100644
--- a/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
+++ b/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
@@ -3,6 +3,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Microsoft.Testing.Platform" />
     <PackageReference Include="Newtonsoft.Json" />
 
     <!-- ==== Referencing Analyzers ====
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

From 6cd14b5b39ff7712c9eb4dced2e6d38286bf29a3 Mon Sep 17 00:00:00 2001
From: Byron Mayne <byronmayne@gmail.com>
Date: Sun, 4 Oct 2026 15:04:27 -0400
Subject: [PATCH 3/4] Added back xunit

---
 src/Directory.Packages.props                                  | 2 +-
 .../ConsoleApp.SourceGenerator.Tests.csproj                   | 4 ++++
 .../SourceGenerator.Foundations.Tests.csproj                  | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 885d94f..2125d4a 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -21,7 +21,7 @@
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="xunit" Version="2.5.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="4.0.0" />
     <PackageVersion Include="xunit.v3" Version="4.0.1" />
   </ItemGroup>
 </Project>
\ 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 d692100..ec71507 100644
--- a/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj
+++ b/src/Sandbox/ConsoleApp.SourceGenerator.Tests/ConsoleApp.SourceGenerator.Tests.csproj
@@ -3,6 +3,10 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Testing.Platform" />
     <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="xunit.v3" />
   </ItemGroup>
 
diff --git a/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj b/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
index 8dc0611..7fc89c5 100644
--- a/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
+++ b/src/SourceGenerator.Foundations.Tests/SourceGenerator.Foundations.Tests.csproj
@@ -12,6 +12,10 @@
       to reference the type, so that is this weird workaround of using the path and navigating to the dll
     -->
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" GeneratePathProperty="true" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="xunit.v3" />
     <Reference Include="$(PkgMicrosoft_CodeAnalysis_Analyzers)\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
     <Reference Include="$(PkgMicrosoft_CodeAnalysis_Analyzers)\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />

From 17ac19adea3cd1d4860dcaae9ca3cd29503f1357 Mon Sep 17 00:00:00 2001
From: Byron Mayne <byronmayne@gmail.com>
Date: Sun, 4 Oct 2026 15:11:27 -0400
Subject: [PATCH 4/4] Updated the CI .net version

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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