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 DisallowConfigureHostLoggingTest to include VerifyCS and test Code Fixer #42701

Closed
wants to merge 6 commits into from
Closed

Update DisallowConfigureHostLoggingTest to include VerifyCS and test Code Fixer #42701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88b3ea9
Add analyzer issue #35816
pedro-camargo11 Jun 22, 2022
606345d
Deleting uneccessary using statement and comment
pedro-camargo11 Jun 23, 2022
6cc3642
Make DiagnosticDescriptor title and description consistent with other…
pedro-camargo11 Jun 24, 2022
0244399
Update DisallowConfigureLogging tests to test Fixer
pedro-camargo11 Jul 12, 2022
a61172d
trial
pedro-camargo11 Jul 12, 2022
691f0b3
Update DisallowConfigureHostLoggingTest to include code Fixer tests
pedro-camargo11 Jul 12, 2022
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
Binary file added ...ults/0b32a533-146b-44e0-8365-46b38e3fbb4c/t-pcamargo_PEDROPC 2022-06-21 09_36_31.coverage
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@
<MicrosoftCodeAnalysisCSharpVersion>4.2.0-2.22128.1</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.2.0-2.22128.1</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.0</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
<MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>1.1.1-beta1.21413.1</MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>
<MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>1.1.1-beta1.21413.1</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>
<MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>1.1.2-beta1.22276.1</MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>
<MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>1.1.2-beta1.22276.1</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>
<MicrosoftCssParserVersion>1.0.0-20200708.1</MicrosoftCssParserVersion>
<MicrosoftIdentityModelLoggingVersion>6.15.1</MicrosoftIdentityModelLoggingVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>6.15.1</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Web.JS/dist/Release/blazor.server.js
View file
Open in desktop

Large diffs are not rendered by default.

111 changes: 28 additions & 83 deletions src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />

<!-- Ensure prerequisite analyzers are built. -->
<ProjectReference Include="..\..\AspNetCoreAnalyzers\src\CodeFixes\Microsoft.AspNetCore.App.CodeFixes.csproj"
Private="false"
ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\AspNetCoreAnalyzers\src\CodeFixes\Microsoft.AspNetCore.App.CodeFixes.csproj" Private="false" ReferenceOutputAssembly="false" />

<ProjectReference Include="$(RepoRoot)src\Components\Analyzers\src\Microsoft.AspNetCore.Components.Analyzers.csproj"
Private="false"
ReferenceOutputAssembly="false" />
<ProjectReference Include="$(RepoRoot)src\Components\Analyzers\src\Microsoft.AspNetCore.Components.Analyzers.csproj" Private="false" ReferenceOutputAssembly="false" />

<!-- Enforce build order. Targeting pack needs to bundle analyzers and information about the runtime. -->
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
Private="false"
ReferenceOutputAssembly="false"
SkipGetTargetFrameworkProperties="true" />
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj" Private="false" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
Expand Down Expand Up @@ -128,14 +121,11 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<Target Name="CopyFilesToOutputDirectory" />

<!-- This target finds the reference assemblies. -->
<Target Name="_ResolveInitialTargetingPackContent"
Returns="@(AspNetCoreReferenceAssemblyPath)"
DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences">
<Target Name="_ResolveInitialTargetingPackContent" Returns="@(AspNetCoreReferenceAssemblyPath)" DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences">
<ItemGroup>
<!-- Exclude a dependency that we don't want to expose. -->
<_DisallowedReferenceAssemblies Include="System.Net.Quic.dll" />
<_AvailableRuntimeRefAssemblies Include="$(RuntimeTransportReferenceDirectory)*.dll"
Exclude="@(_DisallowedReferenceAssemblies->'$(RuntimeTransportReferenceDirectory)%(Filename)%(Extension)')" />
<_AvailableRuntimeRefAssemblies Include="$(RuntimeTransportReferenceDirectory)*.dll" Exclude="@(_DisallowedReferenceAssemblies->'$(RuntimeTransportReferenceDirectory)%(Filename)%(Extension)')" />
</ItemGroup>

