Merge remote-tracking branch 'origin/main' into dev/jonp/jonp-try-ji-1323

Author: jonpryor

.github/CODEOWNERS

@@ -29,7 +29,7 @@
 
 /src/Mono.Android.Export @jonpryor
 /src/r8 @jonathanpeppers @jonpryor
-/src/Xamarin.Android.Build.Tasks @dellis1972 @jonathanpeppers
+/src/Xamarin.Android.Build.Tasks @jonathanpeppers
 /src/Xamarin.Android.Build.Tasks/Linker @jonpryor
 /src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator @grendello
 /src/Xamarin.Android.Build.Tasks/Utilities/TypeMap* @grendello

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

@@ -1,7 +1,7 @@
 name: 🛠 Building an Application
 description: Issues trying to compile or package your application.
 labels: ["Area: App+Library Build", "needs-triage"]
-assignees: ["jonathanpeppers", "dellis1972"]
+assignees: ["jonathanpeppers"]
 body:
   - type: markdown
     attributes:

.github/dependabot.yml

@@ -15,7 +15,6 @@ updates:
       interval: "daily"
     ignore:
       - dependency-name: "external/constexpr-xxh3"
-      - dependency-name: "external/debugger-libs"
       - dependency-name: "external/lz4"
       - dependency-name: "external/robin-map"
       - dependency-name: "external/xxHash"

.gitignore

@@ -31,3 +31,9 @@ Novell
 *.patch
 *.keystore
 /omnisharp.json
+src/native/CMakePresets.json
+src/native/clr/host/generate-pinvoke-tables
+src/native/clr/host/pinvoke-tables.include.generated
+src/native/mono/pinvoke-override/generate-pinvoke-tables
+src/native/mono/pinvoke-override/pinvoke-tables.include.generated
+dotnet-install.ps1

Configuration.props

@@ -132,6 +132,7 @@
     <TestsFlavor>$(_TestsProfiledAotName)$(_TestsAotName)</TestsFlavor>
   </PropertyGroup>
   <PropertyGroup>
+    <!-- Default to Java 17 for desktop, projects targeting Android should use 1.8 -->
     <JavacSourceVersion>17</JavacSourceVersion>
     <JavacTargetVersion>17</JavacTargetVersion>
   </PropertyGroup>
@@ -227,6 +228,10 @@
         AndroidRuntime="CoreCLR" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <_RuntimeRedistDirName>redist</_RuntimeRedistDirName>
+  </PropertyGroup>
+
   <!-- Whenever there's a need to use a locally built CoreCLR, both .NET for Android and the
        application(s) must be built with the same runtime. CLRLocalRuntimePath must point to the CoreCLR
        artifact directory in its repository checkout:

Directory.Build.props

@@ -36,7 +36,7 @@
          * Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
     -->
     <AndroidPackVersion>36.0.0</AndroidPackVersion>
-    <AndroidPackVersionSuffix>preview.4</AndroidPackVersionSuffix>
+    <AndroidPackVersionSuffix>preview.5</AndroidPackVersionSuffix>
     <!-- Final value set by GetXAVersionInfo target -->
     <IsStableBuild>false</IsStableBuild>
   </PropertyGroup>
@@ -64,8 +64,6 @@
       
       This can be opted into locally with $(_AndroidTreatWarningsAsErrors) = true.
     -->
-    <_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'assembly-store-reader.csproj' ">true</_AllowProjectWarnings>
-    <_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'decompress-assemblies.csproj' ">true</_AllowProjectWarnings>
     <_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'jnienv-gen.csproj' ">true</_AllowProjectWarnings>
     <_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Microsoft.Android.Sdk.ILLink.csproj' ">true</_AllowProjectWarnings>
     <_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Microsoft.Android.Templates.csproj' ">true</_AllowProjectWarnings>

Documentation/guides/tracing.md

@@ -22,6 +22,13 @@ together to make this happen:
 * The Mono Diagnostic component, `libmono-component-diagnostics_tracing.so`,
   is included in the application and is used to collect the trace data.
 
