Add preprocessor symbols from new targts to analyzer tests

Author: kzu

src/CodeAnalysis.Tests/AddServicesAnalyzerTests.cs

@@ -55,7 +55,7 @@ public static void Main()
                     .AddPackages(ImmutableArray.Create(
                         new PackageIdentity("Microsoft.Extensions.DependencyInjection", "8.0.0")))
             },
-        };
+        }.WithPreprocessorSymbols();
 
         //var expected = Verifier.Diagnostic(AddServicesAnalyzer.NoAddServicesCall).WithLocation(0);
 
@@ -101,7 +101,7 @@ public static void Main()
                     .AddPackages(ImmutableArray.Create(
                         new PackageIdentity("Microsoft.Extensions.DependencyInjection", "8.0.0")))
             },
-        };
+        }.WithPreprocessorSymbols();
 
         await test.RunAsync();
     }
@@ -142,7 +142,7 @@ public static void Main()
                     .AddPackages(ImmutableArray.Create(
                         new PackageIdentity("Microsoft.Extensions.DependencyInjection", "8.0.0")))
             },
-        };
+        }.WithPreprocessorSymbols();
 
         var expected = Verifier.Diagnostic(AddServicesAnalyzer.NoAddServicesCall).WithLocation(0);
         test.ExpectedDiagnostics.Add(expected);
@@ -155,6 +155,11 @@ public async Task WarnIfAddServicesMissingMultipleLocations()
     {
         var test = new AnalyzerTest
         {
+            // Make sure compilation defines the constant/symbol 'DDI_ADDSERVICES'
+            // so the generator can detect the presence of the extension method.
+            OptionsTransforms = {
+                (options) => options
+            },
             TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
             TestCode = """
             using System;
@@ -189,7 +194,7 @@ public static void Main()
                     .AddPackages(ImmutableArray.Create(
                         new PackageIdentity("Microsoft.Extensions.DependencyInjection", "8.0.0")))
             },
-        };
+        }.WithPreprocessorSymbols();
 
         var expected = Verifier.Diagnostic(AddServicesAnalyzer.NoAddServicesCall).WithLocation(0);
         test.ExpectedDiagnostics.Add(expected);

src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj

@@ -1,19 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>Preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
-    <PackageReference Include="ThisAssembly.Resources" Version="2.0.8" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Resources" Version="2.0.10" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

src/CodeAnalysis.Tests/ConventionAnalyzerTests.cs

@@ -54,7 +54,7 @@ public static void Main()
                     .AddPackages(ImmutableArray.Create(
                         new PackageIdentity("Microsoft.Extensions.DependencyInjection", "8.0.0")))
             },
-        };
+        }.WithPreprocessorSymbols();
 
         var expected = Verifier.Diagnostic(ConventionsAnalyzer.AssignableTypeOfRequired).WithLocation(0);
         test.ExpectedDiagnostics.Add(expected);
@@ -98,7 +98,7 @@ public static void Main()
                     .AddPackages(ImmutableArray.Create(
                         new PackageIdentity("Microsoft.Extensions.DependencyInjection", "8.0.0")))
             },
-        };
+        }.WithPreprocessorSymbols();
 
         //var expected = Verifier.Diagnostic(ConventionsAnalyzer.AssignableTypeOfRequired).WithLocation(0);
         //test.ExpectedDiagnostics.Add(expected);
@@ -145,7 +145,7 @@ public static void Main()
                     .AddPackages(ImmutableArray.Create(
                         new PackageIdentity("Microsoft.Extensions.DependencyInjection", "8.0.0")))
             },
-        };
+        }.WithPreprocessorSymbols();
 
         var expected = Verifier.Diagnostic(ConventionsAnalyzer.OpenGenericType).WithLocation(0);
         test.ExpectedDiagnostics.Add(expected);

src/CodeAnalysis.Tests/TestExtensions.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Testing;
+
+namespace Tests.CodeAnalysis;
+
+public static class TestExtensions
+{
+    public static TAnalyzerTest WithPreprocessorSymbols<TAnalyzerTest>(this TAnalyzerTest test, params string[] symbols)
+        where TAnalyzerTest : AnalyzerTest<DefaultVerifier>
+    {
+        test.OptionsTransforms.Add(options =>
+        {
+            return options;
+        });
+
+        test.SolutionTransforms.Add((solution, projectId) =>
+        {
+            var project = solution.GetProject(projectId);
+            var parseOptions = (CSharpParseOptions)project!.ParseOptions!;
+
+            parseOptions = parseOptions.WithPreprocessorSymbols(
+                symbols.Length > 0 ? symbols : ["DDI_ADDSERVICE", "DDI_ADDSERVICES"]);
+
+            return solution.WithProjectParseOptions(projectId, parseOptions);
+        });
+
+        return test;
+    }
+}