From b883e2d25736432bfe1a6af4896aed2af3d69ef9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Fi=C5=A1era?= <mara@neptuo.com>
Date: Fri, 19 May 2023 16:49:23 +0200
Subject: [PATCH] [browser] Update Wasm SDK pack version in workload manifest
 (#86382)

---
 .../WorkloadManifest.targets.in                    |  4 ++++
 .../InstallWorkloadFromArtifacts.cs                | 22 ----------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in
index 00d3e8b..a240a5a 100644
--- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in
+++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in
@@ -138,6 +138,7 @@
   <PropertyGroup Condition="'$(TargetsCurrent)' == 'true' and ('$(UsingMobileWorkload)' == 'true' or '$(RuntimeIdentifier)' == 'browser-wasm' or '$(RuntimeIdentifier)' == 'wasi-wasm')">
     <_MonoWorkloadTargetsMobile>true</_MonoWorkloadTargetsMobile>
     <_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersionCurrent)</_MonoWorkloadRuntimePackPackageVersion>
+    <_KnownWebAssemblySdkPackVersion>$(_RuntimePackInWorkloadVersionCurrent)</_KnownWebAssemblySdkPackVersion>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetsCurrent)' == 'true' and '$(_MonoWorkloadTargetsMobile)' == 'true'">
@@ -150,6 +151,9 @@
       <RuntimePackNamePatterns Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(WasmEnableThreads)' == 'true'">Microsoft.NETCore.App.Runtime.Mono.multithread.**RID**</RuntimePackNamePatterns>
       <RuntimePackNamePatterns Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(WasmEnablePerfTracing)' == 'true'">Microsoft.NETCore.App.Runtime.Mono.perftrace.**RID**</RuntimePackNamePatterns>
     </KnownRuntimePack>
+    <KnownWebAssemblySdkPack Update="@(KnownWebAssemblySdkPack)">
+      <WebAssemblySdkPackVersion Condition="'%(KnownWebAssemblySdkPack.TargetFramework)' == '${NetCoreAppCurrent}'">$(_KnownWebAssemblySdkPackVersion)</WebAssemblySdkPackVersion>
+    </KnownWebAssemblySdkPack>
   </ItemGroup>
 
   <!-- we can't condition sdk imports on the item @(NativeFileReference). Instead, explicitly check before the build
diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
index b64b853..0a33173 100644
--- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
+++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
@@ -117,8 +117,6 @@ namespace Microsoft.Workload.Build.Tasks
                     if (!ExecuteInternal(req) && !req.IgnoreErrors)
                         return false;
 
-                    OverrideWebAssemblySdkPack(req.TargetPath, LocalNuGetsPath);
-
                     File.WriteAllText(req.StampPath, string.Empty);
                 }
 
@@ -136,26 +134,6 @@ namespace Microsoft.Workload.Build.Tasks
             }
         }
 
-        private static void OverrideWebAssemblySdkPack(string targetPath, string localNuGetsPath)
-        {
-            string nupkgName = "Microsoft.NET.Sdk.WebAssembly.Pack";
-            string? nupkg = Directory.EnumerateFiles(localNuGetsPath, $"{nupkgName}.*.nupkg").FirstOrDefault();
-            if (nupkg == null)
-                return;
-
-            string nupkgVersion = Path.GetFileNameWithoutExtension(nupkg).Substring(nupkgName.Length + 1);
-
-            string bundledVersions = Directory.EnumerateFiles(targetPath, @"Microsoft.NETCoreSdk.BundledVersions.props", SearchOption.AllDirectories).Single();
-            var document = XDocument.Load(bundledVersions);
-            if (document != null)
-            {
-                foreach (var element in document.Descendants("KnownWebAssemblySdkPack"))
-                    element.SetAttributeValue("WebAssemblySdkPackVersion", nupkgVersion);
-
-                document.Save(bundledVersions);
-            }
-        }
-
         private bool ExecuteInternal(InstallWorkloadRequest req)
         {
             if (!File.Exists(TemplateNuGetConfigPath))
-- 
2.7.4