<JoinItems Left="@(ReferencePathWithRefAssemblies)" Right="@(_AvailableRuntimeRefAssemblies)" LeftKey="Filename" RightKey="Filename" ItemSpecToUse="Left">
Expand All @@ -150,26 +140,14 @@ This package is an internal implementation of the .NET Core SDK and is not meant
Filename exclusions are due to implementation assemblies creeping into the closure. Reference assemblies
for all but System.Security.Cryptography.Pkcs are available in the transport package.
-->
<AspNetCoreReferenceAssemblyPath
Include="@(ReferencePathWithRefAssemblies)"
Exclude="
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.Internal.Runtime.AspNetCore.Transport'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Diagnostics.EventLog'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.IO.Pipelines'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Security.Cryptography.Pkcs'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Security.Cryptography.Xml'))" />

<AspNetCoreReferenceAssemblyPath
Include="@(_ReferencedRuntimeRefAssemblies->'$(RuntimeTransportReferenceDirectory)%(FileName)%(Extension)')" />

<AspNetCoreReferenceDocXml Include="@(_ResolvedProjectReferencePaths->'%(RootDir)%(Directory)%(FileName).xml')"
Condition="Exists('%(RootDir)%(Directory)%(FileName).xml')" />
<AspNetCoreReferenceAssemblyPath Include="@(ReferencePathWithRefAssemblies)" Exclude="&#xD;&#xA; @(ReferencePathWithRefAssemblies-&gt;WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));&#xD;&#xA; @(ReferencePathWithRefAssemblies-&gt;WithMetadataValue('NuGetPackageId', 'Microsoft.Internal.Runtime.AspNetCore.Transport'));&#xD;&#xA; @(ReferencePathWithRefAssemblies-&gt;WithMetadataValue('Filename', 'System.Diagnostics.EventLog'));&#xD;&#xA; @(ReferencePathWithRefAssemblies-&gt;WithMetadataValue('Filename', 'System.IO.Pipelines'));&#xD;&#xA; @(ReferencePathWithRefAssemblies-&gt;WithMetadataValue('Filename', 'System.Security.Cryptography.Pkcs'));&#xD;&#xA; @(ReferencePathWithRefAssemblies-&gt;WithMetadataValue('Filename', 'System.Security.Cryptography.Xml'))" />

<AspNetCoreReferenceAssemblyPath Include="@(_ReferencedRuntimeRefAssemblies->'$(RuntimeTransportReferenceDirectory)%(FileName)%(Extension)')" />

<AspNetCoreReferenceDocXml Include="@(_ResolvedProjectReferencePaths->'%(RootDir)%(Directory)%(FileName).xml')" Condition="Exists('%(RootDir)%(Directory)%(FileName).xml')" />
<AspNetCoreReferenceDocXml Include="@(_ReferencedRuntimeRefAssemblies->'$(RuntimeTransportReferenceDirectory)%(FileName).xml')" />
<!-- Grab remaining .xml files from packages -->
<AspNetCoreReferenceDocXml
Include="@(AspNetCoreReferenceAssemblyPath->WithMetadataValue('ExternallyResolved', 'true')->'%(RootDir)%(Directory)%(Filename).xml')"
Condition="Exists('%(RootDir)%(Directory)%(Filename).xml')" />
<AspNetCoreReferenceDocXml Include="@(AspNetCoreReferenceAssemblyPath-&gt;WithMetadataValue('ExternallyResolved', 'true')-&gt;'%(RootDir)%(Directory)%(Filename).xml')" Condition="Exists('%(RootDir)%(Directory)%(Filename).xml')" />

<_InitialRefPackContent Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\$(AnalyzersPackagePath)**\*.*" PackagePath="$(AnalyzersPackagePath)" />
<_InitialRefPackContent Include="$(ArtifactsDir)bin\Microsoft.AspNetCore.App.Analyzers\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.App.Analyzers.dll" PackagePath="$(AnalyzersPackagePath)dotnet/cs/" />
Expand All @@ -191,30 +169,20 @@ This package is an internal implementation of the .NET Core SDK and is not meant
</ItemGroup>
</Target>

<Target Name="ResolveTargetingPackContent"
DependsOnTargets="$(ResolveTargetingPackContentDependsOn)"
Returns="@(AspNetCoreReferenceAssemblyPath)" />
<Target Name="ResolveTargetingPackContent" DependsOnTargets="$(ResolveTargetingPackContentDependsOn)" Returns="@(AspNetCoreReferenceAssemblyPath)" />

