Skip to content

Commit 58d09d7

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/bundle-and-blobs
* main: (22 commits) 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) [Mono.Android] Fix omitted Gl* constants. (#9009) [manifest-attribute-codegen] Generate custom attribute declarations (#8781) [tests] Reduce default build output verbosity (#9002) [templates] Update Wear OS en template string (#9005) [build] Do not provision JDK 8 (#8999) ...
2 parents f9efc83 + 3f22ab6 commit 58d09d7

File tree

165 files changed

+4052
-2193
lines changed

Some content is hidden

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

165 files changed

+4052
-2193
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/01-building-an-application.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,21 @@ body:
1010
- type: dropdown
1111
id: android-type
1212
attributes:
13-
label: Android application type
14-
description: In what type(s) of Android application(s) do you see this issue?
13+
label: Android framework version
14+
description: In what target framework(s) of Android application(s) do you see this issue?
1515
multiple: true
1616
options:
17-
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
18-
- .NET Android (net7.0-android, net8.0-android, etc.)
17+
- net8.0-android
18+
- net9.0-android
19+
- Other
1920
validations:
2021
required: true
2122
- type: input
2223
id: platform-versions
2324
attributes:
2425
label: Affected platform version
2526
description: Please provide the version number of the platform you see this issue on.
26-
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
27+
placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
2728
validations:
2829
required: true
2930
- type: textarea
@@ -54,7 +55,7 @@ body:
5455
id: logs
5556
attributes:
5657
label: Relevant log output
57-
description: Please copy and paste any (short!) relevant log output. Longer logs can be attached as .txt files. This is likely a [diagnostic MSBuild log](https://docs.microsoft.com/en-us/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output) or attach a [MSBuild binlog](https://docs.microsoft.com/en-us/visualstudio/msbuild/obtaining-build-logs-with-msbuild?view=vs-2022#save-a-binary-log).
58+
description: Please copy and paste any (short!) relevant log output. Longer logs can be attached as .txt files. This is likely a [diagnostic MSBuild log](https://learn.microsoft.com/previous-versions/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output) or attach a [MSBuild binlog](https://aka.ms/binlog).
5859
render: shell
5960
- type: markdown
6061
attributes:

‎.github/ISSUE_TEMPLATE/02-running-an-application.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,21 @@ body:
1010
- type: dropdown
1111
id: android-type
1212
attributes:
13-
label: Android application type
14-
description: In what type(s) of Android application(s) do you see this issue?
13+
label: Android framework version
14+
description: In what target framework(s) of Android application(s) do you see this issue?
1515
multiple: true
1616
options:
17-
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
18-
- .NET Android (net7.0-android, net8.0-android, etc.)
17+
- net8.0-android
18+
- net9.0-android
19+
- Other
1920
validations:
2021
required: true
2122
- type: input
2223
id: platform-versions
2324
attributes:
2425
label: Affected platform version
2526
description: Please provide the version number of the platform you see this issue on.
26-
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
27+
placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
2728
validations:
2829
required: true
2930
- type: textarea

‎.github/ISSUE_TEMPLATE/03-mono-android-api.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,28 @@ body:
88
value: |
99
Issues with missing Android API or the API not working as documented are tracked here.
1010
11-
If you are not sure how to use an API or how to accomplish your task, better support is available from our community of application writers, available in several forms:
11+
If you are not sure how to use an API or how to accomplish your task, better support is available from the community of application writers, available in several forms:
1212
13-
[Microsoft Q&A](https://docs.microsoft.com/en-us/answers/topics/dotnet-android.html)
13+
[Microsoft Q&A](https://learn.microsoft.com/answers/products/97/dotnet/)
1414
[Stack Overflow](https://stackoverflow.com)
1515
- type: dropdown
1616
id: android-type
1717
attributes:
18-
label: Android application type
19-
description: In what type(s) of Android application(s) do you see this issue?
18+
label: Android framework version
19+
description: In what target framework(s) of Android application(s) do you see this issue?
2020
multiple: true
2121
options:
22-
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
23-
- .NET Android (net7.0-android, net8.0-android, etc.)
22+
- net8.0-android
23+
- net9.0-android
24+
- Other
2425
validations:
2526
required: true
2627
- type: input
2728
id: platform-versions
2829
attributes:
2930
label: Affected platform version
3031
description: Please provide the version number of the platform you see this issue on.
31-
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
32+
placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
3233
validations:
3334
required: true
3435
- type: textarea

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,27 @@ 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
1313
id: android-type
1414
attributes:
15-
label: Android application type
16-
description: In what type(s) of Android application(s) do you see this issue?
15+
label: Android framework version
16+
description: In what target framework(s) of Android application(s) do you see this issue?
1717
multiple: true
1818
options:
19-
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
20-
- .NET Android (net7.0-android, net8.0-android, etc.)
19+
- net8.0-android
20+
- net9.0-android
21+
- Other
2122
validations:
2223
required: true
2324
- type: input
2425
id: platform-versions
2526
attributes:
2627
label: Affected platform version
2728
description: Please provide the version number of the platform you see this issue on.
28-
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
29+
placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
2930
validations:
3031
required: true
3132
- type: textarea
@@ -56,7 +57,7 @@ body:
5657
id: logs
5758
attributes:
5859
label: Relevant log output
59-
description: Please copy and paste any (short!) relevant log output. Longer logs can be attached as .txt files. This is likely a [diagnostic MSBuild log](https://docs.microsoft.com/en-us/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output). Please capture a log where you "Rebuild" the project, as some diagnostic info is only available on clean builds.
60+
description: Please copy and paste any (short!) relevant log output. Longer logs can be attached as .txt files. This is likely a [diagnostic MSBuild log](https://learn.microsoft.com/previous-versions/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output). Please capture a log where you "Rebuild" the project, as some diagnostic info is only available on clean builds.
6061
render: shell
6162
- type: markdown
6263
attributes:

‎.github/ISSUE_TEMPLATE/05-other.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,21 @@ body:
1010
- type: dropdown
1111
id: android-type
1212
attributes:
13-
label: Android application type
14-
description: In what type(s) of Android application(s) do you see this issue?
13+
label: Android framework version
14+
description: In what target framework(s) of Android application(s) do you see this issue?
1515
multiple: true
1616
options:
17-
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
18-
- .NET Android (net7.0-android, net8.0-android, etc.)
17+
- net8.0-android
18+
- net9.0-android
19+
- Other
1920
validations:
2021
required: true
2122
- type: input
2223
id: platform-versions
2324
attributes:
2425
label: Affected platform version
2526
description: Please provide the version number of the platform you see this issue on.
26-
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
27+
placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
2728
validations:
2829
required: true
2930
- type: textarea
@@ -54,7 +55,7 @@ body:
5455
id: logs
5556
attributes:
5657
label: Relevant log output
57-
description: Please copy and paste any (short!) relevant log output. Longer logs can be attached as .txt files. This could be a [diagnostic MSBuild log](https://docs.microsoft.com/en-us/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output) or a [MSBuild binlog](https://docs.microsoft.com/en-us/visualstudio/msbuild/obtaining-build-logs-with-msbuild?view=vs-2022#save-a-binary-log).
58+
description: Please copy and paste any (short!) relevant log output. Longer logs can be attached as .txt files. This could be a [diagnostic MSBuild log](https://learn.microsoft.com/previous-versions/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output) or a [MSBuild binlog](https://aka.ms/binlog).
5859
render: shell
5960
- type: markdown
6061
attributes:

‎.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>

0 commit comments

Comments
 (0)