huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update `BaselineGenerator` 

- handle `netcoreapp5.0` from `NuspecReader`
This commit is contained in:
Doug Bunting 2021-03-09 15:21:41 -08:00
parent dfad24463e
commit f190980f62
No known key found for this signature in database
GPG Key ID: EE41520987982C03
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eng/tools/BaselineGenerator/Program.cs
View File

@ -91,9 +91,11 @@ namespace PackageBaselineGenerator
var baselineVersion = input.Root.Attribute("Version").Value; var baselineVersion = input.Root.Attribute("Version").Value;
// Baseline and .NET Core versions always align in non-preview releases. // 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 parsedVersion = Version.Parse(baselineVersion);
var defaultTarget = ((parsedVersion.Major < 5) ? "netcoreapp" : "net") + var defaultTarget = ((parsedVersion.Major < 5) ? "netcoreapp" : "net") +
$"{parsedVersion.Major}.{parsedVersion.Minor}"; $"{parsedVersion.Major}.{parsedVersion.Minor}";
var matchTarget = $"netcoreapp{parsedVersion.Major}.{parsedVersion.Minor}";
var doc = new XDocument( var doc = new XDocument(
new XComment(" Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. "), 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()}'"; var targetCondition = $"'$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}'";
if (string.Equals( if (string.Equals(
group.TargetFramework.GetShortFolderName(), group.TargetFramework.GetShortFolderName(),
defaultTarget, matchTarget,
StringComparison.OrdinalIgnoreCase)) StringComparison.OrdinalIgnoreCase))
{ {
targetCondition = targetCondition =
$"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR {targetCondition})"; $"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == '{defaultTarget}')";
} }
var itemGroup = new XElement( var itemGroup = new XElement(