Skip to content

Adapt OverrideAndCreateBundledNETCoreAppPackageVersion for servicing #15168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2021
Merged

Adapt OverrideAndCreateBundledNETCoreAppPackageVersion for servicing #15168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ public static string ExecuteInternal(

var propertyGroup = projectXml.Root.Elements(ns + "PropertyGroup").First();

var isSDKServicing = IsSDKServicing(propertyGroup.Element(ns + "NETCoreSdkVersion").Value);

var originalBundledNETCoreAppPackageVersion =
propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value;
propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value;
propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value = microsoftNETCoreAppRefPackageVersion;

void CheckAndReplaceElement(XElement element)
Expand Down Expand Up @@ -83,22 +85,42 @@ void CheckAndReplaceAttribute(XAttribute attribute)
attribute.Value = microsoftNETCoreAppRefPackageVersion;
}

CheckAndReplaceElement(propertyGroup.Element(ns + "BundledNETCorePlatformsPackageVersion"));
if (!isSDKServicing)
{
CheckAndReplaceElement(propertyGroup.Element(ns + "BundledNETCorePlatformsPackageVersion"));
}

var itemGroup = projectXml.Root.Elements(ns + "ItemGroup").First();

CheckAndReplaceAttribute(itemGroup
.Elements(ns + "KnownFrameworkReference").First().Attribute("DefaultRuntimeFrameworkVersion"));
if (!isSDKServicing)
{
CheckAndReplaceAttribute(itemGroup
.Elements(ns + "KnownFrameworkReference").First().Attribute("DefaultRuntimeFrameworkVersion"));
CheckAndReplaceAttribute(itemGroup
.Elements(ns + "KnownFrameworkReference").First().Attribute("TargetingPackVersion"));
}

CheckAndReplaceAttribute(itemGroup
.Elements(ns + "KnownFrameworkReference").First().Attribute("LatestRuntimeFrameworkVersion"));
CheckAndReplaceAttribute(itemGroup
.Elements(ns + "KnownFrameworkReference").First().Attribute("TargetingPackVersion"));

CheckAndReplaceAttribute(itemGroup
.Elements(ns + "KnownAppHostPack").First().Attribute("AppHostPackVersion"));
CheckAndReplaceAttribute(itemGroup
.Elements(ns + "KnownCrossgen2Pack").First().Attribute("Crossgen2PackVersion"));

return projectXml.ToString();
}

/// <summary>
/// For SDK servicing, few Attributes like "DefaultRuntimeFrameworkVersion" does not use the latest flowed version
/// so there is no need to replace them.
/// </summary>
/// <returns></returns>
private static bool IsSDKServicing(string sdkVersion)
{
var parsedSdkVersion = NuGet.Versioning.NuGetVersion.Parse(sdkVersion);

return parsedSdkVersion.Patch % 100 != 0;
}
}
}