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) ...
dotnet · Feb 14, 2024 · b7e4d3b · b7e4d3b
2 parents 9a3a2ec + 71b6fcc
commit b7e4d3b
Show file tree

Hide file tree

Showing 519 changed files with 334,642 additions and 141,999 deletions.
diff --git a/.external b/.external
@@ -1,2 +1 @@
-xamarin/monodroid:main@4d3ede83f699e1d127fed4a18de992819983d715
-mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
+xamarin/monodroid:main@848d1277b76a599d8a280d58ec06e95477b4a7e5
diff --git a/.github/ISSUE_TEMPLATE/01-building-an-application.yml b/.github/ISSUE_TEMPLATE/01-building-an-application.yml
@@ -14,16 +14,16 @@ body:
       description: In what type(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - Classic Xamarin.Android (MonoAndroid12.0, etc.)
-      - .NET Android (net7.0-android, etc.)
+      - Classic Xamarin.Android (MonoAndroid13.0, etc.)
+      - .NET Android (net7.0-android, net8.0-android, etc.)
     validations:
       required: true
   - type: input
     id: platform-versions
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
+      placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
     validations:
       required: true
   - type: textarea
@@ -40,7 +40,7 @@ body:
       label: Steps to Reproduce
       description: Describe all the steps we need to take to show the behavior that you have observed.
       placeholder: | 
-        1. Create a File > New Android App (Xamarin)
+        1. File > New Project > New Android Application
         2. Add the following code: ...
         3. Run the app and observe the bug 🐞
     validations:

diff --git a/.github/ISSUE_TEMPLATE/02-running-an-application.yml b/.github/ISSUE_TEMPLATE/02-running-an-application.yml
@@ -14,16 +14,16 @@ body:
       description: In what type(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - Classic Xamarin.Android (MonoAndroid12.0, etc.)
-      - .NET Android (net7.0-android, etc.)
+      - Classic Xamarin.Android (MonoAndroid13.0, etc.)
+      - .NET Android (net7.0-android, net8.0-android, etc.)
     validations:
       required: true
   - type: input
     id: platform-versions
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
+      placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
     validations:
       required: true
   - type: textarea
@@ -40,7 +40,7 @@ body:
       label: Steps to Reproduce
       description: Describe all the steps we need to take to show the behavior that you have observed.
       placeholder: | 
-        1. Create a File > New Android App (Xamarin)
+        1. File > New Project > New Android Application
         2. Add the following code: ...
         3. Run the app and observe the bug 🐞
     validations:

diff --git a/.github/ISSUE_TEMPLATE/03-mono-android-api.yml b/.github/ISSUE_TEMPLATE/03-mono-android-api.yml
@@ -19,16 +19,16 @@ body:
       description: In what type(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - Classic Xamarin.Android (MonoAndroid12.0, etc.)
-      - .NET Android (net7.0-android, etc.)
+      - Classic Xamarin.Android (MonoAndroid13.0, etc.)
+      - .NET Android (net7.0-android, net8.0-android, etc.)
     validations:
       required: true
   - type: input
     id: platform-versions
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
+      placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
     validations:
       required: true
   - type: textarea
@@ -45,7 +45,7 @@ body:
       label: Steps to Reproduce
       description: Describe all the steps we need to take to show the behavior that you have observed.
       placeholder: | 
-        1. Create a File > New Android App (Xamarin)
+        1. File > New Project > New Android Application
         2. Add the following code: ...
         3. Run the app and observe the bug 🐞
     validations:

diff --git a/.github/ISSUE_TEMPLATE/04-binding-a-java-library.yml b/.github/ISSUE_TEMPLATE/04-binding-a-java-library.yml
@@ -16,16 +16,16 @@ body:
       description: In what type(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - Classic Xamarin.Android (MonoAndroid12.0, etc.)
-      - .NET Android (net7.0-android, etc.)
+      - Classic Xamarin.Android (MonoAndroid13.0, etc.)
+      - .NET Android (net7.0-android, net8.0-android, etc.)
     validations:
       required: true
   - type: input
     id: platform-versions
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
+      placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
     validations:
       required: true
   - type: textarea
@@ -42,7 +42,7 @@ body:
       label: Steps to Reproduce
       description: Describe all the steps we need to take to show the behavior that you have observed.
       placeholder: | 
-        1. Create a File > New Android App (Xamarin)
+        1. File > New Project > New Android Application
         2. Add the following code: ...
         3. Run the app and observe the bug 🐞
     validations:

diff --git a/.github/ISSUE_TEMPLATE/05-other.yml b/.github/ISSUE_TEMPLATE/05-other.yml
@@ -14,16 +14,16 @@ body:
       description: In what type(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - Classic Xamarin.Android (MonoAndroid12.0, etc.)
-      - .NET Android (net7.0-android, etc.)
+      - Classic Xamarin.Android (MonoAndroid13.0, etc.)
+      - .NET Android (net7.0-android, net8.0-android, etc.)
     validations:
       required: true
   - type: input
     id: platform-versions
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.0.1, VSMac 8.10, .NET 6.0.100, etc.
+      placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
     validations:
       required: true
   - type: textarea
@@ -40,7 +40,7 @@ body:
       label: Steps to Reproduce
       description: Describe all the steps we need to take to show the behavior that you have observed.
       placeholder: | 
-        1. Create a File > New Android App (Xamarin)
+        1. File > New Project > New Android Application
         2. Add the following code: ...
         3. Run the app and observe the bug 🐞
     validations:

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -7,5 +7,5 @@ contact_links:
     url: https://developercommunity.visualstudio.com
     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.
   - name: "🙋‍♀️ Community Support"
-    url: https://docs.microsoft.com/answers/topics/164819/dotnet-xamarin.html
+    url: https://learn.microsoft.com/answers/tags/18/xamarin
     about: For issues that likely aren't bugs, Microsoft Q&A is a good place to ask for help.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -17,7 +17,6 @@ updates:
       - dependency-name: "external/apksig"
       - dependency-name: "external/debugger-libs"
       - dependency-name: "external/lz4"
-      - dependency-name: "external/mman-win32"
       - dependency-name: "external/nrefactory"
       - dependency-name: "external/opentk"
       - dependency-name: "external/robin-map"

diff --git a/.github/workflows/locker.yml b/.github/workflows/locker.yml
@@ -0,0 +1,36 @@
+name: Locker - Lock stale issues and PRs
+on:
+  schedule:
+    - cron: '0 9 * * *' # Once per day, early morning PT
+
+  workflow_dispatch:
+    # Manual triggering through the GitHub UI, API, or CLI
+    inputs:
+      daysSinceClose:
+        required: true
+        default: "30"
+      daysSinceUpdate:
+        required: true
+        default: "30"
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v4
+        with:
+          repository: "microsoft/vscode-github-triage-actions"
+          path: ./actions
+          ref: cd16cd2aad6ba2da74bb6c6f7293adddd579a90e # locker action commit sha
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Run Locker
+        uses: ./actions/locker
+        with:
+          daysSinceClose:  ${{ fromJson(inputs.daysSinceClose  || 30) }}
+          daysSinceUpdate: ${{ fromJson(inputs.daysSinceUpdate || 30) }}
diff --git a/.gitmodules b/.gitmodules
@@ -12,19 +12,11 @@
     branch = main
 [submodule "external/lz4"]
     path = external/lz4
-    url = https://github.com/lz4/lz4.git
+    url = https://github.com/xamarin/lz4
     branch = release
-[submodule "external/mman-win32"]
-    path = external/mman-win32
-    url = https://github.com/alitrack/mman-win32.git
-    branch = master
-[submodule "external/nrefactory"]
-    path = external/nrefactory
-    url = https://github.com/xamarin/NRefactory.git
-    branch = master
 [submodule "external/robin-map"]
     path = external/robin-map
-    url = https://github.com/Tessil/robin-map.git
+    url = https://github.com/xamarin/robin-map
     branch = master
 [submodule "external/xamarin-android-tools"]
     path = external/xamarin-android-tools

diff --git a/Configuration.Override.props.in b/Configuration.Override.props.in
@@ -38,24 +38,9 @@
           - win-x86_64
     -->
     <AndroidSupportedTargetAotAbis>armeabi-v7a:win-armeabi-v7a:arm64:win-arm64:x86:win-x86:x86_64:win-x86_64</AndroidSupportedTargetAotAbis>
-    <!--
-      Colon-separated list of ABIs to build a "host" mono JIT for.
-      The host JIT is used for the designer in Visual Studio, among other things.
-      Supported ABIs include:
-      - Darwin
-      - Linux
-      - mxe-Win64
-      Note: Why colon? Because comma `,` and semicolon `;` can't be specified on the command-line.
-      -->
-    <AndroidSupportedHostJitAbis>Darwin:mxe-Win64</AndroidSupportedHostJitAbis>
-
-    <!-- C and C++ compilers to emit host-native binaries -->
-    <HostCc>clang</HostCc>
-    <HostCxx>clang++</HostCxx>
 
     <!-- These must be FULL PATHS -->
     <AndroidToolchainCacheDirectory>$(HOME)\android-archives</AndroidToolchainCacheDirectory>
     <AndroidToolchainDirectory>$(HOME)\android-toolchain</AndroidToolchainDirectory>
-    <AndroidMxeInstallPrefix>$(AndroidToolchainDirectory)\mxe</AndroidMxeInstallPrefix>
   </PropertyGroup>
 </Project>