From 1ba9f661b4fa27d0cceab37bb52c872b8f865ee9 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 16 Jul 2021 14:37:48 -0400 Subject: [PATCH 1/3] Split iOS/tvOS/MacCatalyst runtime packs into their own workloads The runtime packs need to be installable on Windows and need to be in their own workload as a result. The microsoft-net-runtime-ios/tv/maccatalyst workloads will still function the same by extending the new runtimes-* workloads. --- .../WorkloadManifest.json.in | 52 ++++++++++++++----- 1 file changed, 38 insertions(+), 14 deletions(-) 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 d7fec86e3a15d..c385c76df1d8e 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 @@ -42,32 +42,48 @@ "abstract": true, "description": "iOS Mono Runtime and AOT Workload", "packs": [ - "Microsoft.NETCore.App.Runtime.Mono.ios-arm", - "Microsoft.NETCore.App.Runtime.Mono.ios-arm64", - "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64", - "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64", - "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86", "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm", "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64", "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64", "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64", "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86" ], - "extends": [ "microsoft-net-runtime-mono-tooling" ], + "extends": [ "runtimes-ios" ], "platforms": [ "osx-arm64", "osx-x64" ] }, + "runtimes-ios": { + "abstract": true, + "description": "iOS Mono Runtime Packs", + "packs": [ + "Microsoft.NETCore.App.Runtime.Mono.ios-arm", + "Microsoft.NETCore.App.Runtime.Mono.ios-arm64", + "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64", + "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64", + "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86" + ], + "extends": [ "microsoft-net-runtime-mono-tooling" ], + "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] + }, "microsoft-net-runtime-maccatalyst": { "abstract": true, "description": "MacCatalyst Mono Runtime and AOT Workload", "packs": [ - "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64", - "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64", "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64", "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-x64" ], - "extends": [ "microsoft-net-runtime-mono-tooling" ], + "extends": [ "runtimes-maccatalyst" ], "platforms": [ "osx-arm64", "osx-x64" ] }, + "runtimes-maccatalyst": { + "abstract": true, + "description": "MacCatalyst Mono Runtime Packs", + "packs": [ + "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64", + "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64" + ], + "extends": [ "microsoft-net-runtime-mono-tooling" ], + "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] + }, "microsoft-net-runtime-macos": { "abstract": true, "description": "MacOS CoreCLR and Mono Runtime Workload", @@ -78,22 +94,30 @@ "Microsoft.NETCore.App.Runtime.osx-x64" ], "extends": [ "microsoft-net-runtime-mono-tooling" ], - "platforms": [ "osx-arm64", "osx-x64" ] + "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] }, "microsoft-net-runtime-tvos": { "abstract": true, "description": "tvOS Mono Runtime and AOT Workload", "packs": [ - "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64", - "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64", - "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64", "Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64", "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-arm64", "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-x64" ], - "extends": [ "microsoft-net-runtime-mono-tooling" ], + "extends": [ "runtimes-tvos" ], "platforms": [ "osx-arm64", "osx-x64" ] }, + "runtimes-tvos": { + "abstract": true, + "description": "tvOS Mono Runtime and AOT Workload", + "packs": [ + "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64", + "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64", + "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64" + ], + "extends": [ "microsoft-net-runtime-mono-tooling" ], + "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] + }, "microsoft-net-runtime-mono-tooling": { "abstract": true, "description": "Shared native build tooling for Mono runtime", From c8df1e6c1131b27eed218d115dc6404e59b8da2c Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 16 Jul 2021 15:51:02 -0400 Subject: [PATCH 2/3] few tweaks --- .../WorkloadManifest.json.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c385c76df1d8e..cb5ac34367703 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 @@ -94,7 +94,7 @@ "Microsoft.NETCore.App.Runtime.osx-x64" ], "extends": [ "microsoft-net-runtime-mono-tooling" ], - "platforms": [ "win-x64", "osx-arm64", "osx-x64" ] + "platforms": [ "osx-arm64", "osx-x64" ] }, "microsoft-net-runtime-tvos": { "abstract": true, @@ -200,7 +200,7 @@ "kind": "framework", "version": "${PackageVersion}", }, - "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-64": { + "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64": { "kind": "framework", "version": "${PackageVersion}", }, From 76a602dba2cc9710d0ebc1da7a3ff26f7ab626ea Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 19 Jul 2021 12:28:03 -0400 Subject: [PATCH 3/3] Cleanup description --- .../WorkloadManifest.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cb5ac34367703..bd8992a751d71 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 @@ -109,7 +109,7 @@ }, "runtimes-tvos": { "abstract": true, - "description": "tvOS Mono Runtime and AOT Workload", + "description": "tvOS Mono Runtime Packs", "packs": [ "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64", "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64",