From cd66496da1c2e46e33282a493bb8698e51e9cbb9 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 18 Oct 2022 09:43:41 -0500 Subject: [PATCH] [mono][workload] Add workloads for win-arm64 using emulation (#68994) * Revert "Revert "[mono][workload] Add workloads for win-arm64 using emulation (#65089)" (#67154)" This reverts commit 67f26ca4fbc27d215c9ba766c7d93966b69b5a99. * Update workload project to handle arm64 artifacts Co-authored-by: Steve Pfister --- eng/Versions.props | 3 +++ .../WorkloadManifest.json.in | 25 +++++++++++-------- src/workloads/workloads.csproj | 4 ++- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index bb65849384cf6..3d8e97a089e7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,6 +25,9 @@ $(AssemblyVersion) true + + + 3.3.4-beta1.22513.1 diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in index 8aba9e3597eed..998a79a6bdf80 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in @@ -12,7 +12,7 @@ "Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm" ], "extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten-net7" ], - "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ] + "platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64"] }, "wasm-experimental": { "description": ".NET WebAssembly experimental", @@ -22,7 +22,7 @@ "Microsoft.NETCore.App.Runtime.Mono.perftrace.browser-wasm" ], "extends": [ "wasm-tools" ], - "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ] + "platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ] }, "microsoft-net-runtime-android": { "abstract": true, @@ -34,7 +34,7 @@ "Microsoft.NETCore.App.Runtime.Mono.android-x86" ], "extends": [ "microsoft-net-runtime-mono-tooling" ], - "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ] + "platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ] }, "microsoft-net-runtime-android-aot": { "abstract": true, @@ -46,7 +46,7 @@ "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64" ], "extends": [ "microsoft-net-runtime-android" ], - "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ] + "platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ] }, "microsoft-net-runtime-ios": { "abstract": true, @@ -59,7 +59,7 @@ "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86" ], "extends": [ "runtimes-ios" ], - "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] }, "runtimes-ios": { "abstract": true, @@ -72,7 +72,7 @@ "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86" ], "extends": [ "microsoft-net-runtime-mono-tooling" ], - "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] }, "microsoft-net-runtime-maccatalyst": { "abstract": true, @@ -82,7 +82,7 @@ "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-x64" ], "extends": [ "runtimes-maccatalyst" ], - "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] }, "runtimes-maccatalyst": { "abstract": true, @@ -92,7 +92,7 @@ "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64" ], "extends": [ "microsoft-net-runtime-mono-tooling" ], - "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] }, "microsoft-net-runtime-macos": { "abstract": true, @@ -115,7 +115,7 @@ "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-x64" ], "extends": [ "runtimes-tvos" ], - "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] }, "runtimes-tvos": { "abstract": true, @@ -126,7 +126,7 @@ "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64" ], "extends": [ "microsoft-net-runtime-mono-tooling" ], - "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] + "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ] }, "runtimes-windows": { "description": "Windows Runtime Packs", @@ -184,6 +184,7 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x86", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x86", "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x86", "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86", "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86" @@ -194,6 +195,7 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x64", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x64", "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x64", "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64", "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64" @@ -204,6 +206,7 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm", "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm", "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm", "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm" @@ -214,6 +217,7 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm64", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm64", "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm64", "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64", "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64" @@ -360,6 +364,7 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm", + "win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm", "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.browser-wasm", "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm", "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm" diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj index 9c012c5b43a30..77e0d389ccb13 100644 --- a/src/workloads/workloads.csproj +++ b/src/workloads/workloads.csproj @@ -136,7 +136,9 @@ - +