Remove baseline suppressions from 5.0 (#29934)

* Remove baseline suppressions from 5.0

* Use newer NuGet.Protocol version

- v4.8.2 ➡️  v5.8.1

* Fix condition

* Back to 5.8.1

* Undo components changes

* Whoops

* Whoops

Co-authored-by: Doug Bunting <[email protected]>

Author: wtgodbe

eng/Baseline.Designer.props

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
-    <PackageReference Include="NuGet.Protocol" Version="4.8.2" />
+    <PackageReference Include="NuGet.Protocol" Version="5.8.1" />
   </ItemGroup>
 
 </Project>

eng/tools/BaselineGenerator/BaselineGenerator.csproj

@@ -100,11 +100,9 @@ private async Task<int> Run()
             var baselineVersion = input.Root.Attribute("Version").Value;
 
             // Baseline and .NET Core versions always align in non-preview releases.
-            // But, NuspecReader reports netcoreapp5.0 instead of net5.0. We use net5.0 in Baseline.Designer.props.
             var parsedVersion = Version.Parse(baselineVersion);
             var defaultTarget = ((parsedVersion.Major < 5) ? "netcoreapp" : "net") +
                 $"{parsedVersion.Major}.{parsedVersion.Minor}";
-            var matchTarget = $"netcoreapp{parsedVersion.Major}.{parsedVersion.Minor}";
 
             var doc = new XDocument(
                 new XComment(" Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. "),
@@ -179,7 +177,7 @@ private async Task<int> Run()
                         var targetCondition = $"'$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}'";
                         if (string.Equals(
                             group.TargetFramework.GetShortFolderName(),
-                            matchTarget,
+                            defaultTarget,
                             StringComparison.OrdinalIgnoreCase))
                         {
                             targetCondition =

eng/tools/BaselineGenerator/Program.cs

@@ -30,7 +30,6 @@
   <ItemGroup>
     <SuppressBaselineReference Include="Microsoft.AspNetCore.Components.Analyzers" InNuspecFile="true" />
     <SuppressBaselineReference Include="Microsoft.AspNetCore.Authorization" InNuspecFile="true" />
-    <SuppressBaselineReference Include="Microsoft.JSInterop" Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' " />
   </ItemGroup>
 
   <ItemGroup>

src/Components/Components/src/Microsoft.AspNetCore.Components.csproj

@@ -36,11 +36,6 @@
     <Reference Include="Microsoft.Extensions.Identity.Stores" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' ">
-    <!-- This dependency was removed in 5.0. The suppression can be removed after 5.0 RTM is released. -->
-    <SuppressBaselineReference Include="Newtonsoft.Json" />
-  </ItemGroup>
-
   <Target Name="SetupRazorInputs" BeforeTargets="ResolveRazorGenerateInputs">
     <ItemGroup>
       <_RazorGenerate Include="Areas\Identity\Pages\V4\**\*.cshtml" />

src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj

@@ -16,11 +16,5 @@
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.AspNetCode.SpaServices.Extensions.Tests" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' ">
-    <!--
-      Dependency was removed in 5.0. Suppression can be removed after 5.0 RTM is released.
-    -->
-    <SuppressBaselineReference Include="Microsoft.AspNetCore.SpaServices" />
-  </ItemGroup>
+  
 </Project>

src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj

@@ -22,13 +22,5 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'">
     <Reference Include="Microsoft.Bcl.AsyncInterfaces" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' ">
-    <!--
-      Dependency (a transitive reference) was removed in 5.0. Suppression can be
-      removed after 5.0 RTM is released.
-    -->
-    <SuppressBaselineReference Include="System.IO.Pipelines" />
-  </ItemGroup>
-
+  
 </Project>

src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj

@@ -30,11 +30,6 @@
     <Reference Include="System.Threading.Channels" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(AspNetCoreMajorMinorVersion)' == '6.0' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <!-- Dependency (a transitive ref) was removed in 5.0. Suppression can be removed after 5.0 RTM is released. -->
-    <SuppressBaselineReference Include="Microsoft.Bcl.AsyncInterfaces" />
-  </ItemGroup>
-
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Client.FunctionalTests" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Client.Tests" />