Skip to content

Update testing analyzers #59516

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

Merged
merged 11 commits into from
Dec 19, 2024
Merged

Update testing analyzers #59516

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
57dcf8a
Update testing analyzers
sebastienros Dec 16, 2024
b8ca4ff
Update Asn1 dependencies for RepoTasks project
sebastienros Dec 16, 2024
dad857a
Fix typos
sebastienros Dec 17, 2024
4115eca
Update Microsoft.CodeAnalysis.CSharp libraries
sebastienros Dec 17, 2024
0303b1e
Update source build
sebastienros Dec 17, 2024
3c0f0c8
Add dependency
sebastienros Dec 17, 2024
ad482ce
Refactor usage
sebastienros Dec 18, 2024
c0ecb3e
Restore asn1/6.0.0
sebastienros Dec 18, 2024
d508cfb
Merge remote-tracking branch 'origin/main' into sebros/updateanalyzers
sebastienros Dec 18, 2024
67fb7ba
Refactor Asn1 dependency
sebastienros Dec 18, 2024
c359036
Move version in automated
sebastienros Dec 18, 2024
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
4 changes: 2 additions & 2 deletions eng/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ and are generated based on the last package release.
<LatestPackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
<LatestPackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
<LatestPackageReference Include="Microsoft.Win32.Registry" />
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
<LatestPackageReference Include="Microsoft.OpenApi" />
<LatestPackageReference Include="Microsoft.OpenApi.Readers" />
Expand Down
2 changes: 2 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<UsagePattern IdentityGlob="System.Composition.Runtime/*8.0.0*" />
<UsagePattern IdentityGlob="System.Composition.TypedParts/*8.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/6.0.*" />
Copy link
Member Author

@sebastienros sebastienros Dec 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wtgodbe Is that expected to have two versions, or should I find the source and force a single one?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a log in the source build artifacts that tells us where these 2 versions are coming from - if it's not obvious from that how to remove one of the versions, I'd ask @ellahathaway

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pulled the prebuilt usage report, which does not give details on where System.Security.Cryptography.Pkcs 5.0.0 and 6.0.0 are being pulled from. Given this, it's likely they're transitive dependencies of some other tool or package being used during the build. This unfortunately makes it a bit more difficult to tell whether or not we should allow these to be in the baseline.

I suggest copying these changes to the VMR & opening a PR there. That'll automatically run a full source-build leg (takes ~1hr) and will tell us if these prebuilts are really a problem or if they can just be added to the baseline as you've already done.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created dotnet/dotnet#125

<UsagePattern IdentityGlob="System.Formats.Asn1/8.0.1" />

<!-- These are what the analyzers are built against. They are overridden in full source build.
It may be possible to generate SBRPs -->
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
<MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.3.20215.2</MicrosoftExtensionsDiagnosticAdapterVersion>
<!-- Build tool dependencies -->
<MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion>
<RepoTasksSystemSecurityCryptographyXmlVersion>8.0.0</RepoTasksSystemSecurityCryptographyXmlVersion>
<RepoTasksSystemFormatsAsn1Version>8.0.1</RepoTasksSystemFormatsAsn1Version>
<!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
<MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
Expand Down Expand Up @@ -264,9 +264,9 @@
<MicrosoftCodeAnalysisCSharpVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
<MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>1.1.2-beta1.24121.1</MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>
<MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>1.1.2-beta1.24121.1</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>
<MicrosoftCodeAnalysisCSharpSourceGeneratorsTestingVersion>1.1.2-beta1.24121.1</MicrosoftCodeAnalysisCSharpSourceGeneratorsTestingVersion>
<MicrosoftCodeAnalysisCSharpAnalyzerTestingVersion>1.1.2</MicrosoftCodeAnalysisCSharpAnalyzerTestingVersion>
<MicrosoftCodeAnalysisCSharpCodeFixTestingVersion>1.1.2</MicrosoftCodeAnalysisCSharpCodeFixTestingVersion>
<MicrosoftCodeAnalysisCSharpSourceGeneratorsTestingVersion>1.1.2</MicrosoftCodeAnalysisCSharpSourceGeneratorsTestingVersion>
<MicrosoftCssParserVersion>1.0.0-20230414.1</MicrosoftCssParserVersion>
<MicrosoftIdentityModelLoggingVersion>$(IdentityModelVersion)</MicrosoftIdentityModelLoggingVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>$(IdentityModelVersion)</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
Expand Down
4 changes: 2 additions & 2 deletions eng/tools/RepoTasks/RepoTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
<!-- Manually updated version from 6.0.0 to address CVE-2023-29331 -->
<PackageReference Include="System.Security.Cryptography.Xml" Version="$(RepoTasksSystemSecurityCryptographyXmlVersion)" />
<!-- Manually updated version to address CVE-2024-38095 -->
<PackageReference Include="System.Formats.Asn1" Version="$(RepoTasksSystemFormatsAsn1Version)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
Expand Down
2 changes: 1 addition & 1 deletion src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<ProjectReference Include="$(RepoRoot)src\Analyzers\Analyzers\src\Microsoft.AspNetCore.Analyzers.csproj" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
<Reference Include="Microsoft.Extensions.DependencyModel" />

