-
Notifications
You must be signed in to change notification settings - Fork 537
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.
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
[One .NET] dotnet workload install android or android-aot #6045
[One .NET] dotnet workload install android or android-aot #6045
Conversation
4e62b46
to
50494a5
Compare
I know it's in another manifest, but resumably |
@mhutch I can add an |
50494a5
to
c2ab215
Compare
Context: dotnet/android#6045 We are aiming to simplify the .NET workload ids to short names like: dotnet workload install maui dotnet workload install android dotnet workload install ios dotnet workload install maccatalyst dotnet workload install macos dotnet workload install tvos Updated the workload ids here, as well as the `.stamp-install-workloads` make target. Other changes: * Updated descriptions to match Android. Still waiting on an *official* description we should be using for each workload. * Fixed trailing `,` that showed up as JSON errors in VS Code.
src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json
Outdated
Show resolved
Hide resolved
Context: dotnet/android#6045 We are aiming to simplify the .NET workload ids to short names like: dotnet workload install maui dotnet workload install android dotnet workload install ios dotnet workload install maccatalyst dotnet workload install macos dotnet workload install tvos Updated the workload ids here, as well as the `.stamp-install-workloads` make target. Other changes: * Updated descriptions to match Android. Still waiting on an *official* description we should be using for each workload. * Fixed trailing `,` that showed up as JSON errors in VS Code.
dd3936d
to
13ba85b
Compare
Discussed with @jonpryor and I think the plan is to have two top-level workloads:
So the |
Context: https://github.com/dotnet/maui/tree/ef4518bf502ffa6760625c4cb53fa0cb015bc6d1/src/Workload#net-maui-workload-ids Right now to install the Android workload you would run: dotnet workload install microsoft-android-sdk-full Let's shorten this to be: dotnet workload install android We can also create a new workload that extends `android`, and includes AOT support: dotnet workload install android-aot To test this behavior on our CI, I reworked the `ExtractWorkloadPacks` to run `dotnet workload install` commands. This should give us more confidence that our workload can be installed -- and our MSBuild tests will consume the installed workload. Other changes: * Added our `Microsoft.Android.Runtime.*` packs to the `WorkloadManifest.json`. This was mostly omitted by mistake; however, runtime packs aren't resolved either due to: dotnet/sdk#14044 * Call `setup-test-environment.yaml` in `dotnet_create_msi` job * Delete `dotnet/metadata` folder in `Step_InstallDotNetPreview`
13ba85b
to
6ec79a3
Compare
Use $(AndroidToolchainDirectory) and random file name as a temporary directory.
e2d3730
to
54a074a
Compare
696eaed
to
143992b
Compare
Context: https://github.com/dotnet/maui/tree/ef4518bf502ffa6760625c4cb53fa0cb015bc6d1/src/Workload#net-maui-workload-ids
Right now to install the Android workload you would run:
Let's shorten this to be:
We can also create a new workload that extends
android
, and includesAOT support:
To test this behavior on our CI, I reworked the
ExtractWorkloadPacks
to run
dotnet workload install
commands. This should give us moreconfidence that our workload can be installed -- and our MSBuild tests
will consume the installed workload.
Other changes:
Added our
Microsoft.Android.Runtime.*
packs to theWorkloadManifest.json
. This was mostly omitted by mistake;however, runtime packs aren't resolved either due to:
Allow runtime packs to be resolved from the packs folder sdk#14044
Call
setup-test-environment.yaml
indotnet_create_msi
jobDelete
dotnet/metadata
folder inStep_InstallDotNetPreview