Skip to content

Commit b7e4d3b

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/xxhash3
* main: (116 commits) [tmt] Update to work with current `libxamarin-app.so` (#8694) [Xamarin.Android.Build.Tasks] remove `$(AndroidSupportedAbis)` from `build.props` (#8717) [Xamarin.Android.Build.Tasks] BannedApiAnalyzers for Resolve() (#8715) Bump to xamarin/Java.Interop/main@dfcbd670 (#8714) [monodroid] C++ tweaks and legacy code cleanup (#8638) Bump to xamarin/xamarin-android-tools/main@a698a33 (#8710) [readme] Add `d17-8` download links. (#8709) Bump external/Java.Interop from `07c7300` to `7f08b77` (#8702) Bump to xamarin/monodroid@848d1277b7 (#8691) [Xamarin.Android.Build.Tasks] `FixAbstractMethodsStep` performance (#8650) Bump to dotnet/installer@fb7b9a4b9e 9.0.100-preview.2.24106.6 (#8700) [Mono.Android] Cache `Profiles/api-34.xml` contents (#8679) [monodroid] typemaps may need to load assemblies (#8625) Bump $(AndroidNetPreviousVersion) to 34.0.79 (#8693) Bump to xamarin/java.interop/main@07c73009 (#8681) Bump to dotnet/installer@1c496970b7 9.0.100-preview.2.24078.1 (#8685) [GetAndroidDependencies] Add Jdk dependency info (#8651) [xaprepare] Add support for newer SparkyLinux (#8684) Bump to dotnet/installer@5680e93cb2 9.0.100-preview.2.24073.12 (#8666) $(AndroidPackVersionSuffix)=preview.2; net9 is 34.99.0.preview.2 (#8678) ...
2 parents 9a3a2ec + 71b6fcc commit b7e4d3b

File tree

519 files changed

+334642
-141999
lines changed

Some content is hidden

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

519 files changed

+334642
-141999
lines changed

‎.external‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
xamarin/monodroid:main@4d3ede83f699e1d127fed4a18de992819983d715
2-
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
1+
xamarin/monodroid:main@848d1277b76a599d8a280d58ec06e95477b4a7e5

‎.github/ISSUE_TEMPLATE/01-building-an-application.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ body:
1414
description: In what type(s) of Android application(s) do you see this issue?
1515
multiple: true
1616
options:
17-
- Classic Xamarin.Android (MonoAndroid12.0, etc.)
18-
- .NET Android (net7.0-android, etc.)
17+
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
18+
- .NET Android (net7.0-android, net8.0-android, etc.)
1919
validations:
2020
required: true
2121
- type: input
2222
id: platform-versions
2323
attributes:
2424
label: Affected platform version
2525
description: Please provide the version number of the platform you see this issue on.
26-
placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
26+
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
2727
validations:
2828
required: true
2929
- type: textarea
@@ -40,7 +40,7 @@ body:
4040
label: Steps to Reproduce
4141
description: Describe all the steps we need to take to show the behavior that you have observed.
4242
placeholder: |
43-
1. Create a File > New Android App (Xamarin)
43+
1. File > New Project > New Android Application
4444
2. Add the following code: ...
4545
3. Run the app and observe the bug 🐞
4646
validations:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ body:
1414
description: In what type(s) of Android application(s) do you see this issue?
1515
multiple: true
1616
options:
17-
- Classic Xamarin.Android (MonoAndroid12.0, etc.)
18-
- .NET Android (net7.0-android, etc.)
17+
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
18+
- .NET Android (net7.0-android, net8.0-android, etc.)
1919
validations:
2020
required: true
2121
- type: input
2222
id: platform-versions
2323
attributes:
2424
label: Affected platform version
2525
description: Please provide the version number of the platform you see this issue on.
26-
placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
26+
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
2727
validations:
2828
required: true
2929
- type: textarea
@@ -40,7 +40,7 @@ body:
4040
label: Steps to Reproduce
4141
description: Describe all the steps we need to take to show the behavior that you have observed.
4242
placeholder: |
43-
1. Create a File > New Android App (Xamarin)
43+
1. File > New Project > New Android Application
4444
2. Add the following code: ...
4545
3. Run the app and observe the bug 🐞
4646
validations:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ body:
1919
description: In what type(s) of Android application(s) do you see this issue?
2020
multiple: true
2121
options:
22-
- Classic Xamarin.Android (MonoAndroid12.0, etc.)
23-
- .NET Android (net7.0-android, etc.)
22+
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
23+
- .NET Android (net7.0-android, net8.0-android, etc.)
2424
validations:
2525
required: true
2626
- type: input
2727
id: platform-versions
2828
attributes:
2929
label: Affected platform version
3030
description: Please provide the version number of the platform you see this issue on.
31-
placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
31+
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
3232
validations:
3333
required: true
3434
- type: textarea
@@ -45,7 +45,7 @@ body:
4545
label: Steps to Reproduce
4646
description: Describe all the steps we need to take to show the behavior that you have observed.
4747
placeholder: |
48-
1. Create a File > New Android App (Xamarin)
48+
1. File > New Project > New Android Application
4949
2. Add the following code: ...
5050
3. Run the app and observe the bug 🐞
5151
validations:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ body:
1616
description: In what type(s) of Android application(s) do you see this issue?
1717
multiple: true
1818
options:
19-
- Classic Xamarin.Android (MonoAndroid12.0, etc.)
20-
- .NET Android (net7.0-android, etc.)
19+
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
20+
- .NET Android (net7.0-android, net8.0-android, etc.)
2121
validations:
2222
required: true
2323
- type: input
2424
id: platform-versions
2525
attributes:
2626
label: Affected platform version
2727
description: Please provide the version number of the platform you see this issue on.
28-
placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
28+
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
2929
validations:
3030
required: true
3131
- type: textarea
@@ -42,7 +42,7 @@ body:
4242
label: Steps to Reproduce
4343
description: Describe all the steps we need to take to show the behavior that you have observed.
4444
placeholder: |
45-
1. Create a File > New Android App (Xamarin)
45+
1. File > New Project > New Android Application
4646
2. Add the following code: ...
4747
3. Run the app and observe the bug 🐞
4848
validations:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ body:
1414
description: In what type(s) of Android application(s) do you see this issue?
1515
multiple: true
1616
options:
17-
- Classic Xamarin.Android (MonoAndroid12.0, etc.)
18-
- .NET Android (net7.0-android, etc.)
17+
- Classic Xamarin.Android (MonoAndroid13.0, etc.)
18+
- .NET Android (net7.0-android, net8.0-android, etc.)
1919
validations:
2020
required: true
2121
- type: input
2222
id: platform-versions
2323
attributes:
2424
label: Affected platform version
2525
description: Please provide the version number of the platform you see this issue on.
26-
placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
26+
placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
2727
validations:
2828
required: true
2929
- type: textarea
@@ -40,7 +40,7 @@ body:
4040
label: Steps to Reproduce
4141
description: Describe all the steps we need to take to show the behavior that you have observed.
4242
placeholder: |
43-
1. Create a File > New Android App (Xamarin)
43+
1. File > New Project > New Android Application
4444
2. Add the following code: ...
4545
3. Run the app and observe the bug 🐞
4646
validations:

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ contact_links:
77
url: https://developercommunity.visualstudio.com
88
about: Feature requests are tracked on Visual Studio Developer Community because it provides good prioritization features like voting. Filing there helps ensure new features are properly considered.
99
- name: "🙋‍♀️ Community Support"
10-
url: https://docs.microsoft.com/answers/topics/164819/dotnet-xamarin.html
10+
url: https://learn.microsoft.com/answers/tags/18/xamarin
1111
about: For issues that likely aren't bugs, Microsoft Q&A is a good place to ask for help.

‎.github/dependabot.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ updates:
1717
- dependency-name: "external/apksig"
1818
- dependency-name: "external/debugger-libs"
1919
- dependency-name: "external/lz4"
20-
- dependency-name: "external/mman-win32"
2120
- dependency-name: "external/nrefactory"
2221
- dependency-name: "external/opentk"
2322
- dependency-name: "external/robin-map"

‎.github/workflows/locker.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Locker - Lock stale issues and PRs
2+
on:
3+
schedule:
4+
- cron: '0 9 * * *' # Once per day, early morning PT
5+
6+
workflow_dispatch:
7+
# Manual triggering through the GitHub UI, API, or CLI
8+
inputs:
9+
daysSinceClose:
10+
required: true
11+
default: "30"
12+
daysSinceUpdate:
13+
required: true
14+
default: "30"
15+
16+
permissions:
17+
issues: write
18+
pull-requests: write
19+
20+
jobs:
21+
main:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Checkout Actions
25+
uses: actions/checkout@v4
26+
with:
27+
repository: "microsoft/vscode-github-triage-actions"
28+
path: ./actions
29+
ref: cd16cd2aad6ba2da74bb6c6f7293adddd579a90e # locker action commit sha
30+
- name: Install Actions
31+
run: npm install --production --prefix ./actions
32+
- name: Run Locker
33+
uses: ./actions/locker
34+
with:
35+
daysSinceClose: ${{ fromJson(inputs.daysSinceClose || 30) }}
36+
daysSinceUpdate: ${{ fromJson(inputs.daysSinceUpdate || 30) }}

‎.gitmodules‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,11 @@
1212
branch = main
1313
[submodule "external/lz4"]
1414
path = external/lz4
15-
url = https://github.com/lz4/lz4.git
15+
url = https://github.com/xamarin/lz4
1616
branch = release
17-
[submodule "external/mman-win32"]
18-
path = external/mman-win32
19-
url = https://github.com/alitrack/mman-win32.git
20-
branch = master
21-
[submodule "external/nrefactory"]
22-
path = external/nrefactory
23-
url = https://github.com/xamarin/NRefactory.git
24-
branch = master
2517
[submodule "external/robin-map"]
2618
path = external/robin-map
27-
url = https://github.com/Tessil/robin-map.git
19+
url = https://github.com/xamarin/robin-map
2820
branch = master
2921
[submodule "external/xamarin-android-tools"]
3022
path = external/xamarin-android-tools

0 commit comments

Comments
 (0)