Merge pull request #3341 from sharwell/update-testing

Update to Microsoft.CodeAnalysis.Testing 1.0.1-beta1.21202.2
DotNetAnalyzers · Apr 28, 2021 · e7af4b3 · e7af4b3
2 parents 0eee82b + ddd167b
commit e7af4b3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="1.3.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.0.1-beta1.21159.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.0.1-beta1.21202.2" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.1.8" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs
@@ -110,6 +110,7 @@ public CSharpTest()
             public CSharpTest(LanguageVersion? languageVersion)
             {
                 this.ReferenceAssemblies = GenericAnalyzerTest.ReferenceAssemblies;
+                this.LanguageVersion = languageVersion;
 
                 this.OptionsTransforms.Add(options =>
                     options
@@ -120,15 +121,6 @@ public CSharpTest(LanguageVersion? languageVersion)
                 this.TestState.AdditionalFilesFactories.Add(GenerateSettingsFile);
                 this.CodeActionValidationMode = CodeActionValidationMode.None;
 
-                if (languageVersion != null)
-                {
-                    this.SolutionTransforms.Add((solution, projectId) =>
-                    {
-                        var parseOptions = (CSharpParseOptions)solution.GetProject(projectId).ParseOptions;
-                        return solution.WithProjectParseOptions(projectId, parseOptions.WithLanguageVersion(languageVersion.Value));
-                    });
-                }
-
                 this.SolutionTransforms.Add((solution, projectId) =>
                 {
                     var corlib = solution.GetProject(projectId).MetadataReferences.OfType<PortableExecutableReference>()
@@ -248,6 +240,8 @@ public CSharpTest(LanguageVersion? languageVersion)
             /// </value>
             public List<string> ExplicitlyEnabledDiagnostics { get; } = new List<string>();
 
+            private LanguageVersion? LanguageVersion { get; }
+
             protected override CompilationOptions CreateCompilationOptions()
             {
                 var compilationOptions = base.CreateCompilationOptions();
@@ -261,6 +255,17 @@ protected override CompilationOptions CreateCompilationOptions()
                 return compilationOptions.WithSpecificDiagnosticOptions(specificDiagnosticOptions);
             }
 
+            protected override ParseOptions CreateParseOptions()
+            {
+                var parseOptions = base.CreateParseOptions();
+                if (this.LanguageVersion is { } languageVersion)
+                {
+                    parseOptions = ((CSharpParseOptions)parseOptions).WithLanguageVersion(languageVersion);
+                }
+
+                return parseOptions;
+            }
+
             protected override IEnumerable<CodeFixProvider> GetCodeFixProviders()
             {
                 var codeFixProvider = new TCodeFix();

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopDiagnosticVerifier`1.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopDiagnosticVerifier`1.cs
@@ -62,14 +62,20 @@ public CSharpTest()
 
             public CSharpTest(LanguageVersion? languageVersion)
             {
-                if (languageVersion != null)
+                this.LanguageVersion = languageVersion;
+            }
+
+            private LanguageVersion? LanguageVersion { get; }
+
+            protected override ParseOptions CreateParseOptions()
+            {
+                var parseOptions = base.CreateParseOptions();
+                if (this.LanguageVersion is { } languageVersion)
                 {
-                    this.SolutionTransforms.Add((solution, projectId) =>
-                    {
-                        var parseOptions = (CSharpParseOptions)solution.GetProject(projectId).ParseOptions;
-                        return solution.WithProjectParseOptions(projectId, parseOptions.WithLanguageVersion(languageVersion.Value));
-                    });
+                    parseOptions = ((CSharpParseOptions)parseOptions).WithLanguageVersion(languageVersion);
                 }
+
+                return parseOptions;
             }
         }
     }