Commit 0150bbb
authored
[One .NET] extend the microsoft-net-runtime-android workload (dotnet#5975)
Context: https://github.com/dotnet/runtime/blob/d43e88620fe574045f026a4ebce50f7a8541347a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
In order to start using packs from the `microsoft-net-runtime-android`
workload, we need to:
1. Add `Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100` to
`package-download.proj`.
2. Copy `WorkloadManifest.*` files from:
Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100/data/
To:
~/android-toolchain/dotnet/sdk-manifests/6.0.100/Microsoft.NET.Workload.Mono.ToolChain/
So we get the latest `WorkloadManifest.json` based on the version
defined in `$(MicrosoftNETCoreAppRefPackageVersion)`.
3. `xaprepare` should run:
~/android-toolchain/dotnet/dotnet workload install microsoft-net-runtime-android --skip-manifest-update --verbosity diag
So the packs are installed for local development and CI.
4. Our workload should "extend" `microsoft-net-runtime-android`. This
would make sure these packs are installed on user's machines.1 parent 19796bb commit 0150bbb
File tree
7 files changed
+34
-2
lines changed- build-tools/xaprepare/xaprepare
- Application
- ConfigAndData
- Steps
- src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android
7 files changed
+34
-2
lines changedLines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
380 | 380 | | |
381 | 381 | | |
382 | 382 | | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
383 | 390 | | |
384 | 391 | | |
385 | 392 | | |
| |||
Lines changed: 21 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
92 | 112 | | |
93 | 113 | | |
94 | 114 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| 62 | + | |
62 | 63 | | |
63 | 64 | | |
64 | 65 | | |
| |||
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
| 12 | + | |
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
| |||
0 commit comments