Back to 5.8.1

Author: wtgodbe

eng/tools/BaselineGenerator/BaselineGenerator.csproj

@@ -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/Program.cs

@@ -100,12 +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 or net50 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 netcoreappTarget = $"netcoreapp{parsedVersion.Major}.{parsedVersion.Minor}";
-            var netTarget = $"net{parsedVersion.Major}{parsedVersion.Minor}";
 
             var doc = new XDocument(
                 new XComment(" Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. "),
@@ -180,10 +177,7 @@ private async Task<int> Run()
                         var targetCondition = $"'$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}'";
                         if (string.Equals(
                             group.TargetFramework.GetShortFolderName(),
-                            netcoreappTarget,
-                            StringComparison.OrdinalIgnoreCase) || string.Equals(
-                            group.TargetFramework.GetShortFolderName(),
-                            netTarget,
+                            defaultTarget,
                             StringComparison.OrdinalIgnoreCase))
                         {
                             targetCondition =