Expand Down
4 changes: 2 additions & 2 deletions src/Analyzers/Analyzers/test/StartupCSharpAnalyzerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Testing;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.Testing.Verifiers;
using Microsoft.CodeAnalysis.Testing;

namespace Microsoft.AspNetCore.Analyzers;

internal sealed class StartupCSharpAnalyzerTest : CSharpAnalyzerTest<StartupAnalyzer, XUnitVerifier>
internal sealed class StartupCSharpAnalyzerTest : CSharpAnalyzerTest<StartupAnalyzer, DefaultVerifier>
{
public StartupCSharpAnalyzerTest(StartupAnalyzer analyzer, ImmutableArray<MetadataReference> metadataReferences)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<Reference Include="Microsoft.AspNetCore.Mvc" />
<Reference Include="Microsoft.AspNetCore.Http.Results" />
<Reference Include="Microsoft.AspNetCore.RateLimiting" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
</ItemGroup>

Expand Down
9 changes: 4 additions & 5 deletions src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Microsoft.CodeAnalysis.CSharp.Testing;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.Testing;
using Microsoft.CodeAnalysis.Testing.Verifiers;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.AspNetCore.Hosting;

Expand All @@ -20,20 +19,20 @@ public static partial class CSharpAnalyzerVerifier<TAnalyzer>
{
/// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic()"/>
public static DiagnosticResult Diagnostic()
=> CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic();
=> CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic();

/// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic(string)"/>
public static DiagnosticResult Diagnostic(string diagnosticId)
=> CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic(diagnosticId);
=> CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(diagnosticId);

/// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic(DiagnosticDescriptor)"/>
public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
=> CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic(descriptor);
=> CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(descriptor);

/// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.VerifyAnalyzerAsync(string, DiagnosticResult[])"/>
public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
{
var test = new CSharpAnalyzerTest<TAnalyzer, XUnitVerifier>
var test = new CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
{
TestCode = source.ReplaceLineEndings(),
// We need to set the output type to an exe to properly
Expand Down
11 changes: 5 additions & 6 deletions src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpCodeFixVerifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using Microsoft.CodeAnalysis.CSharp.Testing;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.Testing;
using Microsoft.CodeAnalysis.Testing.Verifiers;

namespace Microsoft.AspNetCore.Analyzers.Verifiers;

Expand All @@ -16,20 +15,20 @@ public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
{
/// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic()"/>
public static DiagnosticResult Diagnostic()
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic();
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic();

/// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic(string)"/>
public static DiagnosticResult Diagnostic(string diagnosticId)
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(diagnosticId);
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic(diagnosticId);

/// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic(DiagnosticDescriptor)"/>
public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(descriptor);
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic(descriptor);

/// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.VerifyAnalyzerAsync(string, DiagnosticResult[])"/>
public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
{
var test = new CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
var test = new CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
{
TestCode = source.ReplaceLineEndings(),
// We need to set the output type to an exe to properly
Expand All @@ -54,7 +53,7 @@ public static async Task VerifyCodeFixAsync(string source, DiagnosticResult expe
/// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.VerifyCodeFixAsync(string, DiagnosticResult[], string)"/>
public static async Task VerifyCodeFixAsync(string source, DiagnosticResult[] expected, string fixedSource, int? expectedIterations = null, string usageSource = null, string codeActionEquivalenceKey = null)
{
var test = new CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
var test = new CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
{
// We need to set the output type to an exe to properly
// support top-level programs in the tests. Otherwise,
Expand Down
1 change: 0 additions & 1 deletion src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpSourceGeneratorVerifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Testing;
using Microsoft.CodeAnalysis.Testing;
using Microsoft.CodeAnalysis.Testing.Verifiers;
using Microsoft.CodeAnalysis.Text;

namespace Microsoft.AspNetCore.Analyzers.Verifiers;
Expand Down
7 changes: 3 additions & 4 deletions src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Microsoft.CodeAnalysis.CSharp.Testing;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.Testing;
using Microsoft.CodeAnalysis.Testing.Verifiers;

namespace Microsoft.AspNetCore.Mvc.Analyzers;

Expand Down Expand Up @@ -373,7 +372,7 @@ public void OnGet()

private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
{
var test = new AttributesShouldNotBeAppliedToPageModelCSharpAnalzyerTest(TestReferences.MetadataReferences)
var test = new AttributesShouldNotBeAppliedToPageModelCSharpAnalyzerTest(TestReferences.MetadataReferences)
{
TestCode = source,
ReferenceAssemblies = TestReferences.EmptyReferenceAssemblies,
Expand All @@ -383,9 +382,9 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[]
return test.RunAsync();
}

private sealed class AttributesShouldNotBeAppliedToPageModelCSharpAnalzyerTest : CSharpAnalyzerTest<AttributesShouldNotBeAppliedToPageModelAnalyzer, XUnitVerifier>
private sealed class AttributesShouldNotBeAppliedToPageModelCSharpAnalyzerTest : CSharpAnalyzerTest<AttributesShouldNotBeAppliedToPageModelAnalyzer, DefaultVerifier>
{
public AttributesShouldNotBeAppliedToPageModelCSharpAnalzyerTest(ImmutableArray<MetadataReference> metadataReferences)
public AttributesShouldNotBeAppliedToPageModelCSharpAnalyzerTest(ImmutableArray<MetadataReference> metadataReferences)
{
TestState.AdditionalReferences.AddRange(metadataReferences);
}
Expand Down
7 changes: 3 additions & 4 deletions src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Microsoft.CodeAnalysis.CSharp.Testing;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.Testing;
using Microsoft.CodeAnalysis.Testing.Verifiers;

namespace Microsoft.AspNetCore.Mvc.Analyzers;

Expand Down Expand Up @@ -412,7 +411,7 @@ public class DiagnosticsAreReturned_ForUseOfHtmlRenderPartial_InSections : globa

private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
{
var test = new AvoidHtmlPartialCSharpAnalzyerTest(TestReferences.MetadataReferences)
var test = new AvoidHtmlPartialCSharpAnalyzerTest(TestReferences.MetadataReferences)
{
TestCode = source,
ReferenceAssemblies = TestReferences.EmptyReferenceAssemblies,
Expand All @@ -422,9 +421,9 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[]
return test.RunAsync();
}

internal sealed class AvoidHtmlPartialCSharpAnalzyerTest : CSharpAnalyzerTest<AvoidHtmlPartialAnalyzer, XUnitVerifier>
internal sealed class AvoidHtmlPartialCSharpAnalyzerTest : CSharpAnalyzerTest<AvoidHtmlPartialAnalyzer, DefaultVerifier>
{
public AvoidHtmlPartialCSharpAnalzyerTest(ImmutableArray<MetadataReference> metadataReferences)
public AvoidHtmlPartialCSharpAnalyzerTest(ImmutableArray<MetadataReference> metadataReferences)
{
TestState.AdditionalReferences.AddRange(metadataReferences);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Reference Include="Microsoft.Extensions.DependencyModel" />
<Reference Include="Microsoft.AspNetCore.Mvc" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
</ItemGroup>

</Project>
35 changes: 17 additions & 18 deletions src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Microsoft.CodeAnalysis.CSharp.Testing;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.Testing;
using Microsoft.CodeAnalysis.Testing.Verifiers;

namespace Microsoft.AspNetCore.Mvc.Analyzers;

Expand Down Expand Up @@ -58,7 +57,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInActions : global::Micros
{
WriteLiteral(""\r\n"");
WriteLiteral(""\r\n"");

Action sometMethod = {|#0:() =>
{

Expand Down Expand Up @@ -151,7 +150,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInNonAsyncFunc : global::M
{
WriteLiteral(""\r\n"");
WriteLiteral(""\r\n"");

Func<Task> sometMethod = {|#0:() =>
{

Expand Down Expand Up @@ -243,13 +242,13 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidClassMethods : globa
public async override global::System.Threading.Tasks.Task ExecuteAsync()
{
WriteLiteral(""\r\n"");

SometMethod();

WriteLiteral(""\r\n"");
}
#pragma warning restore 1998

{|#0:void SometMethod()
{

Expand Down Expand Up @@ -336,7 +335,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates : global::
{
WriteLiteral(""\r\n"");
WriteLiteral(""\r\n"");

TestDelegate sometMethod = {|#0:delegate ()
{

Expand Down Expand Up @@ -368,7 +367,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates : global::
WriteLiteral(""\r\n"");
}
#pragma warning restore 1998

delegate void TestDelegate();

[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
Expand Down Expand Up @@ -430,7 +429,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidLocalFunctions : glo
public async override global::System.Threading.Tasks.Task ExecuteAsync()
{
WriteLiteral(""\r\n"");

{|#0:void SometMethod()
{

Expand Down Expand Up @@ -520,13 +519,13 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncClassMethods_ : g
public async override global::System.Threading.Tasks.Task ExecuteAsync()
{
WriteLiteral(""\r\n"");

await SometMethod();

WriteLiteral(""\r\n"");
}
#pragma warning restore 1998

async Task SometMethod()
{

Expand Down Expand Up @@ -611,7 +610,7 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates_ : glob
{
WriteLiteral(""\r\n"");
WriteLiteral(""\r\n"");

TestDelegate sometMethod = async delegate ()
{

Expand Down Expand Up @@ -643,7 +642,7 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates_ : glob
WriteLiteral(""\r\n"");
}
#pragma warning restore 1998

delegate Task TestDelegate();

[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
Expand Down Expand Up @@ -707,7 +706,7 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions_ :
public async override global::System.Threading.Tasks.Task ExecuteAsync()
{
WriteLiteral(""\r\n"");

async Task SometMethod()
{

Expand Down Expand Up @@ -794,13 +793,13 @@ public class SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod : glob
public async override global::System.Threading.Tasks.Task ExecuteAsync()
{
WriteLiteral(""\r\n"");

SometMethod();

WriteLiteral(""\r\n"");
}
#pragma warning restore 1998

{|#0:void SometMethod()
{

Expand Down Expand Up @@ -898,7 +897,7 @@ public class SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod : glob

private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
{
var test = new TagHelpersInCodeBlocksCSharpAnalzyerTest(TestReferences.MetadataReferences)
var test = new TagHelpersInCodeBlocksCSharpAnalyzerTest(TestReferences.MetadataReferences)
{
TestCode = source,
ReferenceAssemblies = TestReferences.EmptyReferenceAssemblies,
Expand All @@ -908,9 +907,9 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[]
return test.RunAsync();
}

private sealed class TagHelpersInCodeBlocksCSharpAnalzyerTest : CSharpAnalyzerTest<AttributesShouldNotBeAppliedToPageModelAnalyzer, XUnitVerifier>
private sealed class TagHelpersInCodeBlocksCSharpAnalyzerTest : CSharpAnalyzerTest<AttributesShouldNotBeAppliedToPageModelAnalyzer, DefaultVerifier>
{
public TagHelpersInCodeBlocksCSharpAnalzyerTest(ImmutableArray<MetadataReference> metadataReferences)
public TagHelpersInCodeBlocksCSharpAnalyzerTest(ImmutableArray<MetadataReference> metadataReferences)
{
TestState.AdditionalReferences.AddRange(metadataReferences);
}
Expand Down
Loading
Loading