[mono] Split iOS/tvOS/MacCatalyst runtime packs into their own worklo…

…ad (#55851) The ios/tvos/maccatalyst runtime packs need to be installable on Windows and as a result each need their own workload. The microsoft-net-runtime-ios/tv/maccatalyst workloads will still function the same by extending the new runtimes-* workloads.
dotnet · Jul 19, 2021 · ec3f9fa · ec3f9fa
1 parent c8f9a24
commit ec3f9fa
Showing 1 changed file with 38 additions and 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
@@ -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",
@@ -84,16 +100,24 @@
       "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 Packs",
+      "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",
@@ -176,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}",
     },