<Target Name="GeneratePackageOverrides" Condition=" '$(IsServicingBuild)' != 'true' ">
<ItemGroup>
<!-- Use package version for non-Runtime references. -->
<_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(NuGetPackageId)|%(NuGetPackageVersion)')"
Condition="!Exists('$(RuntimeTransportReferenceDirectory)%(AspNetCoreReferenceAssemblyPath.NuGetPackageId).dll') AND
'%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND
'%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.Internal.Runtime.AspNetCore.Transport' AND
'%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " />
<_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(RuntimeTransportReferenceDirectory)%(AspNetCoreReferenceAssemblyPath.NuGetPackageId).dll') AND&#xD;&#xA; '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND&#xD;&#xA; '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.Internal.Runtime.AspNetCore.Transport' AND&#xD;&#xA; '%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " />

<!-- Use NETCore.App.Runtime version for Runtime references. -->
<_AspNetCoreAppPackageOverrides Include="@(_ReferencedRuntimeRefAssemblies->'%(FileName)|$(MicrosoftNETCoreAppRuntimeVersion)')" />

<_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(FileName)|$(ReferencePackSharedFxVersion)')"
Condition=" '%(AspNetCoreReferenceAssemblyPath.ReferenceSourceTarget)' == 'ProjectReference' " />
<_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(AspNetCoreReferenceAssemblyPath.ReferenceSourceTarget)' == 'ProjectReference' " />
</ItemGroup>

<WriteLinesToFile
Lines="@(_AspNetCoreAppPackageOverrides)"
File="$(ReferencePackageOverridesPath)"
Overwrite="true" />
<WriteLinesToFile Lines="@(_AspNetCoreAppPackageOverrides)" File="$(ReferencePackageOverridesPath)" Overwrite="true" />
</Target>

<!--
Expand All @@ -223,59 +191,36 @@ This package is an internal implementation of the .NET Core SDK and is not meant
-->
<Target Name="_CleanLayout" BeforeTargets="_BatchCopyToLayoutTargetDir">
<ItemGroup>
<_ExtraLayoutFiles Include="$(LayoutTargetDir)**\*.*"
Exclude="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')" />
<_ExtraLayoutFiles Include="$(LayoutTargetDir)**\*.*" Exclude="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')" />
</ItemGroup>
<Delete Files="@(_ExtraLayoutFiles)" />
</Target>

<Target Name="_BatchCopyToLayoutTargetDir"
Inputs="@(RefPackContent)"
Outputs="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')">
<Copy SourceFiles="@(RefPackContent)"
DestinationFiles="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')"
UseHardlinksIfPossible="true" />
<Message Importance="High" Text="$(MSBuildProjectName) -> $(LayoutTargetDir)" />
<Target Name="_BatchCopyToLayoutTargetDir" Inputs="@(RefPackContent)" Outputs="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')">
<Copy SourceFiles="@(RefPackContent)" DestinationFiles="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')" UseHardlinksIfPossible="true" />
<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(LayoutTargetDir)" />
</Target>

<Target Name="_CleanLocalDotNet" BeforeTargets="_InstallTargetingPackIntoLocalDotNet">
<ItemGroup>
<_ExtraDotNetFiles Include="$(LocalInstallationOutputPath)**\*.*"
Exclude="@(RefPackContent->'$(LocalInstallationOutputPath)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')" />
<_ExtraDotNetFiles Include="$(LocalInstallationOutputPath)**\*.*" Exclude="@(RefPackContent->'$(LocalInstallationOutputPath)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')" />
</ItemGroup>
<Delete Files="@(_ExtraDotNetFiles)" />
</Target>

<!-- Workaround https://github.com/dotnet/sdk/issues/2910 by copying targeting pack into local installation. -->
<Target Name="_InstallTargetingPackIntoLocalDotNet"
Condition="'$(DotNetBuildFromSource)' != 'true'"
Inputs="@(RefPackContent)"
Outputs="@(RefPackContent->'$(LocalInstallationOutputPath)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')">
<Copy SourceFiles="@(RefPackContent)"
DestinationFiles="@(RefPackContent->'$(LocalInstallationOutputPath)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')"
UseHardlinksIfPossible="true" />
<Message Importance="High" Text="$(MSBuildProjectName) -> $(LocalInstallationOutputPath)" />
<Target Name="_InstallTargetingPackIntoLocalDotNet" Condition="'$(DotNetBuildFromSource)' != 'true'" Inputs="@(RefPackContent)" Outputs="@(RefPackContent->'$(LocalInstallationOutputPath)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')">
<Copy SourceFiles="@(RefPackContent)" DestinationFiles="@(RefPackContent->'$(LocalInstallationOutputPath)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')" UseHardlinksIfPossible="true" />
<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(LocalInstallationOutputPath)" />
</Target>

