Skip to content

Commit c9a25d8

Browse files
committed
Merge branch 'main' into dev/grendel/perfetto-integration
* main: (26 commits) Make APK and shared library alignment configurable (#9046) [r8] update proguard rule to keep .NET runtime classes (#9044) Explicitly align to 4k (#9041) [trimming] preserve custom views and `$(AndroidHttpClientHandlerType)` (#8954) Ignore split configs when bundle config moves shared libraries to base.apk (#8987) Bump to dotnet/android-tools@1c09dcc (#9026) Bump to dotnet/java-interop@ccafbe6 (#9025) [Mono.Android-Tests] Fix repo URL in redirect tests (#9035) [ci] Update checkout path for nightly build (#9028) [ci] Fix android source path for MAUI test job (#9030) Link Code of Conduct (#9034) [ci] Update sdk-insertions trigger to manual only (#9029) Update java-interop and android-tools submodule mentions (#9023) LEGO: Merge pull request 9022 [Xamarin.Android.Build.Tasks] fastdev works with aab files (#8990) Use new binutils URL (#9019) Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 9686669 (#9011) LEGO: Merge pull request 9015 [api-merge] Update "constant" values to mirror latest API levels (#9004) [Mono.Android] Fix wrong value for `ApplicationExitInfoReason.Other` (#9003) ...
2 parents 1676bc0 + ddb215b commit c9a25d8

File tree

184 files changed

+4610
-2217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+4610
-2217
lines changed

.external

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
xamarin/monodroid:main@93ab95e18077d56d9d55ce7b4069a534e2dea35e
1+
xamarin/monodroid:main@c6aae9e5a154cfbf2c3a94e046fa2c747c3b82e2

.github/ISSUE_TEMPLATE/04-binding-a-java-library.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9-
Documentation for how to troubleshoot issues with binding projects, as well as common issues and how to solve them, is available [here](https://github.com/xamarin/java.interop/wiki/Troubleshooting-Android-Bindings-Issues).
9+
Documentation for how to troubleshoot issues with binding projects, as well as common issues and how to solve them, is available [here](https://github.com/dotnet/java-interop/wiki/Troubleshooting-Android-Bindings-Issues).
1010
1111
If you get stuck troubleshooting an issue, please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker.
1212
- type: dropdown

.github/workflows/sdk-insertion-bump.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: Notify release branch change
22

33
on:
4+
workflow_dispatch:
45
# trigger for main and release branches.
5-
push:
6-
branches:
7-
- main
8-
- 'release/**'
6+
#push:
7+
# branches:
8+
# - main
9+
# - 'release/**'
910

1011
jobs:
1112
pingRemote:
@@ -30,6 +31,6 @@ jobs:
3031
token: ${{ secrets.SERVICEACCOUNT_PAT }}
3132
event-type: 'sdk_insertion'
3233
repository: 'xamarin/sdk-insertions'
33-
client-payload: '{"repository": "xamarin/xamarin-android", "branch": "${{ github.ref_name }}", "commit": "${{ github.sha }}", "commit_message": ${{ steps.commit_title.outputs.COMMIT_TITLE }} }'
34+
client-payload: '{"repository": "dotnet/android", "branch": "${{ github.ref_name }}", "commit": "${{ github.sha }}", "commit_message": ${{ steps.commit_title.outputs.COMMIT_TITLE }} }'
3435

3536

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
branch = main
1313
[submodule "external/Java.Interop"]
1414
path = external/Java.Interop
15-
url = https://github.com/xamarin/java.interop.git
15+
url = https://github.com/dotnet/java-interop
1616
branch = main
1717
[submodule "external/libunwind"]
1818
path = external/libunwind
@@ -28,7 +28,7 @@
2828
branch = master
2929
[submodule "external/xamarin-android-tools"]
3030
path = external/xamarin-android-tools
31-
url = https://github.com/xamarin/xamarin-android-tools
31+
url = https://github.com/dotnet/android-tools
3232
branch = main
3333
[submodule "external/xxHash"]
3434
path = external/xxHash

CODE-OF-CONDUCT.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Code of Conduct
2+
3+
This project has adopted the code of conduct defined by the Contributor Covenant
4+
to clarify expected behavior in our community.
5+
6+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

Configuration.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@
137137
<PropertyGroup>
138138
<JavacSourceVersion>1.8</JavacSourceVersion>
139139
<JavacTargetVersion>1.8</JavacTargetVersion>
140-
<Java8SdkDirectory Condition=" '$(Java8SdkDirectory)' == '' and Exists($(JAVA_HOME_8_X64)) ">$(JAVA_HOME_8_X64)</Java8SdkDirectory>
141-
<Java8SdkDirectory Condition=" '$(Java8SdkDirectory)' == '' and Exists('$(JavaSdkDirectory)\..\jdk-1.8') ">$([System.IO.Path]::GetFullPath ('$(JavaSdkDirectory)\..\jdk-1.8'))</Java8SdkDirectory>
142-
<Java8SdkDirectory Condition=" '$(Java8SdkDirectory)' == '' ">$(JavaSdkDirectory)</Java8SdkDirectory>
143140
</PropertyGroup>
144141
<PropertyGroup>
145142
<AndroidNdkFullPath>$([System.IO.Path]::GetFullPath ('$(AndroidNdkDirectory)'))</AndroidNdkFullPath>

Documentation/release-notes/5945.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#### Bindings projects
22

3-
- [GitHub Issue #835](https://github.com/xamarin/java.interop/issues/835):
3+
- [GitHub Issue #835](https://github.com/dotnet/java-interop/issues/835):
44
Don't throw an `IndexOutOfRangeException` if a Java type ends with `.` or `$`.
55

66
- [GitHub Issue #5821](https://github.com/xamarin/xamarin-android/issues/5921)

Documentation/release-notes/README.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ items.
3737
Changes for One .NET should have neither label for now because they are not yet
3838
user-facing.
3939

40-
PRs that bump Java.Interop, xamarin-android-tools, or monodroid generally don't
40+
PRs that bump Java.Interop, android-tools, or monodroid generally don't
4141
need to be labeled, but Mono bumps that include changes that could affect
4242
Android users should be labeled.
4343

@@ -123,7 +123,7 @@ Examples:
123123
```markdown
124124
### Build and deployment performance
125125

126-
- [Java.Interop GitHub PR 596](https://github.com/xamarin/java.interop/pull/596):
126+
- [Java.Interop GitHub PR 596](https://github.com/dotnet/java-interop/pull/596):
127127
Use `File.Exists()` instead of `DirectoryGetFile()` in a few places. This
128128
reduced the time for the `LinkAssembliesNoShrink` task from about 710
129129
milliseconds to about 430 milliseconds for a small test Xamarin.Forms app on
@@ -191,19 +191,19 @@ Example showing multiple release notes sections for a Java.Interop bump:
191191
```markdown
192192
### Build and deployment performance
193193

194-
- [Java.Interop GitHub PR 440](https://github.com/xamarin/java.interop/pull/440),
195-
[Java.Interop GitHub PR 441](https://github.com/xamarin/java.interop/pull/441),
196-
[Java.Interop GitHub PR 442](https://github.com/xamarin/java.interop/pull/442),
197-
[Java.Interop GitHub PR 448](https://github.com/xamarin/java.interop/pull/448),
198-
[Java.Interop GitHub PR 449](https://github.com/xamarin/java.interop/pull/449),
199-
[Java.Interop GitHub PR 452](https://github.com/xamarin/java.interop/pull/452):
194+
- [Java.Interop GitHub PR 440](https://github.com/dotnet/java-interop/pull/440),
195+
[Java.Interop GitHub PR 441](https://github.com/dotnet/java-interop/pull/441),
196+
[Java.Interop GitHub PR 442](https://github.com/dotnet/java-interop/pull/442),
197+
[Java.Interop GitHub PR 448](https://github.com/dotnet/java-interop/pull/448),
198+
[Java.Interop GitHub PR 449](https://github.com/dotnet/java-interop/pull/449),
199+
[Java.Interop GitHub PR 452](https://github.com/dotnet/java-interop/pull/452):
200200
Optimize several of the build steps for bindings projects. For a large
201201
binding like _Mono.Android.dll_ itself, this reduced the total build time in a
202202
test environment by about 50 seconds.
203203

204204
#### Bindings projects
205205

206-
- [Java.Interop GitHub PR 458](https://github.com/xamarin/java.interop/pull/458):
206+
- [Java.Interop GitHub PR 458](https://github.com/dotnet/java-interop/pull/458):
207207
Bindings projects did not yet automatically generate event handlers for Java
208208
listener interfaces where the _add_ or _set_ method of the interface took two
209209
arguments instead of just one.
@@ -381,8 +381,7 @@ added to `Documentation/release-notes/images/`.
381381

382382
(For versions before 11.2, the milestone had a slightly different format.)
383383

384-
Complete this step for xamarin-android, Java.Interop, and
385-
xamarin-android-tools.
384+
Complete this step for xamarin-android, Java.Interop, and android-tools.
386385

387386
See also the [_How to make bulk changes on pull requests and issues_][bulk-change]
388387
section for tips on how to complete this step.

Documentation/workflow/HowToAddNewApiLevel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ This will create a `api-XX.xml` file in `/src/Mono.Android/Profiles/` that needs
5858
- Add required metadata fixes in `/src/Mono.Android/metadata` until `Mono.Android.csproj` builds
5959
- Check that new package/namespaces are properly cased
6060

61+
### New AndroidManifest.xml Elements
62+
63+
- See `build-tools/manifest-attribute-codegen/README.md` for instructions on surfacing any new
64+
elements or attributes added to `AndroidManifest.xml`.
65+
6166
### ApiCompat
6267

6368
There may be ApiCompat issues that need to be examined. Either fix the assembly with metadata or allow

Localize/loc/cs/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Str Cat="Text">
2323
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
2424
<Tgt Cat="Text" Stat="Loc" Orig="New">
25-
<Val><![CDATA[Projekt pro vytvoření aplikace .NET Android Wear]]></Val>
25+
<Val><![CDATA[Projekt vytvoření aplikace pro Wear OS pomocí .NET pro Android]]></Val>
2626
</Tgt>
2727
<Prev Cat="Text">
2828
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>

0 commit comments

Comments
 (0)