Skip to content

Commit f190980

Browse files
committed
Update BaselineGenerator
- handle `netcoreapp5.0` from `NuspecReader`
1 parent dfad244 commit f190980

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

eng/tools/BaselineGenerator/Program.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,11 @@ private async Task<int> Run()
9191
var baselineVersion = input.Root.Attribute("Version").Value;
9292

9393
// Baseline and .NET Core versions always align in non-preview releases.
94+
// But, NuspecReader reports netcoreapp5.0 instead of net5.0. We use net5.0 in Baseline.Designer.props.
9495
var parsedVersion = Version.Parse(baselineVersion);
9596
var defaultTarget = ((parsedVersion.Major < 5) ? "netcoreapp" : "net") +
9697
$"{parsedVersion.Major}.{parsedVersion.Minor}";
98+
var matchTarget = $"netcoreapp{parsedVersion.Major}.{parsedVersion.Minor}";
9799

98100
var doc = new XDocument(
99101
new XComment(" Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. "),
@@ -152,11 +154,11 @@ private async Task<int> Run()
152154
var targetCondition = $"'$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}'";
153155
if (string.Equals(
154156
group.TargetFramework.GetShortFolderName(),
155-
defaultTarget,
157+
matchTarget,
156158
StringComparison.OrdinalIgnoreCase))
157159
{
158160
targetCondition =
159-
$"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR {targetCondition})";
161+
$"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == '{defaultTarget}')";
160162
}
161163

162164
var itemGroup = new XElement(

0 commit comments

Comments
 (0)