RM-9395 Update CSharpAnalyzerVerifier for .NET 9

re-motion · Nov 8, 2024 · a6f9433 · a6f9433
1 parent 7876272
commit a6f9433
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/Remotion/Core/Development.Analyzers.IntegrationTests/CSharpAnalyzerVerifier.cs b/Remotion/Core/Development.Analyzers.IntegrationTests/CSharpAnalyzerVerifier.cs
@@ -34,8 +34,9 @@ private class Test : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
     {
     }
 
-    private static readonly Lazy<ReferenceAssemblies> s_net80 =
-        new(() => new ReferenceAssemblies("net8.0", new PackageIdentity("Microsoft.NETCore.App.Ref", "8.0.0"), Path.Combine("ref", "net8.0")));
+    // Workaround when .NET version is not yet available as a ReferenceAsseblies entry.
+    private static readonly Lazy<ReferenceAssemblies> s_net100 =
+         new(() => new ReferenceAssemblies("net10.0", new PackageIdentity("Microsoft.NETCore.App.Ref", "10.0.0"), Path.Combine("ref", "net10.0")));
 
     public static DiagnosticResult Diagnostic (DiagnosticDescriptor desc) => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(desc);
 
@@ -70,8 +71,9 @@ private static ReferenceAssemblies GetReferenceAssemblies (Assembly assembly)
     {
       return assembly.GetCustomAttribute<TargetFrameworkAttribute>()!.FrameworkName switch
       {
-          // RM-8930 Previous syntax for when the assemblies were easily accessible: ".NETCoreApp,Version=v6.0" => ReferenceAssemblies.Net.Net60
-          ".NETCoreApp,Version=v8.0" => s_net80.Value,
+          ".NETCoreApp,Version=v8.0" => ReferenceAssemblies.Net.Net80,
+          ".NETCoreApp,Version=v9.0" => ReferenceAssemblies.Net.Net90,
+          ".NETCoreApp,Version=v10.0" => s_net100.Value,
           var frameworkName => throw new NotSupportedException($"'{frameworkName}' is not supported.")
       };
     }

diff --git a/Remotion/Web/Development.Analyzers.IntegrationTests/CSharpAnalyzerVerifier.cs b/Remotion/Web/Development.Analyzers.IntegrationTests/CSharpAnalyzerVerifier.cs
@@ -34,8 +34,9 @@ private class Test : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
     {
     }
 
-    private static readonly Lazy<ReferenceAssemblies> s_net80 =
-        new(() => new ReferenceAssemblies("net8.0", new PackageIdentity("Microsoft.NETCore.App.Ref", "8.0.0"), Path.Combine("ref", "net8.0")));
+    // Workaround when .NET version is not yet available as a ReferenceAsseblies entry.
+    private static readonly Lazy<ReferenceAssemblies> s_net100 =
+        new(() => new ReferenceAssemblies("net10.0", new PackageIdentity("Microsoft.NETCore.App.Ref", "10.0.0"), Path.Combine("ref", "net10.0")));
 
     public static DiagnosticResult Diagnostic () => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic();
 
@@ -68,8 +69,9 @@ private static ReferenceAssemblies GetReferenceAssemblies (Assembly assembly)
     {
       return assembly.GetCustomAttribute<TargetFrameworkAttribute>()!.FrameworkName switch
       {
-          // RM-8930 Previous syntax for when the assemblies were easily accessible: ".NETCoreApp,Version=v6.0" => ReferenceAssemblies.Net.Net60
-          ".NETCoreApp,Version=v8.0" => s_net80.Value,
+          ".NETCoreApp,Version=v8.0" => ReferenceAssemblies.Net.Net80,
+          ".NETCoreApp,Version=v9.0" => ReferenceAssemblies.Net.Net90,
+          ".NETCoreApp,Version=v10.0" => s_net100.Value,
           var frameworkName => throw new NotSupportedException($"'{frameworkName}' is not supported.")
       };
     }