+> **NOTE:** You need at least version 9.0.621003 of all the diagnostic
+> tools to use the features described in this guide. Check
+> [dotnet-trace](https://www.nuget.org/packages/dotnet-trace/),
+> [dotnet-dsrouter](https://www.nuget.org/packages/dotnet-dsrouter/),
+> and [dotnet-gcdump](https://www.nuget.org/packages/dotnet-gcdump/)
+> on NuGet for the latest versions.
+
 See the [`dotnet-trace` documentation][dotnet-trace] for further details about its usage.
 
 [dotnet-trace]: https://learn.microsoft.com/dotnet/core/diagnostics/dotnet-trace
@@ -48,14 +55,61 @@ You can also install prerelease builds from the nightly feed
 `https://aka.ms/dotnet-tools/index.json`:
 
 ```sh
-$ dotnet tool install -g dotnet-dsrouter --add-source=https://aka.ms/dotnet-tools/index.json --prerelease
-You can invoke the tool using the following command: dotnet-dsrouter
-Tool 'dotnet-dsrouter' was successfully installed.
+$ dotnet tool install -g dotnet-trace --add-source=https://aka.ms/dotnet-tools/index.json --prerelease
+You can invoke the tool using the following command: dotnet-trace
+Tool 'dotnet-trace' was successfully installed.
 ```
 
 ## Configuration & Setup
 
-### Running `dotnet-dsrouter` on the Host
+### Using `dotnet-trace` with the `--dsrouter` option
+
+Starting with version 9.0.621003, `dotnet-trace` includes a
+`--dsrouter` option that eliminates the need to run `dotnet-dsrouter`
+separately. This simplifies the workflow significantly.
+
+For Android emulators:
+
+```sh
+$ dotnet-trace collect --dsrouter android-emu --format speedscope
+WARNING: dotnet-dsrouter is a development tool not intended for production environments.
+For finer control over the dotnet-dsrouter options, run it separately and connect to it using -p
+
+No profile or providers specified, defaulting to trace profile 'cpu-sampling'
+
+Provider Name                           Keywords            Level               Enabled By
+Microsoft-DotNETCore-SampleProfiler     0x0000F00000000000  Informational(4)    --profile
+Microsoft-Windows-DotNETRuntime         0x00000014C14FCCBD  Informational(4)    --profile
+```
+
+For Android devices:
+
+```sh
+# `adb reverse` is still required when using hardware devices
+$ adb reverse tcp:9000 tcp:9001
+$ dotnet-trace collect --dsrouter android --format speedscope
+WARNING: dotnet-dsrouter is a development tool not intended for production environments.
+For finer control over the dotnet-dsrouter options, run it separately and connect to it using -p
+
+No profile or providers specified, defaulting to trace profile 'cpu-sampling'
+
+Provider Name                           Keywords            Level               Enabled By
+Microsoft-DotNETCore-SampleProfiler     0x0000F00000000000  Informational(4)    --profile
+Microsoft-Windows-DotNETRuntime         0x00000014C14FCCBD  Informational(4)    --profile
+```
+
+The `--format` argument is optional and it defaults to `nettrace`.
+However, `nettrace` files can be viewed only with Perfview or Visual
+Studio on Windows, while the speedscope JSON files can be viewed "on"
+Unix by opening them with [https://speedscope.app/][speedscope].
+
+[speedscope]: https://speedscope.app/
+
+### Running `dotnet-dsrouter` Separately
+
+> **NOTE:** The following section describes the approach before
+> `dotnet-trace` 9.0.621003. Running `dotnet-dsrouter` separately can
+> be useful for viewing its log messages when troubleshooting.
 
 For profiling an Android application running on an Android *emulator*:
 
@@ -157,9 +211,7 @@ Start an application with the following environment variable: DOTNET_DiagnosticP
 The `--format` argument is optional and it defaults to `nettrace`.
 However, `nettrace` files can be viewed only with Perfview or Visual
 Studio on Windows, while the speedscope JSON files can be viewed "on"
-Unix by uploading them to [https://speedscope.app/][speedscope].
-
-[speedscope]: https://speedscope.app/
+Unix by opening them with [https://speedscope.app/][speedscope].
 
 ### Running the .NET for Android Application
 

NuGet.config

@@ -4,8 +4,6 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-android -->
-    <add key="darc-pub-dotnet-android-e7876a4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-e7876a4f/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-android-82d8938" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-82d8938c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-android -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- ensure only the sources defined below are used -->
@@ -20,9 +18,11 @@
     <!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
     <!-- Android binary, to support delta APK install -->
     <add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
-    <!-- Added manually for dotnet/runtime 8.0.11 -->
-    <add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-runtime-ef07c4f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ef07c4f2/nuget/v3/index.json" />
+    <!-- Added manually for dotnet/runtime 9.0.5 -->
+    <add key="darc-pub-dotnet-emsdk-3cddc1f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3cddc1fe/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-207cda3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-207cda34/nuget/v3/index.json" />
+    <!-- Added manually for dotnet/runtime 8.0.16 -->
+    <add key="darc-pub-dotnet-runtime-6cd8ef8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>

build-tools/automation/azure-pipelines-nightly.yaml

@@ -115,7 +115,7 @@ stages:
           avdAbi: x86_64
           avdType: google_apis
     pool:
-      vmImage: $(HostedMacImage)
+      vmImage: $(HostedMacImageWithEmulator)
     workspace:
       clean: all
     steps:

build-tools/automation/azure-pipelines.yaml

@@ -137,8 +137,8 @@ extends:
           parameters:
             xaSourcePath: $(Build.SourcesDirectory)/android
             androidSdkPlatforms: $(DefaultTestSdkPlatforms)
-            dotnetVersion: 9.0
-            dotnetQuality: preview
+            dotnetVersion: $(DotNetPreviewSdkVersion)
+            dotnetQuality: $(DotNetPreviewSdkQuality)
 
         - task: NuGetAuthenticate@1
           displayName: authenticate with azure artifacts
@@ -230,6 +230,7 @@ extends:
           condition: always()
           inputs:
             Contents: |
+              $(Build.SourcesDirectory)/android/bin/*$(XA.Build.Configuration)/*.*log
               $(Build.SourcesDirectory)/maui/artifacts/logs/**
             TargetFolder: $(Build.StagingDirectory)/logs
             flattenFolders: true
@@ -346,11 +347,10 @@ extends:
           clean: true
           submodules: recursive
 
-        - task: UseDotNet@2
-          displayName: Install .NET 9.x
-          inputs:
-            version: 9.x
-            includePreviewVersions: true
+        - template: /build-tools/automation/yaml-templates/use-dot-net.yaml@self
+          parameters:
+            version: $(DotNetPreviewSdkVersion)
+            quality: $(DotNetPreviewSdkQuality)
 
         # Download symbols to be published to the symbols artifact drop declared above
         - task: DownloadPipelineArtifact@2

build-tools/automation/yaml-templates/commercial-build.yaml

@@ -92,7 +92,7 @@ steps:
   - task: PublishPipelineArtifact@1
     displayName: upload symbols nupkgs
     inputs:
-      artifactName: ${{ parameters.nugetArtifactName }}
+      artifactName: ${{ parameters.nugetArtifactName }}-symbols
       targetPath: ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned-symbols
 
   - task: PublishPipelineArtifact@1

build-tools/automation/yaml-templates/fail-on-dirty-tree.yaml

@@ -9,14 +9,14 @@ steps:
     # Run this to log the output for the user
     git status
 
-    # Run this to error the build if untracked files
-    $process= git status --porcelain --untracked-files=no
+    # Run this to error the build if modified/untracked files exist
+    $process= git status --porcelain
 
     if ($process)
     {
-        Write-Host "##vso[task.logissue type=error]git tree has modified tracked files."
+        Write-Host "##vso[task.logissue type=error]git tree has modified or untracked files."
         Write-Host "##vso[task.complete result=Failed;]"
     }
-  displayName: Ensure no modified committed files
+  displayName: Ensure no modified/untracked files
   workingDirectory: ${{ parameters.xaSourcePath }}
   condition: ${{ parameters.condition }}

build-tools/automation/yaml-templates/setup-test-environment.yaml

@@ -75,6 +75,7 @@ steps:
 - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
   parameters:
     displayName: extract workload packs
+    xaSourcePath: ${{ parameters.xaSourcePath }}
     project: ${{ parameters.xaSourcePath }}/build-tools/create-packs/Microsoft.Android.Sdk.proj
     arguments: -t:ExtractWorkloadPacks -c ${{ parameters.configuration }} -v:n -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/extract-workloads.binlog
 

build-tools/automation/yaml-templates/stage-package-tests.yaml

@@ -198,6 +198,26 @@ stages:
         artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
         artifactFolder: $(DotNetTargetFramework)-AotLlvm
 
+    - template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
+      parameters:
+        configuration: $(XA.Build.Configuration)
+        testName: Mono.Android.NET_Tests-CoreCLR
+        project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+        testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)CoreCLR.xml
+        extraBuildArgs: -p:TestsFlavor=CoreCLR -p:UseMonoRuntime=false -p:AndroidEnableMarshalMethods=false
+        artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
+        artifactFolder: $(DotNetTargetFramework)-CoreCLR
+
+    - template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
+      parameters:
+        configuration: $(XA.Build.Configuration)
+        testName: Mono.Android.NET_Tests-NativeAOT
+        project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+        testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)NativeAOT.xml
+        extraBuildArgs: -p:TestsFlavor=NativeAOT -p:PublishAot=true
+        artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
+        artifactFolder: $(DotNetTargetFramework)-NativeAOT
+
     - template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
       parameters:
         configuration: $(XA.Build.Configuration)

build-tools/automation/yaml-templates/start-stop-emulator.yaml

@@ -18,6 +18,7 @@ steps:
       displayName: Start emulator
       continueOnError: ${{ parameters.startContinueOnError }}
       taskTimeoutInMinutes: ${{ parameters.taskTimeoutInMinutes }}
+      xaSourcePath: ${{ parameters.xaSourcePath }}
       project: ${{ parameters.xaSourcePath }}/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Emulator.csproj
       ${{ if eq(parameters.specificImage, true) }}:
         arguments: >-
@@ -43,6 +44,7 @@ steps:
       condition: always()
       continueOnError: true
       taskTimeoutInMinutes: ${{ parameters.taskTimeoutInMinutes }}
+      xaSourcePath: ${{ parameters.xaSourcePath }}
       project: ${{ parameters.xaSourcePath }}/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Emulator.csproj
       ${{ if eq(parameters.specificImage, true) }}:
         arguments: >-

build-tools/automation/yaml-templates/variables.yaml

@@ -27,6 +27,10 @@ variables:
   value: 9.0
 - name: DotNetSdkQuality
   value: GA
+- name: DotNetPreviewSdkVersion
+  value: 10.0
+- name: DotNetPreviewSdkQuality
+  value: preview
 - name: GitHub.Token
   value: $(github--pat--vs-mobiletools-engineering-service2)
 - name: HostedMacImage
@@ -36,7 +40,7 @@ variables:
 - name: SharedMacPool
   value: VSEng-VSMac-Xamarin-Shared
 - name: SharedMacName
-  value: Sonoma
+  value: Sequoia
 - name: SharedMacArch
   value: arm64
 - name: HostedWinImage

build-tools/create-packs/ConfigureLocalWorkload.targets

@@ -16,14 +16,16 @@
       <_RuntimeListOutputs Include="$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.%(AndroidAbiAndRuntimeFlavor.AndroidRuntime).$(AndroidDefaultTargetDotnetApiLevel).%(AndroidAbiAndRuntimeFlavor.AndroidRID)\$(AndroidPackVersion)\data\RuntimeList.xml" AndroidRID="%(AndroidAbiAndRuntimeFlavor.AndroidRID)" AndroidRuntime="%(AndroidAbiAndRuntimeFlavor.AndroidRuntime)" />
       <_RuntimeListOutputs Include="$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.%(AndroidAbiAndRuntimeFlavor.AndroidRuntime).$(AndroidLatestStableApiLevel).%(AndroidAbiAndRuntimeFlavor.AndroidRID)\$(AndroidPackVersion)\data\RuntimeList.xml" AndroidRID="%(AndroidAbiAndRuntimeFlavor.AndroidRID)" AndroidRuntime="%(AndroidAbiAndRuntimeFlavor.AndroidRuntime)" />
       <_RuntimeListOutputs Include="$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.%(AndroidAbiAndRuntimeFlavor.AndroidRuntime).$(AndroidLatestUnstableApiLevel).%(AndroidAbiAndRuntimeFlavor.AndroidRID)\$(AndroidPackVersion)\data\RuntimeList.xml" AndroidRID="%(AndroidAbiAndRuntimeFlavor.AndroidRID)" AndroidRuntime="%(AndroidAbiAndRuntimeFlavor.AndroidRuntime)" />
+      <_ManagedRuntimeListOutputs Include="$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.$(AndroidApiLevel).android\$(AndroidPackVersion)\data\RuntimeList.xml" />
     </ItemGroup>
   </Target>
 
   <Target Name="CreateLocalRuntimeLists"
       DependsOnTargets="_CreateLocalRuntimeListsInputs"
       Inputs="$(MSBuildAllProjects);@(_RuntimeListInputs)"
-      Outputs="@(_RuntimeListOutputs)">
+      Outputs="@(_RuntimeListOutputs);@(_ManagedRuntimeListOutputs)">
     <Exec Command="&quot;$(DotNetPreviewTool)&quot; build -t:_GenerateFrameworkList -p:IntermediateOutputPath=%(_RuntimeListOutputs.RelativeDir) -p:AndroidRID=%(_RuntimeListOutputs.AndroidRID) -p:AndroidRuntime=%(_RuntimeListOutputs.AndroidRuntime) -p:Configuration=$(Configuration) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
+    <Exec Command="&quot;$(DotNetPreviewTool)&quot; build -t:_GenerateFrameworkList -p:IntermediateOutputPath=%(_ManagedRuntimeListOutputs.RelativeDir) -p:Configuration=$(Configuration) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.Managed.proj&quot;" />
   </Target>
 
   <Target Name="CreateLocalFrameworkLists"