Skip to content
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

Jump to bottom

[release/7.0] Add workload win-arm64 support #78416

Merged
merged 3 commits into from Nov 15, 2022
Merged

[release/7.0] Add workload win-arm64 support #78416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60cc756
Add win-arm64 to net7 and net6 manifests
Nov 15, 2022
891128f
Make sure mauiarm version is part of the package.
Nov 1, 2022
cea0a88
Revert mauiarm name changes
Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Expand Up @@ -26,6 +26,10 @@
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.1</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.1</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
</PropertyGroup>
<ItemGroup>
<!-- The bands we want to produce workload manifests for -->
lewing marked this conversation as resolved.
Show resolved Hide resolved
<WorkloadSdkBandVersions Include="7.0.100" SupportsMachineArch="true" />
</ItemGroup>
<!--
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
We pin these versions as we need to match them exactly for any scenarios that run Roslyn on .NET Framework, like Visual Studio.
Expand Down
23 changes: 14 additions & 9 deletions src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.json.in
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.browser-wasm"
],
"extends": [ "microsoft-net-runtime-mono-tooling-net6", "microsoft-net-sdk-emscripten-net6" ],
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
"platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ]
},
"microsoft-net-runtime-android-net6": {
"abstract": true,
Expand All @@ -24,7 +24,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net6.android-x86"
],
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
"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-net6": {
"abstract": true,
Expand All @@ -36,7 +36,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-arm64"
],
"extends": [ "microsoft-net-runtime-android-net6" ],
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
"platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ]
},
"microsoft-net-runtime-ios-net6": {
"abstract": true,
Expand All @@ -49,7 +49,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-x86"
],
"extends": [ "runtimes-ios-net6" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"runtimes-ios-net6": {
"abstract": true,
Expand All @@ -62,7 +62,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-x86"
],
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"microsoft-net-runtime-maccatalyst-net6": {
"abstract": true,
Expand All @@ -72,7 +72,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.maccatalyst-x64"
],
"extends": [ "runtimes-maccatalyst-net6" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"runtimes-maccatalyst-net6": {
"abstract": true,
Expand All @@ -82,7 +82,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net6.maccatalyst-x64"
],
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"microsoft-net-runtime-macos-net6": {
"abstract": true,
Expand All @@ -105,7 +105,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvossimulator-x64"
],
"extends": [ "runtimes-tvos-net6" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"runtimes-tvos-net6": {
"abstract": true,
Expand All @@ -116,7 +116,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net6.tvossimulator-x64"
],
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
},
"runtimes-windows-net6": {
"description": "Windows Runtime Packs",
Expand Down Expand Up @@ -191,6 +191,7 @@
"version": "${PackageVersionNet6}",
"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": "${PackageVersionNet6}",
"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": "${PackageVersionNet6}",
"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": "${PackageVersionNet6}",
"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 Expand Up @@ -409,6 +413,7 @@
"version": "${PackageVersionNet6}",
"alias-to": {
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm",
"win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm",
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.browser-wasm",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm",
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm"
Expand Down
25 changes: 15 additions & 10 deletions src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest/WorkloadManifest.json.in
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.browser-wasm"
],
"extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten-net7" ],
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
"platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ]
},
"wasm-experimental": {
"description": ".NET WebAssembly experimental tooling",
Expand All @@ -22,7 +22,7 @@
"Microsoft.NETCore.App.Runtime.Mono.perftrace.net7.browser-wasm"
],
"extends": [ "wasm-tools" ],
"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 @@ -34,7 +34,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net7.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 @@ -46,7 +46,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.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 @@ -59,7 +59,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.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 @@ -72,7 +72,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net7.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 @@ -82,7 +82,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.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 @@ -92,7 +92,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net7.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 @@ -115,7 +115,7 @@
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.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 @@ -126,7 +126,7 @@
"Microsoft.NETCore.App.Runtime.Mono.net7.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 @@ -208,6 +208,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 @@ -218,6 +219,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 @@ -228,6 +230,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 @@ -238,6 +241,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 Expand Up @@ -426,6 +430,7 @@
"version": "${PackageVersion}",
"alias-to": {
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm",
"win-arm64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm",
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.browser-wasm",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm",
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm"
Expand Down
4 changes: 3 additions & 1 deletion src/workloads/workloads.csproj
View file
Open in desktop
Expand Up @@ -111,7 +111,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"
lewing marked this conversation as resolved.
Show resolved Hide resolved
MsiVersion="$(MsiVersion)"
SupportsMachineArch="%(SupportsMachineArch)" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the metadata reference be qualified?

</ItemGroup>

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