Skip to content

Commit 7f81848

Browse files
authored
We already have cross-compilers etc for musl and win-arm64. Actually use them (#94876)
* We already have cross-compilers etc for musl and win-arm64. Actually use them. * Fix missing RIDs related to AOT package creation
1 parent 2096625 commit 7f81848

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<SharedFrameworkName>Microsoft.NETCore.App.MonoCrossAOT</SharedFrameworkName>
88
<OverridePackageId>Microsoft.NETCore.App.Runtime.AOT.$(RuntimeIdentifier).Cross.$(TargetCrossRid)</OverridePackageId>
99
<SharedFrameworkHostFileNameOverride>monocrossaot</SharedFrameworkHostFileNameOverride>
10-
<RuntimeIdentifiers>linux-x64;linux-arm64;osx-x64;osx-arm64;win-x64</RuntimeIdentifiers>
10+
<RuntimeIdentifiers>linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-arm64</RuntimeIdentifiers>
1111
<GenerateInstallers>false</GenerateInstallers>
1212
<PublishReadyToRun>false</PublishReadyToRun>
1313
<HostJsonTargetPath>tools/</HostJsonTargetPath>

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm"
1313
],
1414
"extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten" ],
15-
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64"]
15+
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64"]
1616
},
1717
"wasm-experimental": {
1818
"description": ".NET WebAssembly experimental tooling",
@@ -21,7 +21,7 @@
2121
"Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm"
2222
],
2323
"extends": [ "wasm-tools" ],
24-
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ]
24+
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64" ]
2525
},
2626
"wasi-experimental": {
2727
"description": ".NET WASI experimental",
@@ -32,7 +32,7 @@
3232
"Microsoft.NETCore.App.Runtime.AOT.Cross.wasi-wasm"
3333
],
3434
"extends": [ "microsoft-net-runtime-mono-tooling" ],
35-
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ]
35+
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64" ]
3636
},
3737
"mobile-librarybuilder": {
3838
"description": "Mobile SDK for building a self-contained .NET native library",
@@ -369,6 +369,8 @@
369369
"win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.browser-wasm",
370370
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.browser-wasm",
371371
"linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.browser-wasm",
372+
"linux-musl-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-musl-x64.Cross.browser-wasm",
373+
"linux-musl-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-musl-arm64.Cross.browser-wasm",
372374
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm",
373375
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.browser-wasm"
374376
}
@@ -378,9 +380,11 @@
378380
"version": "${PackageVersion}",
379381
"alias-to": {
380382
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.wasi-wasm",
381-
"win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.wasi-wasm",
383+
"win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.wasi-wasm",
382384
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.wasi-wasm",
383385
"linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.wasi-wasm",
386+
"linux-musl-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-musl-x64.Cross.wasi-wasm",
387+
"linux-musl-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-musl-arm64.Cross.wasi-wasm",
384388
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.wasi-wasm",
385389
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.wasi-wasm"
386390
}

0 commit comments

Comments
 (0)