<Target Name="_CreateTargetingPackArchive"
Inputs="@(RefPackContent)"
Outputs="$(ArchiveOutputPath)">
<ZipDirectory
SourceDirectory="$(TargetingPackLayoutRoot)"
DestinationFile="$(ArchiveOutputPath)"
Overwrite="true"
Condition="'$(ArchiveExtension)' == '.zip'" />
<Exec
Command="tar -czf $(ArchiveOutputPath) ."
WorkingDirectory="$(TargetingPackLayoutRoot)"
Condition="'$(ArchiveExtension)' == '.tar.gz'" />
<Message Importance="High" Text="$(MSBuildProjectName) -> $(ArchiveOutputPath)" />
<Target Name="_CreateTargetingPackArchive" Inputs="@(RefPackContent)" Outputs="$(ArchiveOutputPath)">
<ZipDirectory SourceDirectory="$(TargetingPackLayoutRoot)" DestinationFile="$(ArchiveOutputPath)" Overwrite="true" Condition="'$(ArchiveExtension)' == '.zip'" />
<Exec Command="tar -czf $(ArchiveOutputPath) ." WorkingDirectory="$(TargetingPackLayoutRoot)" Condition="'$(ArchiveExtension)' == '.tar.gz'" />
<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(ArchiveOutputPath)" />
</Target>

<Target Name="GenerateFrameworkListFile">
<RepoTasks.CreateFrameworkListFile
Files="@(_InitialRefPackContent)"
TargetFile="$(FrameworkListOutputPath)"
RootAttributes="@(FrameworkListRootAttributes)" />
<RepoTasks.CreateFrameworkListFile Files="@(_InitialRefPackContent)" TargetFile="$(FrameworkListOutputPath)" RootAttributes="@(FrameworkListRootAttributes)" />
</Target>
</Project>
38 changes: 38 additions & 0 deletions src/Framework/AspNetCoreAnalyzers/src/Analyzers/DiagnosticDescriptors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,42 @@ internal static class DiagnosticDescriptors
DiagnosticSeverity.Error,
isEnabledByDefault: true,
helpLinkUri: "https://aka.ms/aspnet/analyzers");

internal static readonly DiagnosticDescriptor DoNotUseHostConfigureLogging = new(
"ASP0011",
"Suggest using builder.Logging over Host.ConfigureLogging or WebHost.ConfigureLogging",
"Suggest using builder.Logging instead of {0}",
"Usage",
DiagnosticSeverity.Warning,
isEnabledByDefault: true,
helpLinkUri: "https://aka.ms/aspnet/analyzers");

internal static readonly DiagnosticDescriptor DoNotUseHostConfigureServices = new(
"ASP0012",
"Suggest using builder.Services over Host.ConfigureServices or WebHost.ConfigureServices",
"Suggest using builder.Services instead of {0}",
"Usage",
DiagnosticSeverity.Warning,
isEnabledByDefault: true,
helpLinkUri: "https://aka.ms/aspnet/analyzers");

internal static readonly DiagnosticDescriptor DisallowConfigureAppConfigureHostBuilder = new(
"ASP0013",
"Suggest switching from using Configure methods to WebApplicationBuilder.Configuration",
"Suggest using WebApplicationBuilder.Configuration instead of {0}",
"Usage",
DiagnosticSeverity.Warning,
isEnabledByDefault: true,
helpLinkUri: "https://aka.ms/aspnet/analyzers");

internal static readonly DiagnosticDescriptor UseTopLevelRouteRegistrationsInsteadOfUseEndpoints = new(
"ASP0014",
"Suggest using app.MapGet over of using app.UseEndpoints",
"Suggest using app.MapGet instead of {0}",
"Usage",
DiagnosticSeverity.Warning,
isEnabledByDefault: true,
helpLinkUri: "https://aka.ms/aspnet/analyzers");


}
Loading