Update all of the current versions, not just the first one.

Author: marcpopMSFT

src/Tasks/sdk-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs

@@ -3,7 +3,12 @@
 
 #nullable disable
 
+using System;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
 using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
 using NuGet.Versioning;
 
 namespace Microsoft.DotNet.Build.Tasks
@@ -40,14 +45,16 @@ public override bool Execute()
                 ExecuteInternal(
                     File.ReadAllText(Stage0MicrosoftNETCoreAppRefPackageVersionPath),
                     MicrosoftNETCoreAppRefPackageVersion,
-                    NewSDKVersion));
+                    NewSDKVersion,
+                    Log));
             return true;
         }
 
         public static string ExecuteInternal(
             string stage0MicrosoftNETCoreAppRefPackageVersionContent,
             string microsoftNETCoreAppRefPackageVersion,
-            string newSDKVersion)
+            string newSDKVersion,
+            TaskLoggingHelper log = null)
         {
             var projectXml = XDocument.Parse(stage0MicrosoftNETCoreAppRefPackageVersionContent);
 
@@ -77,6 +84,7 @@ public static string ExecuteInternal(
             propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value = newBundledPackageVersion;
 
             var isNETServicing = IsNETServicing(originalBundledNETCoreAppPackageVersion);
+            var currentTargetFramework = $"net{parsedMicrosoftNETCoreAppRefPackageVersion.Major}.0";
 
             void CheckAndReplaceElement(XElement element)
             {
@@ -87,7 +95,7 @@ void CheckAndReplaceElement(XElement element)
                         element.ToString(), element.Value, originalBundledNETCoreAppPackageVersion));
                 }
 
-                Log.LogMessage(MessageImportance.High,
+                log?.LogMessage(MessageImportance.High,
                     $"Replacing element {element.Name} value '{element.Value}' with '{newBundledPackageVersion}'");
                 element.Value = newBundledPackageVersion;
             }
@@ -103,7 +111,7 @@ void CheckAndReplaceAttribute(XAttribute attribute)
                         originalBundledNETCoreAppPackageVersion));
                 }
 
-                Log.LogMessage(MessageImportance.High,
+                log?.LogMessage(MessageImportance.High,
                     $"Replacing attribute {attribute.Name} value '{attribute.Value}' with '{newBundledPackageVersion}' in element {attribute.Parent.Name}");
                 attribute.Value = newBundledPackageVersion;
             }
@@ -117,29 +125,60 @@ void CheckAndReplaceAttribute(XAttribute attribute)
 
             if (!isNETServicing)
             {
-                CheckAndReplaceAttribute(itemGroup
-                    .Elements(ns + "KnownFrameworkReference").First().Attribute("DefaultRuntimeFrameworkVersion"));
-                CheckAndReplaceAttribute(itemGroup
-                    .Elements(ns + "KnownFrameworkReference").First().Attribute("TargetingPackVersion"));
+                foreach (var element in itemGroup.Elements(ns + "KnownFrameworkReference")
+                    .Where(e => e.Attribute("TargetFramework")?.Value == currentTargetFramework))
+                {
+                    CheckAndReplaceAttribute(element.Attribute("DefaultRuntimeFrameworkVersion"));
+                    CheckAndReplaceAttribute(element.Attribute("TargetingPackVersion"));
+                }
             }
 
-            CheckAndReplaceAttribute(itemGroup
-                .Elements(ns + "KnownFrameworkReference").First().Attribute("LatestRuntimeFrameworkVersion"));
-            CheckAndReplaceAttribute(itemGroup
-                .Elements(ns + "KnownAppHostPack").First().Attribute("AppHostPackVersion"));
-            CheckAndReplaceAttribute(itemGroup
-                .Elements(ns + "KnownCrossgen2Pack").First().Attribute("Crossgen2PackVersion"));
-            CheckAndReplaceAttribute(itemGroup
-                .Elements(ns + "KnownILCompilerPack").First().Attribute("ILCompilerPackVersion"));
-            CheckAndReplaceAttribute(itemGroup
-                .Elements(ns + "KnownILLinkPack").First().Attribute("ILLinkPackVersion"));
-            CheckAndReplaceAttribute(itemGroup
-                .Elements(ns + "KnownWebAssemblySdkPack").First().Attribute("WebAssemblySdkPackVersion"));
-            CheckAndReplaceAttribute(itemGroup
-                .Elements(ns + "KnownAspNetCorePack").First().Attribute("AspNetCorePackVersion"));
-
-            CheckAndReplaceAttribute(itemGroup
-                .Elements(ns + "KnownRuntimePack").First().Attribute("LatestRuntimeFrameworkVersion"));
+            foreach (var element in itemGroup.Elements(ns + "KnownFrameworkReference")
+                .Where(e => e.Attribute("TargetFramework")?.Value == currentTargetFramework))
+            {
+                CheckAndReplaceAttribute(element.Attribute("LatestRuntimeFrameworkVersion"));
+            }
+            foreach (var element in itemGroup.Elements(ns + "KnownAppHostPack")
+                .Where(e => e.Attribute("TargetFramework")?.Value == currentTargetFramework))
+            {
+                CheckAndReplaceAttribute(element.Attribute("AppHostPackVersion"));
+            }
+            
+            foreach (var element in itemGroup.Elements(ns + "KnownCrossgen2Pack")
+                .Where(e => e.Attribute("TargetFramework")?.Value == currentTargetFramework))
+            {
+                CheckAndReplaceAttribute(element.Attribute("Crossgen2PackVersion"));
+            }
+            
+            foreach (var element in itemGroup.Elements(ns + "KnownILCompilerPack")
+                .Where(e => e.Attribute("TargetFramework")?.Value == currentTargetFramework))
+            {
+                CheckAndReplaceAttribute(element.Attribute("ILCompilerPackVersion"));
+            }
+            
+            foreach (var element in itemGroup.Elements(ns + "KnownILLinkPack")
+                .Where(e => e.Attribute("TargetFramework")?.Value == currentTargetFramework))
+            {
+                CheckAndReplaceAttribute(element.Attribute("ILLinkPackVersion"));
+            }
+            
+            // web assembly packs always use the latest regardless of the TFM
+            foreach (var element in itemGroup.Elements(ns + "KnownWebAssemblySdkPack"))
+            {
+                CheckAndReplaceAttribute(element.Attribute("WebAssemblySdkPackVersion"));
+            }
+            
+            foreach (var element in itemGroup.Elements(ns + "KnownAspNetCorePack")
+                .Where(e => e.Attribute("TargetFramework")?.Value == currentTargetFramework))
+            {
+                CheckAndReplaceAttribute(element.Attribute("AspNetCorePackVersion"));
+            }
+
+            foreach (var element in itemGroup.Elements(ns + "KnownRuntimePack")
+                .Where(e => e.Attribute("TargetFramework")?.Value == currentTargetFramework))
+            {
+                CheckAndReplaceAttribute(element.Attribute("LatestRuntimeFrameworkVersion"));
+            }
 
             return projectXml.ToString();
         }