diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets index dfa40d5f8238..6aef797bbbf1 100644 --- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets +++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets @@ -62,7 +62,6 @@ diff --git a/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs b/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs index 7e20af99a929..4ab0ad01b734 100644 --- a/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs +++ b/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -36,10 +36,6 @@ public sealed class OverrideAndCreateBundledNETCoreAppPackageVersion : Task [Required] public string MicrosoftNETCoreAppRefPackageVersion { get; set; } - // TODO: remove this once linker packages are produced from dotnet/runtime - // and replace it with MicrosoftNETCoreAppRefPackageVersion. - [Required] public string MicrosoftNETILLinkTasksPackageVersion { get; set; } - [Required] public string NewSDKVersion { get; set; } [Required] public string OutputPath { get; set; } @@ -50,7 +46,6 @@ public override bool Execute() ExecuteInternal( File.ReadAllText(Stage0MicrosoftNETCoreAppRefPackageVersionPath), MicrosoftNETCoreAppRefPackageVersion, - MicrosoftNETILLinkTasksPackageVersion, NewSDKVersion)); return true; } @@ -58,7 +53,6 @@ public override bool Execute() public static string ExecuteInternal( string stage0MicrosoftNETCoreAppRefPackageVersionContent, string microsoftNETCoreAppRefPackageVersion, - string microsoftNETILLinkTasksPackageVersion, string newSDKVersion) { var projectXml = XDocument.Parse(stage0MicrosoftNETCoreAppRefPackageVersionContent); @@ -123,9 +117,8 @@ void CheckAndReplaceAttribute(XAttribute attribute) .Elements(ns + "KnownCrossgen2Pack").First().Attribute("Crossgen2PackVersion")); CheckAndReplaceAttribute(itemGroup .Elements(ns + "KnownILCompilerPack").First().Attribute("ILCompilerPackVersion")); - - // TODO: replace this with CheckAndReplaceAttribute once linker packages are produced from dotnet/runtime. - itemGroup.Elements(ns + "KnownILLinkPack").First().Attribute("ILLinkPackVersion").Value = microsoftNETILLinkTasksPackageVersion; + CheckAndReplaceAttribute(itemGroup + .Elements(ns + "KnownILLinkPack").First().Attribute("ILLinkPackVersion")); CheckAndReplaceAttribute(itemGroup .Elements(ns + "KnownRuntimePack").First().Attribute("LatestRuntimeFrameworkVersion"));