Commit 381b445
authored
[NativeAOT] Let the SDK select runtime packs (#12750)
The Android RC1 workload stamped its build-time `MicrosoftNETCoreAppRefPackageVersion` into customer projects and used it to rewrite the .NET SDK's NativeAOT `KnownRuntimePack` metadata. When the workload was built against `11.0.0-rc.1.26428.117` but installed with the `11.0.100-rc.1.26425.128` SDK, `dotnet publish -p:PublishAot=true` requested runtime-pack versions that were not available on NuGet.org.
- Remove the Android-side `KnownRuntimePack` rewrite now that the .NET SDK advertises `android-arm` itself.
- Stop exporting `MicrosoftNETCoreAppRefPackageVersion` from the Android workload's bundled-version targets.
- Add restore coverage proving an invalid workload dependency version cannot affect the SDK-selected NativeAOT runtime-pack version.
This keeps runtime-pack and ILCompiler selection owned by the installed .NET SDK and avoids mismatches between independently built SDK and Android workload releases.
Fixes #123621 parent 9c3fc3d commit 381b445
4 files changed
Lines changed: 39 additions & 13 deletions
File tree
- src/Xamarin.Android.Build.Tasks
- Microsoft.Android.Sdk
- in
- targets
- Tests/Xamarin.Android.Build.Tests
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | 13 | | |
15 | 14 | | |
16 | 15 | | |
| |||
Lines changed: 0 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | 37 | | |
48 | 38 | | |
49 | 39 | | |
| |||
Lines changed: 39 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
| |||
101 | 102 | | |
102 | 103 | | |
103 | 104 | | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
104 | 143 | | |
105 | 144 | | |
106 | 145 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
281 | 281 | | |
282 | 282 | | |
283 | 283 | | |
284 | | - | |
285 | 284 | | |
286 | 285 | | |
287 | 286 | | |
| |||
304 | 303 | | |
305 | 304 | | |
306 | 305 | | |
307 | | - | |
308 | 306 | | |
309 | 307 | | |
310 | 308 | | |
| |||
0 commit comments