From f190980f6249cf5f6c79d45be190851b7d092862 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 9 Mar 2021 15:21:41 -0800
Subject: [PATCH] Update `BaselineGenerator` - handle `netcoreapp5.0` from
 `NuspecReader`

---
 eng/tools/BaselineGenerator/Program.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/tools/BaselineGenerator/Program.cs b/eng/tools/BaselineGenerator/Program.cs
index e77b35edee..cd8c41d394 100644
--- a/eng/tools/BaselineGenerator/Program.cs
+++ b/eng/tools/BaselineGenerator/Program.cs
@@ -91,9 +91,11 @@ namespace PackageBaselineGenerator
             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. "),
@@ -152,11 +154,11 @@ namespace PackageBaselineGenerator
                         var targetCondition = $"'$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}'";
                         if (string.Equals(
                             group.TargetFramework.GetShortFolderName(),
-                            defaultTarget,
+                            matchTarget,
                             StringComparison.OrdinalIgnoreCase))
                         {
                             targetCondition =
-                                $"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR {targetCondition})";
+                                $"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == '{defaultTarget}')";
                         }
 
                         var itemGroup = new XElement(