diff --git a/eng/Versions.props b/eng/Versions.props index 1f35471918..eb56600bca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,16 +3,12 @@ 6 0 - 6.0.11 + 6.0.12 rtm 2.0.23 - 6.0.100 - - - true release @@ -27,4 +23,8 @@ 1.1.87-gba258badda 1.0.0-v3.14.0.5722 + + + + diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in index d363add35f..659f8545b7 100644 --- a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in +++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in @@ -9,7 +9,7 @@ "Microsoft.NET.Runtime.Emscripten.Python.net6", "Microsoft.NET.Runtime.Emscripten.Sdk.net6" ], - "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ] + "platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ] } }, "packs": { @@ -18,6 +18,7 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.win-x64", + "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.win-x64", "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.linux-x64", "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64", "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64" @@ -28,6 +29,7 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.win-x64", + "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.win-x64", "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64", "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64" } @@ -37,6 +39,7 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.win-x64", + "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.win-x64", "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.linux-x64", "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.osx-x64", "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.osx-x64" diff --git a/eng/workloads/workloads.csproj b/eng/workloads/workloads.csproj index 75fe5a7d4b..dc67faba37 100644 --- a/eng/workloads/workloads.csproj +++ b/eng/workloads/workloads.csproj @@ -72,9 +72,10 @@ - + MsiVersion="$(MsiVersion)" + SupportsMachineArch="%(SupportsMachineArch)" />