Skip to content

[release/6.0-preview7] [mono] Split iOS/tvOS/MacCatalyst runtime packs into their own workload #56128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Anipik merged 3 commits into from
Jul 22, 2021
Merged

[release/6.0-preview7] [mono] Split iOS/tvOS/MacCatalyst runtime packs into their own workload #56128

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dc2784
Split iOS/tvOS/MacCatalyst runtime packs into their own workloads
Jul 16, 2021
e117051
few tweaks
Jul 16, 2021
3c11cee
Cleanup description
Jul 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 38 additions & 14 deletions src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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}",
},
Expand Down