Skip to content

Commit ec3f9fa

Browse files
authored
[mono] Split iOS/tvOS/MacCatalyst runtime packs into their own workload (#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.
1 parent c8f9a24 commit ec3f9fa

File tree

1 file changed

+38
-14
lines changed

1 file changed

+38
-14
lines changed

src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,48 @@
4242
"abstract": true,
4343
"description": "iOS Mono Runtime and AOT Workload",
4444
"packs": [
45-
"Microsoft.NETCore.App.Runtime.Mono.ios-arm",
46-
"Microsoft.NETCore.App.Runtime.Mono.ios-arm64",
47-
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64",
48-
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64",
49-
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86",
5045
"Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm",
5146
"Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64",
5247
"Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64",
5348
"Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64",
5449
"Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86"
5550
],
56-
"extends": [ "microsoft-net-runtime-mono-tooling" ],
51+
"extends": [ "runtimes-ios" ],
5752
"platforms": [ "osx-arm64", "osx-x64" ]
5853
},
54+
"runtimes-ios": {
55+
"abstract": true,
56+
"description": "iOS Mono Runtime Packs",
57+
"packs": [
58+
"Microsoft.NETCore.App.Runtime.Mono.ios-arm",
59+
"Microsoft.NETCore.App.Runtime.Mono.ios-arm64",
60+
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64",
61+
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64",
62+
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
63+
],
64+
"extends": [ "microsoft-net-runtime-mono-tooling" ],
65+
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
66+
},
5967
"microsoft-net-runtime-maccatalyst": {
6068
"abstract": true,
6169
"description": "MacCatalyst Mono Runtime and AOT Workload",
6270
"packs": [
63-
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64",
64-
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64",
6571
"Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64",
6672
"Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-x64"
6773
],
68-
"extends": [ "microsoft-net-runtime-mono-tooling" ],
74+
"extends": [ "runtimes-maccatalyst" ],
6975
"platforms": [ "osx-arm64", "osx-x64" ]
7076
},
77+
"runtimes-maccatalyst": {
78+
"abstract": true,
79+
"description": "MacCatalyst Mono Runtime Packs",
80+
"packs": [
81+
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64",
82+
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
83+
],
84+
"extends": [ "microsoft-net-runtime-mono-tooling" ],
85+
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
86+
},
7187
"microsoft-net-runtime-macos": {
7288
"abstract": true,
7389
"description": "MacOS CoreCLR and Mono Runtime Workload",
@@ -84,16 +100,24 @@
84100
"abstract": true,
85101
"description": "tvOS Mono Runtime and AOT Workload",
86102
"packs": [
87-
"Microsoft.NETCore.App.Runtime.Mono.tvos-arm64",
88-
"Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64",
89-
"Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64",
90103
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64",
91104
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-arm64",
92105
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-x64"
93106
],
94-
"extends": [ "microsoft-net-runtime-mono-tooling" ],
107+
"extends": [ "runtimes-tvos" ],
95108
"platforms": [ "osx-arm64", "osx-x64" ]
96109
},
110+
"runtimes-tvos": {
111+
"abstract": true,
112+
"description": "tvOS Mono Runtime Packs",
113+
"packs": [
114+
"Microsoft.NETCore.App.Runtime.Mono.tvos-arm64",
115+
"Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64",
116+
"Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
117+
],
118+
"extends": [ "microsoft-net-runtime-mono-tooling" ],
119+
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
120+
},
97121
"microsoft-net-runtime-mono-tooling": {
98122
"abstract": true,
99123
"description": "Shared native build tooling for Mono runtime",
@@ -176,7 +200,7 @@
176200
"kind": "framework",
177201
"version": "${PackageVersion}",
178202
},
179-
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst-64": {
203+
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64": {
180204
"kind": "framework",
181205
"version": "${PackageVersion}",
182206
},

0 commit comments

Comments
 (0)