Skip to content

[release/6.0] Add workload win-arm64 support #78417

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
mmitche merged 5 commits into from
Nov 15, 2022
Merged

[release/6.0] Add workload win-arm64 support #78417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd6a80a
Add arm64 packs and change to mauiarm version
Oct 27, 2022
b6483de
Add SupportsMachineArch=false for 100 and 300 band versions
Oct 31, 2022
ce408d6
Fix wildcard
Oct 31, 2022
2a1e2cb
Use mauiarm version in shipping packages
Nov 1, 2022
8805690
Revert mauiarm package name change
Nov 15, 2022
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
3 changes: 2 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
</PropertyGroup>
<ItemGroup>
<!-- The bands we want to produce workload manifests for -->
<WorkloadSdkBandVersions Include="6.0.100;6.0.300;6.0.400" />
<WorkloadSdkBandVersions Include="6.0.100;6.0.300" SupportsMachineArch="false" />
<WorkloadSdkBandVersions Include="6.0.400" SupportsMachineArch="true" />
</ItemGroup>
<PropertyGroup>
<!-- For source generator support we need to target multiple versions of Rolsyn in order to be able to run on older versions of Roslyn -->
Expand Down
22 changes: 13 additions & 9 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 @@ -12,7 +12,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.browser-wasm"
],
"extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten" ],
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
"platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ]
},
"microsoft-net-runtime-android": {
"abstract": true,
Expand All @@ -24,7 +24,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net6.android-x86"
],
"extends": [ "microsoft-net-runtime-mono-tooling" ],
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
"platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ]
},
"microsoft-net-runtime-android-aot": {
"abstract": true,
Expand All @@ -36,7 +36,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-arm64"
],
"extends": [ "microsoft-net-runtime-android" ],
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
"platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ]
},
"microsoft-net-runtime-ios": {
"abstract": true,
Expand All @@ -49,7 +49,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-x86"
],
"extends": [ "runtimes-ios" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"runtimes-ios": {
"abstract": true,
Expand All @@ -62,7 +62,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-x86"
],
"extends": [ "microsoft-net-runtime-mono-tooling" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"microsoft-net-runtime-maccatalyst": {
"abstract": true,
Expand All @@ -72,7 +72,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.maccatalyst-x64"
],
"extends": [ "runtimes-maccatalyst" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"runtimes-maccatalyst": {
"abstract": true,
Expand All @@ -82,7 +82,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net6.maccatalyst-x64"
],
"extends": [ "microsoft-net-runtime-mono-tooling" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"microsoft-net-runtime-macos": {
"abstract": true,
Expand All @@ -105,7 +105,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvossimulator-x64"
],
"extends": [ "runtimes-tvos" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"runtimes-tvos": {
"abstract": true,
Expand All @@ -116,7 +116,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net6.tvossimulator-x64"
],
"extends": [ "microsoft-net-runtime-mono-tooling" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"runtimes-windows": {
"description": "Windows Runtime Packs",
Expand Down Expand Up @@ -191,6 +191,7 @@
"version": "${PackageVersion}",
"alias-to": {
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x86",
"win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x86",
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x86",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86",
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86"
Expand All @@ -201,6 +202,7 @@
"version": "${PackageVersion}",
"alias-to": {
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x64",
"win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x64",
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x64",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64",
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64"
Expand All @@ -211,6 +213,7 @@
"version": "${PackageVersion}",
"alias-to": {
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm",
"win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm",
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm",
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm"
Expand All @@ -221,6 +224,7 @@
"version": "${PackageVersion}",
"alias-to": {
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm64",
"win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm64",
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm64",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64",
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64"
Expand Down
4 changes: 3 additions & 1 deletion src/workloads/workloads.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@
<ItemGroup>
<!-- Set SupportsMachineArch metadata to true if a specific manifest needs to support arm64 for Visual Studio. DO NOT set if for all feature bands as
it changes the SWIX authoring and older versions of Visual Studio will fail to install. -->
<ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Mono.ToolChain.Manifest-*.nupkg" MsiVersion="$(MsiVersion)"/>
<ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Mono.ToolChain.Manifest-%(WorkloadSdkBandVersions.Identity).*.nupkg"
MsiVersion="$(MsiVersion)"
SupportsMachineArch="%(SupportsMachineArch)" />
</ItemGroup>

<CreateVisualStudioWorkload BaseIntermediateOutputPath="$(WorkloadIntermediateOutputPath)"
Expand Down