Merge branch 'main' into dev/peppers/ji-1366

Author: jonathanpeppers

.azuredevops/dependabot.yml

@@ -0,0 +1,5 @@
+version: 2
+
+# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
+enable-campaigned-updates: false
+enable-security-updates: false

.external

@@ -1 +1 @@
-DevDiv/android-platform-support:main@bdce1c1dc27c5a58da5cd12ae2f4113d76ddc2da
+DevDiv/android-platform-support:main@2ca8c22cc27b2f437275ee01e054c92847728617

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+----
+
+Pull Request
+[title](https://github.com/xamarin/xamarin-android/blob/main/Documentation/workflow/commit-messages.md#commit-summary) and
+[description](https://github.com/xamarin/xamarin-android/blob/main/Documentation/workflow/commit-messages.md#commit-body)
+should follow the
+[`commit-messages.md` workflow documentation](https://github.com/xamarin/xamarin-android/blob/main/Documentation/workflow/commit-messages.md), and in particular should include:
+
+- [ ] Useful description of *why the change is necessary*.
+- [ ] Links to issues fixed
+- [ ] Unit tests

.github/copilot-instructions.md

@@ -1,6 +1,6 @@
 # Instructions for AIs
 
-**.NET for Android** (formerly Xamarin.Android) - Open-source Android development bindings for .NET languages. `main` branch targets **.NET 10**.
+**.NET for Android** (formerly Xamarin.Android) - Open-source Android development bindings for .NET languages. `main` branch targets **.NET 11**.
 
 ## Architecture
 - `src/Mono.Android/` - Android SDK bindings in C#

.github/dependabot.yml

@@ -1,6 +1,10 @@
 # https://docs.github.com/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/
 version: 2
 updates:
+  - package-ecosystem: "nuget"
+    directory: "/"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gradle"
     directory: "/src/r8/"
     schedule:

.github/workflows/copilot-setup-steps.yml

@@ -6,12 +6,62 @@ jobs:
   copilot-setup-steps:
     runs-on: ubuntu-latest
     timeout-minutes: 120
+    env:
+      AndroidToolchainCacheDirectory: /mnt/android-archives
+      AndroidToolchainDirectory: /mnt/android-toolchain
+      NUGET_PACKAGES: /mnt/nuget/packages
+      NUGET_HTTP_CACHE_PATH: /mnt/nuget/v3-cache
+      NUGET_PLUGINS_CACHE_PATH: /mnt/nuget/plugins-cache
+      NUGET_SCRATCH: /mnt/nuget/scratch
 
     steps:
+    - name: Free up disk space
+      run: |
+        # Remove pre-installed Android SDK/NDK (~10GB) since we download our own specific versions
+        sudo rm -rf /usr/local/lib/android
+
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
         submodules: recursive
+        fetch-depth: 1
+
+    - name: Log disk space (after checkout)
+      uses: ./.github/workflows/log-disk-space
+
+    - name: Setup build directories on secondary disk
+      run: |
+        echo "Setting up Android toolchain on /mnt (secondary disk with 66G+ free)"
+        
+        # Create directories with sudo and set ownership
+        sudo mkdir -p /mnt/android-archives
+        sudo mkdir -p /mnt/android-toolchain
+        sudo mkdir -p /mnt/bin
+        sudo mkdir -p /mnt/gradle
+        sudo mkdir -p /mnt/nuget/packages
+        sudo mkdir -p /mnt/nuget/v3-cache
+        sudo mkdir -p /mnt/nuget/plugins-cache
+        sudo mkdir -p /mnt/nuget/scratch
+        sudo chown -R $USER:$USER /mnt/android-archives /mnt/android-toolchain /mnt/bin /mnt/gradle /mnt/nuget
+        
+        # Remove bin directory if it exists and create symlink to use the secondary disk
+        rm -rf ./bin
+        ln -s /mnt/bin ./bin
+        
+        # Move Gradle cache to secondary disk to prevent "No space left on device" during Gradle operations
+        mkdir -p /mnt/gradle
+        ln -s /mnt/gradle $HOME/.gradle
+        
+        echo "Build cache directories configured on /mnt (secondary disk):"
+        echo "  - Android toolchain: /mnt/android-toolchain"
+        echo "  - Build output: /mnt/bin"
+        echo "  - Gradle cache: /mnt/gradle"
+        echo "  - NuGet packages: /mnt/nuget/packages"
+        echo "  - NuGet HTTP cache: /mnt/nuget/v3-cache"
+        echo "  - NuGet plugins cache: /mnt/nuget/plugins-cache"
+        echo "  - NuGet scratch: /mnt/nuget/scratch"
+        ls -la /mnt
+        df -h /mnt
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
@@ -25,6 +75,11 @@ jobs:
         make jenkins PREPARE_CI=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=Debug
       timeout-minutes: 60
 
+    - name: Log disk space (after android build)
+      uses: ./.github/workflows/log-disk-space
+      with:
+        detailed: 'true'
+
     - name: Upload logs
       uses: actions/upload-artifact@v4
       if: steps.android-build.outcome == 'failure'

.github/workflows/log-disk-space/action.yml

@@ -0,0 +1,68 @@
+name: Log Disk Space
+description: Logs disk space usage on the runner
+inputs:
+  detailed:
+    description: 'Whether to include detailed disk analysis (true/false)'
+    required: false
+    default: 'false'
+runs:
+  using: composite
+  steps:
+  - name: Display disk space
+    shell: bash
+    run: |
+      MAX_LINES=20
+      
+      echo "=== Disk Space Usage ==="
+      df -h
+      echo ""
+      echo "=== Inode Usage ==="
+      df -i
+      echo ""
+      echo "=== Disk Usage Summary ==="
+      df -h / | tail -1 | awk '{print "Used: " $3 " / " $2 " (" $5 " full)"}'
+      echo ""
+      echo "=== /mnt disk info ==="
+      echo "Permissions:"
+      ls -la / | grep mnt
+      echo "Contents:"
+      ls -la /mnt 2>/dev/null || echo "/mnt is empty or not accessible"
+      echo "Disk usage:"
+      df -h /mnt
+
+      # Detailed analysis if requested
+      if [ "${{ inputs.detailed }}" = "true" ]; then
+        echo ""
+        echo "=== DETAILED ANALYSIS ==="
+        echo ""
+        echo "=== Largest directories in /home/runner ==="
+        sudo du -h /home/runner 2>/dev/null | sort -rh | head -$MAX_LINES || true
+        echo ""
+        echo "=== Largest directories in /opt ==="
+        sudo du -h /opt 2>/dev/null | sort -rh | head -$MAX_LINES || true
+        echo ""
+        echo "=== Workspace breakdown (top level) ==="
+        du -h --max-depth=1 . 2>/dev/null | sort -rh || true
+        echo ""
+        echo "=== Workspace breakdown (2 levels deep) ==="
+        du -h --max-depth=2 . 2>/dev/null | sort -rh | head -$MAX_LINES || true
+        echo ""
+        echo "=== bin directory ==="
+        du -sh ./bin/* 2>/dev/null | sort -rh | head -$MAX_LINES || echo "No bin"
+        echo ""
+        echo "=== external directory ==="
+        du -sh ./external/* 2>/dev/null | sort -rh | head -$MAX_LINES || echo "No external"
+        echo ""
+        echo "=== Android toolchain directories ==="
+        du -sh /mnt/android-archives 2>/dev/null || echo "No android-archives"
+        du -sh /mnt/android-toolchain 2>/dev/null || echo "No android-toolchain"
+        echo ""
+        echo "=== /mnt disk usage ==="
+        du -h --max-depth=1 /mnt 2>/dev/null | sort -rh || true
+        echo ""
+        echo "=== Docker usage ==="
+        docker system df 2>/dev/null || echo "Docker not available"
+        echo ""
+        echo "=== Temp directories ==="
+        du -sh /tmp /var/tmp 2>/dev/null || true
+      fi

Documentation/building/configuration.md

@@ -2,7 +2,7 @@
 - [Build Configuration](#build-configuration)
   - [Options suitable to use in builds for public use](#options-suitable-to-use-in-builds-for-public-use)
   - [Options suitable for local development](#options-suitable-for-local-development)
-    - [Native runtime (`src/monodroid`)](#native-runtime-srcmonodroid)
+    - [Native runtime (`src/native`)](#native-runtime-srcnative)
       - [Disable function inlining](#disable-function-inlining)
       - [Don't strip the runtime shared libraries](#dont-strip-the-runtime-shared-libraries)
 <!--toc:end-->
@@ -146,13 +146,13 @@ Overridable MSBuild properties include:
 
 ## Options suitable for local development
 
-### Native runtime (`src/monodroid`)
+### Native runtime (`src/native`)
 
 Note that in order for the native build settings to have full effect, one needs to make sure that
 the entire native runtime is rebuilt **and** that all `cmake` files are regenerated.  This is true
 on the very first build, but rebuilds may require forcing the entire runtime to be rebuilt.
 
-The simplest way to do it is to remove `src/monodroid/obj` and run the usual build from the
+The simplest way to do it is to remove `src/native/obj` and run the usual build from the
 repository's root directory.
 
 #### Disable function inlining
@@ -164,8 +164,8 @@ location instead of the inlined function where crash actually happened.  There a
 enable this mode of operation:
 
   1. Export the `XA_NO_INLINE` environment variable before building either the entire repository
-     or just `src/monodroid/`
-  2. Set the MSBuild property `DoNotInlineMonodroid` to `true`, when building `src/monodroid/monodroid.csproj`
+     or just `src/native/`
+  2. Set the MSBuild property `DoNotInlineMonodroid` to `true`, when building `src/native/native-*.csproj`
 
 Doing either will force all normally inlined functions to be strictly preserved and kept
 separate.  The generated code will be slower, but crash stack traces should be much more precise.
@@ -178,5 +178,5 @@ stack traces rarely point to anything more than the surrounding function name (w
 be misleading, too).  Just as for inlining, the no-strip mode can be enabled with one of two ways:
 
   1. Export the `XA_NO_STRIP` environment variable before building either the entire repository
-     or just `src/monodroid/`
-  2. Set the MSBuild property `DoNotStripMonodroid` to `true`, when building `src/monodroid/monodroid.csproj`
+     or just `src/native/`
+  2. Set the MSBuild property `DoNotStripMonodroid` to `true`, when building `src/native/native-*.csproj`

Documentation/building/unix/dependencies.md

@@ -34,7 +34,7 @@ to provide install instructions to obtain the missing dependency, e.g.:
 ## Homebrew
 
 [Homebrew](https://brew.sh) must be installed and available via `$PATH` in
-order to provision xamarin-android.
+order to provision dotnet/android.
 
 When building on Apple Silicon (arm64) machines, use the **arch**(1) command to
 allow Homebrew to be installed:
@@ -88,7 +88,7 @@ On macOS, autotools are should be used from `brew`, and may be installed via:
 
 ## Android NDK, SDK
 
-*Note*: A xamarin-android checkout maintains *its own* Android NDK + SDK
+*Note*: A dotnet/android checkout maintains *its own* Android NDK + SDK
 to ensure consistent builds and build behavior, permitting reproducible
 builds and providing greater flexibility around when we need to perform
 Android SDK + NDK updates. The Android SDK and NDK are maintained by default
@@ -101,7 +101,7 @@ via two directories in your home directory:
 
 Developers may use these directories for their own use, but *please* **DO NOT**
 update or alter the contents of the `$(AndroidToolchainDirectory)`, as that may
-prevent the xamarin-android build from working as expected.
+prevent the dotnet/android build from working as expected.
 
 The files that will be downloaded and installed are controlled by
 [build-tools/android-toolchain/android-toolchain.projitems][android-toolchain.projitems]

Documentation/building/unix/instructions.md

@@ -8,11 +8,11 @@ can also be used by setting the `$(MSBUILD)` make variable to `xbuild`.
 
  1. Install the [build dependencies](dependencies.md).
 
- 2. Clone the xamarin-android repo:
+ 2. Clone the dotnet/android repo:
 
-        git clone https://github.com/xamarin/xamarin-android.git
+        git clone https://github.com/dotnet/android.git
 
- 3. Navigate to the `xamarin-android` directory
+ 3. Navigate to the `android` directory
 
  4. (Optional) [Configure the build](../configuration.md).
 
@@ -77,7 +77,7 @@ Create a new project with `./dotnet-local.sh new android`:
 ```xml
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-android</TargetFramework>
+    <TargetFramework>net10.0-android</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 </Project>
@@ -115,7 +115,7 @@ Commercial installers will be created by this command if the
 # Running Unit Tests
 
 
-The `xamarin-android` repo contains several unit tests:
+The `dotnet/android` repo contains several unit tests:
 
   * NUnit-based unit tests, for stand-alone assemblies and utilities.
 
@@ -215,7 +215,7 @@ custom attribute -- may be executed instead of executing *all* test fixtures.
 The `RunTestApks` target accepts a `TestFixture` MSBuild property
 to specify the test fixture class to execute.
 
-If using `Xamarin.Android.NUnitLite` for projects outside the `xamarin-android`
+If using `Xamarin.Android.NUnitLite` for projects outside the `dotnet/android`
 repository, such as NUnit tests for a custom app, the `RunTestApks` target
 will not exist. In such scenarios, the [`adb shell am`][adb-shell-am]
 `instrument` command can be used instead. It follows the format: