From 15e6067fe2c5eab4e7c427b9a8ea6d09097e3e1c Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 18 Aug 2025 11:50:47 -0700 Subject: [PATCH 1/2] Remove .NET Standard 2.1 --- src/Layout/Directory.Build.targets | 1 - src/Layout/pkg/dotnet-sdk.proj | 7 ------- src/Layout/pkg/osx/Distribution-Template | 5 ----- src/Layout/pkg/osx/Distribution-Template-x64 | 9 --------- .../redist/targets/GenerateMSIs.targets | 6 ------ src/Layout/redist/targets/GeneratePKG.targets | 11 ----------- .../redist/targets/RestoreLayout.targets | 19 ------------------- .../src/RulesMissingDocumentation.md | 4 ---- 8 files changed, 62 deletions(-) diff --git a/src/Layout/Directory.Build.targets b/src/Layout/Directory.Build.targets index e4bc36badb08..4b62bf7c98ee 100644 --- a/src/Layout/Directory.Build.targets +++ b/src/Layout/Directory.Build.targets @@ -30,7 +30,6 @@ Microsoft .NET Toolset $(Version) Microsoft .NET Runtime $(MicrosoftNETCoreAppRuntimePackageVersion) Microsoft .NET Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion) - Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion) Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion) Microsoft .NET Host $(SharedHostVersion) Microsoft .NET Host FX Resolver $(HostFxrVersion) diff --git a/src/Layout/pkg/dotnet-sdk.proj b/src/Layout/pkg/dotnet-sdk.proj index 368feb068fac..c651d2707e71 100644 --- a/src/Layout/pkg/dotnet-sdk.proj +++ b/src/Layout/pkg/dotnet-sdk.proj @@ -131,7 +131,6 @@ - @@ -162,12 +161,6 @@ - - - - - - diff --git a/src/Layout/pkg/osx/Distribution-Template b/src/Layout/pkg/osx/Distribution-Template index 62bea3d7dcc0..4aa62238416c 100644 --- a/src/Layout/pkg/osx/Distribution-Template +++ b/src/Layout/pkg/osx/Distribution-Template @@ -11,7 +11,6 @@ - @@ -21,9 +20,6 @@ - - - @@ -40,7 +36,6 @@ {NetCoreAppTargetingPackComponentId}.pkg - {NetStandardTargetingPackComponentId}.pkg {NetCoreAppHostPackComponentId}.pkg {SharedFxComponentId}.pkg {HostFxrComponentId}.pkg diff --git a/src/Layout/pkg/osx/Distribution-Template-x64 b/src/Layout/pkg/osx/Distribution-Template-x64 index c702c5c726d5..01aee6a80596 100644 --- a/src/Layout/pkg/osx/Distribution-Template-x64 +++ b/src/Layout/pkg/osx/Distribution-Template-x64 @@ -11,14 +11,12 @@ - - @@ -28,9 +26,6 @@ - - - @@ -49,9 +44,6 @@ - - - @@ -68,7 +60,6 @@ {NetCoreAppTargetingPackComponentId}.pkg - {NetStandardTargetingPackComponentId}.pkg {NetCoreAppHostPackComponentId}.pkg {SharedFxComponentId}.pkg {HostFxrComponentId}.pkg diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets index 93b35c34eaad..8e50e36d3813 100644 --- a/src/Layout/redist/targets/GenerateMSIs.targets +++ b/src/Layout/redist/targets/GenerateMSIs.targets @@ -258,12 +258,6 @@ <_DotNetMsiPackages Include="$(DownloadsFolder)$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName); $(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)"/> - - - <_DotNetMsiPackages Condition="'$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64'" - Include="$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName); - $(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName); - $(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)" /> diff --git a/src/Layout/redist/targets/GeneratePKG.targets b/src/Layout/redist/targets/GeneratePKG.targets index 29293e8edc84..fd6e4c1d08e5 100644 --- a/src/Layout/redist/targets/GeneratePKG.targets +++ b/src/Layout/redist/targets/GeneratePKG.targets @@ -10,7 +10,6 @@ com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppRuntimePackageVersion).component.osx.$(TargetArchitecture) com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppRefPackageVersion).component.osx.$(TargetArchitecture) com.microsoft.dotnet.pack.apphost.$(MicrosoftNETCoreAppHostPackageVersion).component.osx.$(TargetArchitecture) - com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.$(TargetArchitecture) com.microsoft.dotnet.dev.$(Version).component.osx.$(TargetArchitecture) com.microsoft.dotnet.dev.$(Version).osx.$(TargetArchitecture) @@ -32,7 +31,6 @@ $(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg $(PkgIntermediateDirectory)/$(NetCoreAppTargetingPackComponentId).pkg $(PkgIntermediateDirectory)/$(NetCoreAppHostPackComponentId).pkg - $(PkgIntermediateDirectory)/$(NetStandardTargetingPackComponentId).pkg $(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg $(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg @@ -49,9 +47,6 @@ $(NetCoreAppTargetingPackComponentId) - - $(NetStandardTargetingPackComponentId) - $(NetCoreAppHostPackComponentId) @@ -79,9 +74,6 @@ $(NetCoreAppHostPackBrandName) - - $(NetStandardTargetingPackBrandName) - $(SharedHostBrandName) @@ -131,7 +123,6 @@ - @@ -197,14 +188,12 @@ $(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName); $(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName); $(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName); - $(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName); $(DownloadsFolder)$(DownloadedHostFxrInstallerFileName); $(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)" /> diff --git a/src/Layout/redist/targets/RestoreLayout.targets b/src/Layout/redist/targets/RestoreLayout.targets index 384620d3f48c..b5cbd8993fc8 100644 --- a/src/Layout/redist/targets/RestoreLayout.targets +++ b/src/Layout/redist/targets/RestoreLayout.targets @@ -15,7 +15,6 @@ $(MicrosoftAspNetCoreAppRefInternalPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) - 3.0.0 x64 x86 @@ -28,11 +27,6 @@ dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension) dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension) windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - - netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-osx-x64$(InstallerExtension) $(ArtifactNameWithVersionSdk)$(InstallerExtension) dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) @@ -65,7 +59,6 @@ $(PublicBaseURL)Runtime/$(NetRuntimeBlobVersion) - $(OfficialBaseURL)Runtime/$(NETStandardTargetingPackBlobVersion) $(PublicBaseURL)aspnetcore/Runtime/$(AspNetCoreBlobVersion) $(PublicBaseURL)WindowsDesktop/$(WindowsDesktopBlobVersion) $(PublicBaseURL)Sdk/$(FullNugetVersion) @@ -81,11 +74,6 @@ PackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)" RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" /> - - $(DownloadedNetCoreAppTargetingPackInstallerFileName) - - - $(NetStandardTargetingPackRootUrl) - $(DownloadedNetStandardTargetingPackInstallerFileName) - - $(NetRuntimeRootUrl) diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md index c5820fde91ae..75e0f77588e2 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md @@ -2,7 +2,3 @@ Rule ID | Missing Help Link | Title | --------|-------------------|-------| -CA1873 | | Avoid potentially expensive logging | -CA1874 | | Use 'Regex.IsMatch' | -CA1875 | | Use 'Regex.Count' | -CA2023 | | Invalid braces in message template | From 86beaea6ccedfb5b61142c93623b8106f5adba0c Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 19 Aug 2025 00:13:54 -0700 Subject: [PATCH 2/2] Fix modified analyzer file --- .../src/RulesMissingDocumentation.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md index 75e0f77588e2..c5820fde91ae 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md @@ -2,3 +2,7 @@ Rule ID | Missing Help Link | Title | --------|-------------------|-------| +CA1873 | | Avoid potentially expensive logging | +CA1874 | | Use 'Regex.IsMatch' | +CA1875 | | Use 'Regex.Count' | +CA2023 | | Invalid braces in message template |