Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Microsoft.CodeAnalysis.Testing 1.0.1-beta1.21202.2 #3341

Merged
merged 1 commit into from
Apr 28, 2021
Merged

Update to Microsoft.CodeAnalysis.Testing 1.0.1-beta1.21202.2 #3341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
23 changes: 14 additions & 9 deletions StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public CSharpTest()
public CSharpTest(LanguageVersion? languageVersion)
{
this.ReferenceAssemblies = GenericAnalyzerTest.ReferenceAssemblies;
this.LanguageVersion = languageVersion;

this.OptionsTransforms.Add(options =>
options
Expand All @@ -109,15 +110,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>()
Expand Down Expand Up @@ -237,6 +229,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();
Expand All @@ -250,6 +244,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();
Expand Down
18 changes: 12 additions & 6 deletions StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopDiagnosticVerifier`1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down