Use version in workload name so the name will match future downlevel …

…naming (#807)
dotnet · Jun 10, 2024 · 41fe641 · 41fe641
1 parent f0463b3
commit 41fe641
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/...ad.Emscripten.Current.Manifest/Microsoft.NET.Workload.Emscripten.Current.Manifest.pkgproj b/...ad.Emscripten.Current.Manifest/Microsoft.NET.Workload.Emscripten.Current.Manifest.pkgproj
@@ -40,6 +40,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <_WorkloadManifestValues Include="NetVersion" Value="net8" />
       <_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
       <_WorkloadManifestValues Include="PackageVersion" Value="$(PackageVersion)" />
       <_WorkloadManifestValues Include="EmscriptenVersion" Value="$(EmscriptenVersion)" />

diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.Current.Manifest/WorkloadManifest.json.in b/eng/nuget/Microsoft.NET.Workload.Emscripten.Current.Manifest/WorkloadManifest.json.in
@@ -3,18 +3,18 @@
   "workloads": {
     "microsoft-net-sdk-emscripten": {
       "abstract": true,
-      "description": "Emscripten SDK compiler tooling",
+      "description": "Emscripten SDK compiler tooling for ${NetVersion}.0",
       "packs": [
-        "Microsoft.NET.Runtime.Emscripten.Node",
-        "Microsoft.NET.Runtime.Emscripten.Python",
-        "Microsoft.NET.Runtime.Emscripten.Cache",
-        "Microsoft.NET.Runtime.Emscripten.Sdk"
+        "Microsoft.NET.Runtime.Emscripten.Node.${NetVersion}",
+        "Microsoft.NET.Runtime.Emscripten.Python.${NetVersion}",
+        "Microsoft.NET.Runtime.Emscripten.Cache.${NetVersion}",
+        "Microsoft.NET.Runtime.Emscripten.Sdk.${NetVersion}"
       ],
       "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ]
     }
   },
   "packs": {
-    "Microsoft.NET.Runtime.Emscripten.Node" : {
+    "Microsoft.NET.Runtime.Emscripten.Node.${NetVersion}" : {
       "kind": "Sdk",
       "version": "${PackageVersion}",
       "alias-to": {
@@ -26,7 +26,7 @@
         "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-arm64"
       }
     },
-    "Microsoft.NET.Runtime.Emscripten.Python" : {
+    "Microsoft.NET.Runtime.Emscripten.Python.${NetVersion}" : {
       "kind": "Sdk",
       "version": "${PackageVersion}",
       "alias-to": {
@@ -36,7 +36,7 @@
         "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-arm64"
       }
     },
-    "Microsoft.NET.Runtime.Emscripten.Cache" : {
+    "Microsoft.NET.Runtime.Emscripten.Cache.${NetVersion}" : {
       "kind": "Sdk",
       "version": "${PackageVersion}",
       "alias-to": {
@@ -48,7 +48,7 @@
         "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.osx-arm64"
       }
     },
-    "Microsoft.NET.Runtime.Emscripten.Sdk" : {
+    "Microsoft.NET.Runtime.Emscripten.Sdk.${NetVersion}" : {
       "kind": "Sdk",
       "version": "${PackageVersion}",
       "alias-to": {