Commit cf301bf
committed
Merge branch 'main' into dev/grendel/blazor-hang
* main:
Bump to xamarin/xamarin-android-binutils/L_18.1.4-8.0.0@758d2e7 (#8885)
[Mono.Android] Bind API-VanillaIceCream Beta 1 (#8891)
[AndroidToolTask] Log tool output as error (#8861)
[Xamarin.Android.Build.Tasks] Remove "Xamarin" from messages (#8884)
[Mono.Android] Bind API-VanillaIceCream Developer Preview 2 (#8741)
Bump to dotnet/installer@22ffa42d6c 9.0.100-preview.4.24221.5 (#8887)
Bump external/xamarin-android-tools from `37d79c9` to `05f9a90` (#8869)
Bump external/Java.Interop from `e1c7832` to `06214ff` (#8878)
Bump to dotnet/installer@7380c301c1 9.0.100-preview.4.24215.2 (#8874)
[Mono.Android] Commit baseline PublicAPI files for API-35 (#8840)
Add a unit test to check environment processing (#8856)
Don't use azureedge.net CDN (#8846)
Bump to dotnet/installer@0bfd2dd757 9.0.100-preview.4.24208.2 (#8862)
[ci] Update dependabot ignore list (#8864)
Bump external/Java.Interop from `651de42` to `e1c7832` (#8836)
Bumps LLVM to v18.1.3 and XA utils version to 8.0.0 (#8852)36 files changed
Lines changed: 371481 additions & 70 deletions
File tree
- .github
- Documentation/workflow
- build-tools
- Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks
- api-merge
- automation/yaml-templates
- installers
- xaprepare/xaprepare/ConfigAndData
- Dependencies
- eng
- external
- src
- Microsoft.Android.Sdk.ILLink/Properties
- Mono.Android
- Java.Util
- Profiles
- PublicAPI/API-35
- Xamarin.Android.Build.Tasks
- Microsoft.Android.Sdk
- in
- targets
- Microsoft.NET.Sdk.Android
- Properties
- Tasks
- Tests/Xamarin.Android.Build.Tests
- Tasks
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
22 | 20 | | |
23 | | - | |
| 21 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
33 | | - | |
34 | | - | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
23 | | - | |
| 22 | + | |
24 | 23 | | |
25 | 24 | | |
26 | 25 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
35 | 36 | | |
36 | 37 | | |
37 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | | - | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
92 | 91 | | |
93 | 92 | | |
94 | 93 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| 65 | + | |
65 | 66 | | |
66 | 67 | | |
| 68 | + | |
67 | 69 | | |
68 | 70 | | |
69 | 71 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| 48 | + | |
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
0 commit comments