Merge branch 'main' into native-profiling-and-debugging

* main: (94 commits) [ci] Remove remaining Classic test jobs. (dotnet#7924) Add Nightly Tests for Humanizer [readme] Add aka.ms links for d17.5. (dotnet#7935) [tests] Remove `net472` multitargeting (dotnet#7932) [monodroid] Fix `ld` build error on Nightly Builds. (dotnet#7925) Bump to xamarin/Java.Interop/main@0355acf (dotnet#7931) [tests] Use msftconnecttest.com in QuoteInvalidQuoteUrlsShouldWork (dotnet#7919) [ci] Don't set demands for megapipeline (dotnet#7929) [Mono.Android] Bind API-UpsideDownCake Developer Preview 1 (dotnet#7796) Bump to dotnet/installer@d109cba3ff 8.0.100-preview.4.23176.5 (dotnet#7921) [Xamarin.Android.Build.Tasks] Fix Android Version Code for Release builds (dotnet#7795) Bump to dotnet/installer@27d6769dfb 8.0.100-preview.4.23172.16 (dotnet#7910) [Xamarin.Android.Build.Tasks] Fix native code generation when marshal methods are disabled (dotnet#7899) [ci] Optimize 'APK's .NET' test job overhead. (dotnet#7904) [Mono.Android] delay JNINativeWrapper.get_runtime_types() (dotnet#7913) Bump external/Java.Interop from `73ebad2` to `53bfb4a` (dotnet#7914) [build] remove .NET 6 support (dotnet#7900) [profiled-aot] update `dotnet.aotprofile` for .NET 8 (dotnet#7908) [tests] Add backup ssl sites in case of 429 response. (dotnet#7909) $(AndroidPackVersionSuffix)=preview.4; net8 is 34.0.0-preview.4 (dotnet#7912) ...
grendello · Apr 6, 2023 · 82a52d2 · 82a52d2
2 parents 3fca451 + 209c8c6
commit 82a52d2
Show file tree

Hide file tree

Showing 261 changed files with 42,493 additions and 7,855 deletions.
diff --git a/.external b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:main@50faac94c6a0c27864564829ac83f3988c82f8ef
+xamarin/monodroid:main@602aca98245744882a129206b79b5a5e093dae44
 mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
diff --git a/.github/ISSUE_TEMPLATE/01-building-an-application.yml b/.github/ISSUE_TEMPLATE/01-building-an-application.yml
@@ -15,7 +15,7 @@ body:
       multiple: true
       options:
       - Classic Xamarin.Android (MonoAndroid12.0, etc.)
-      - Android for .NET (net6.0-android, etc.)
+      - .NET Android (net7.0-android, etc.)
     validations:
       required: true
   - type: input

diff --git a/.github/ISSUE_TEMPLATE/02-running-an-application.yml b/.github/ISSUE_TEMPLATE/02-running-an-application.yml
@@ -15,7 +15,7 @@ body:
       multiple: true
       options:
       - Classic Xamarin.Android (MonoAndroid12.0, etc.)
-      - Android for .NET (net6.0-android, etc.)
+      - .NET Android (net7.0-android, etc.)
     validations:
       required: true
   - type: input

diff --git a/.github/ISSUE_TEMPLATE/03-mono-android-api.yml b/.github/ISSUE_TEMPLATE/03-mono-android-api.yml
@@ -20,7 +20,7 @@ body:
       multiple: true
       options:
       - Classic Xamarin.Android (MonoAndroid12.0, etc.)
-      - Android for .NET (net6.0-android, etc.)
+      - .NET Android (net7.0-android, etc.)
     validations:
       required: true
   - type: input

diff --git a/.github/ISSUE_TEMPLATE/04-binding-a-java-library.yml b/.github/ISSUE_TEMPLATE/04-binding-a-java-library.yml
@@ -17,7 +17,7 @@ body:
       multiple: true
       options:
       - Classic Xamarin.Android (MonoAndroid12.0, etc.)
-      - Android for .NET (net6.0-android, etc.)
+      - .NET Android (net7.0-android, etc.)
     validations:
       required: true
   - type: input

diff --git a/.github/ISSUE_TEMPLATE/05-other.yml b/.github/ISSUE_TEMPLATE/05-other.yml
@@ -15,7 +15,7 @@ body:
       multiple: true
       options:
       - Classic Xamarin.Android (MonoAndroid12.0, etc.)
-      - Android for .NET (net6.0-android, etc.)
+      - .NET Android (net7.0-android, etc.)
     validations:
       required: true
   - type: input

diff --git a/.github/workflows/sdk-insertion-bump.yml b/.github/workflows/sdk-insertion-bump.yml
@@ -19,7 +19,7 @@ jobs:
         id: commit_title
         run: |
           Write-Host "Commit message is $Env:COMMIT_MESSAGE"
-          $title = ($Env:COMMIT_MESSAGE -split '\n')[0]
+          $title = ($Env:COMMIT_MESSAGE -split '\n')[0] | ConvertTo-Json
           "COMMIT_TITLE=$title" >> $env:GITHUB_OUTPUT
         env:
           COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
@@ -30,6 +30,6 @@ jobs:
           token: ${{ secrets.SERVICEACCOUNT_PAT }}
           event-type: 'sdk_insertion' 
           repository: 'xamarin/sdk-insertions'
-          client-payload: '{"repository": "xamarin/xamarin-android", "branch": "${{ github.ref_name }}", "commit": "${{ github.sha }}", "commit_message": "${{ steps.commit_title.outputs.COMMIT_TITLE }}"}'
+          client-payload: '{"repository": "xamarin/xamarin-android", "branch": "${{ github.ref_name }}", "commit": "${{ github.sha }}", "commit_message": ${{ steps.commit_title.outputs.COMMIT_TITLE }} }'
 
 
diff --git a/.lgtm.yml b/.lgtm.yml
@@ -0,0 +1,2 @@
+queries:
+  - exclude: cs/campaign/constantine
diff --git a/Configuration.props b/Configuration.props
@@ -21,22 +21,17 @@
     <_StandardLibraryPath Condition=" '$(TargetFrameworkVersion)' == '' ">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPathToStandardLibraries('.NETFramework', 'v4.7.2', ''))</_StandardLibraryPath>
     <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' And '$(UsingMicrosoftNETSdk)' != 'true' And '$(_StandardLibraryPath)' != '' ">v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' And '$(UsingMicrosoftNETSdk)' != 'true' ">v4.7.1</TargetFrameworkVersion>
-    <!-- Used by the `build-tools/create-vsix` build so that `Mono.Android.Export.dll`/etc. are only included *once* -->
-    <!-- Should correspond to the first value from `$(API_LEVELS)` in `build-tools/api-xml-adjuster/Makefile` -->
-    <AndroidFirstFrameworkVersion Condition="'$(AndroidFirstFrameworkVersion)' == ''">v4.4</AndroidFirstFrameworkVersion>
-    <AndroidFirstApiLevel Condition="'$(AndroidFirstApiLevel)' == ''">19</AndroidFirstApiLevel>
     <AndroidJavaRuntimeApiLevel Condition="'$(AndroidJavaRuntimeApiLevel)' == ''">26</AndroidJavaRuntimeApiLevel>
     <!-- The min API level supported by Microsoft.Android.Sdk, should refactor/remove when this value is the same as $(AndroidFirstApiLevel) -->
     <AndroidMinimumDotNetApiLevel Condition="'$(AndroidMinimumDotNetApiLevel)' == ''">21</AndroidMinimumDotNetApiLevel>
-    <AndroidFirstPlatformId Condition="'$(AndroidFirstPlatformId)' == ''">$(AndroidFirstApiLevel)</AndroidFirstPlatformId>
     <!-- *Latest* *stable* API level binding that we support; used when building src/Xamarin.Android.Build.Tasks -->
     <AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">33</AndroidLatestStableApiLevel>
     <AndroidLatestStablePlatformId Condition="'$(AndroidLatestStablePlatformId)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestStablePlatformId>
     <AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v13.0</AndroidLatestStableFrameworkVersion>
     <!-- *Latest* *unstable* API level binding that we support; this can be the same as *stable* -->
-    <AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestUnstableApiLevel>
-    <AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">Tiramisu</AndroidLatestUnstablePlatformId>
-    <AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v13.0</AndroidLatestUnstableFrameworkVersion>
+    <AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">34</AndroidLatestUnstableApiLevel>
+    <AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">UpsideDownCake</AndroidLatestUnstablePlatformId>
+    <AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v13.0.99</AndroidLatestUnstableFrameworkVersion>
     <!-- The default API level used for $(TargetPlatformVersion) -->
     <AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">33</AndroidDefaultTargetDotnetApiLevel>
     <!-- The API level and TargetFrameworkVersion for the default Mono.Android.dll build -->
@@ -47,8 +42,7 @@
     <DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
     <Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
     <LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
-    <AndroidNet7Version Condition=" '$(AndroidNet7Version)' == '' ">33.0.26</AndroidNet7Version>
-    <AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.485</AndroidNet6Version>
+    <AndroidNet7Version Condition=" '$(AndroidNet7Version)' == '' ">33.0.46</AndroidNet7Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(HostOS)' == '' ">
     <HostOS Condition="$([MSBuild]::IsOSPlatform('windows'))">Windows</HostOS>
@@ -114,8 +108,8 @@
     <AndroidSupportedTargetJitAbis Condition=" '$(AndroidSupportedTargetJitAbis)' == '' ">armeabi-v7a:arm64-v8a:x86:x86_64</AndroidSupportedTargetJitAbis>
     <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
     <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
-    <MonoDarwinPackageUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/151/c633fe923832f0c3db3c4e6aa98e5592bf5a06e7/MonoFramework-MDK-6.12.0.145.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
-    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.12.0.145</MonoRequiredMinimumVersion>
+    <MonoDarwinPackageUrl>https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.188.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
+    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.12.0.188</MonoRequiredMinimumVersion>
     <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">$(MonoRequiredMinimumVersion)</MonoRequiredMaximumVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' And '$(RunningOnCI)' == 'true' ">False</IgnoreMaxMonoVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
@@ -160,8 +154,7 @@
     <PathSeparator>$([System.IO.Path]::PathSeparator)</PathSeparator>
     <_TestsAotName Condition=" '$(AotAssemblies)' == 'true' ">-Aot</_TestsAotName>
     <_TestsProfiledAotName Condition=" '$(AndroidEnableProfiledAot)' == 'true' ">-Profiled</_TestsProfiledAotName>
-    <_TestsBundleName Condition=" '$(BundleAssemblies)' == 'true' ">-Bundle</_TestsBundleName>
-    <TestsFlavor>$(_TestsProfiledAotName)$(_TestsAotName)$(_TestsBundleName)</TestsFlavor>
+    <TestsFlavor>$(_TestsProfiledAotName)$(_TestsAotName)</TestsFlavor>
   </PropertyGroup>
   <PropertyGroup>
     <MingwCommandPrefix32>i686-w64-mingw32</MingwCommandPrefix32>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -35,12 +35,12 @@
          * Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
     -->
     <AndroidPackVersion>34.0.0</AndroidPackVersion>
-    <AndroidPackVersionSuffix>preview.1</AndroidPackVersionSuffix>
+    <AndroidPackVersionSuffix>preview.4</AndroidPackVersionSuffix>
   </PropertyGroup>
 
   <!-- Common <PackageReference/> versions -->
   <PropertyGroup>
-    <LibZipSharpVersion>2.0.7</LibZipSharpVersion>
+    <LibZipSharpVersion>2.1.0</LibZipSharpVersion>
     <MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
     <MonoCecilVersion>0.11.4</MonoCecilVersion>
     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
@@ -50,22 +50,8 @@
     <SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
     <ELFSharpVersion>2.13.1</ELFSharpVersion>
+    <HumanizerVersion>2.14.1</HumanizerVersion>
     <MdocPackageVersion Condition=" '$(MdocPackageVersion)' == '' ">5.8.9.2</MdocPackageVersion>
   </PropertyGroup>
 
-  <!-- Properties to help us run managed assemblies on various runtimes.
-       Ex:
-       * Mono: mono xaprepare.exe
-       * Windows .NET: xaprepare.exe
-       * dotnet: dotnet xaprepare.dll
--->
-  <PropertyGroup Condition=" '$(MSBuildRuntimeType)' != 'Core' ">
-    <ManagedToolInvocationRuntime>$(Runtime) </ManagedToolInvocationRuntime>
-    <ManagedToolInvocationExtension>.exe</ManagedToolInvocationExtension>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(MSBuildRuntimeType)' == 'Core' ">
-    <ManagedToolInvocationRuntime>dotnet </ManagedToolInvocationRuntime>
-    <ManagedToolInvocationExtension>.dll</ManagedToolInvocationExtension>
-  </PropertyGroup>
 </Project>
diff --git a/Documentation/building/configuration.md b/Documentation/building/configuration.md
@@ -27,11 +27,6 @@ Overridable MSBuild properties include:
     This is an integer value, e.g. `15` for
     [API-15 (Android 4.0.3)](http://developer.android.com/about/versions/android-4.0.3.html).
 
-  * `$(AndroidFirstFrameworkVersion)`: The first `$(TargetFrameworkVersion)`
-    which will be built by `make jenkins` and included in the installer.
-    Currently `v4.4`.
-    This controls what is included in `build-tools/create-vsix` packages.
-
   * `$(AndroidFrameworkVersion)`: The Xamarin.Android `$(TargetFrameworkVersion)`
     version which corresponds to `$(AndroidApiLevel)`. This is *usually* the
     Android version number with a leading `v`, e.g. `v4.0.3` for API-15.

diff --git a/Documentation/guides/messages/README.md b/Documentation/guides/messages/README.md
@@ -30,6 +30,7 @@ ms.date: 01/24/2020
 + APT0002: Invalid file name: It must contain only \[^a-zA-Z0-9_.-\]+.
 + APT0003: Invalid file name: It must contain only \[^a-zA-Z0-9_.\]+.
 + APT0004: Invalid file name: It must start with either A-Z or a-z or an underscore.
++ [APT2264](apt2264.md): The system cannot find the file specified. (2).
 
 ## JAVAxxxx: Java Tool
 
@@ -133,6 +134,7 @@ or 'Help->Report a Problem' in Visual Studio for Mac.
 + [XA1031](xa1031.md): The 'AndroidHttpClientHandlerType' has an invalid value.
 + [XA1032](xa1032.md):Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.
 + [XA1033](xa1033.md): Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.
++ [XA1035](xa1035.md): The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.
 
 ## XA2xxx: Linker
 

diff --git a/Documentation/guides/messages/apt2264.md b/Documentation/guides/messages/apt2264.md
@@ -0,0 +1,58 @@
+---
+title: Xamarin.Android error APT2264
+description: APT2264 error code
+ms.date: 12/16/2022
+---
+# Xamarin.Android error APT2264
+
+## Issue
+
+The tool `aapt2` is unable to resolve one of the files it was passed.
+This is generally caused by the path being longer than the Maximum Path
+length allowed on windows.
+
+## Solution
+
+The best way to avoid this is to ensure that your project is not located
+deep in the folder structure. For example if you create all of your
+projects in folders such as
+
+`C:\Users\shelly\Visual Studio\Android\MyProjects\Com.SomeReallyLongCompanyName.MyBrillantApplication\MyBrilliantApplicaiton.Android\`
+
+you may well encounter problems with not only `aapt2` but also Ahead of Time
+compilation. Keeping your project names and folder structures short and
+concise will help work around these issues. For example instead of the above
+you could use
+
+`C:\Work\Android\MyBrilliantApp`
+
+Which is much shorter and much less likely to encounter path issues.
+
+However this is no always possible. Sometimes a project or a environment requires
+deep folder structures. In this case enabling long path support in Windows *might*
+be enough to get your project working. Details on how to do this can be found
+[here](https://learn.microsoft.com/windows/win32/fileio/maximum-file-path-limitation?tabs=registry#enable-long-paths-in-windows-10-version-1607-and-later).
+
+
+If long path support does not work changing the location of the
+`$(BaseIntermediateOutputPath)` can help solve these problems. In order for this
+to work the setting MUST be changed before ANY build or restore occurs. To do this
+you can make use of the MSBuild `Directory.Build.props` support.
+
+Creating a `Directory.Build.props` file in your solution or project directory which
+redefines the `$(BaseIntermediateOutputPath)` to somewhere nearer the root of the drive
+with solve these issues. Adding a file with the following contents will create the `obj`
+directory in a different location of your choosing.
+
+```
+<Project>
+  <PropertyGroup>
+      <BaseIntermediateOutputPath Condition=" '$(OS)' == 'Windows_NT' ">C:\Intermediate\$(ProjectName)</BaseIntermediateOutputPath>
+      <BaseIntermediateOutputPath Condition=" '$(OS)' != 'Windows_NT' ">/tmp/Intermediate/$(ProjectName)</BaseIntermediateOutputPath>
+  </PropertyGroup>
+</Project
+```
+
+Using this technique will reduce the lengths of the paths sent to the various tools like `aapt2`.
+Note this is generally only a Windows issue. So there is no need to override the `$(BaseIntermediateOutputPath)`
+on Mac or Linux based environments. However you might want to override everywhere to be consistent.
diff --git a/Documentation/guides/messages/xa1035.md b/Documentation/guides/messages/xa1035.md
@@ -0,0 +1,19 @@
+---
+title: Xamarin.Android warning XA1035
+description: XA1034 warning code
+ms.date: 13/12/2022
+---
+# Xamarin.Android warning XA1035
+
+## Example messages
+
+```
+The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.
+```
+
+## Solution
+
+Edit your csproj directly and remove the 'BundleAssemblies' property.
+`AndroidUseAssemblyStore` and `AndroidEnableAssemblyCompression` are
+both enabled by default and, together, they implement behavior
+equivalent to that of `BundleAssemblies`.
diff --git a/Documentation/guides/tracing.md b/Documentation/guides/tracing.md
@@ -98,6 +98,86 @@ And the output files should be found in the current directory. You can
 use the `-o` switch if you would prefer to output them to a specific
 directory.
 
+## How to get GC memory dumps?
+
+If running on desktop, you can use the `dotnet-gcdump` global tool.
+This can be installed via:
+
+```dotnetcli
+$ dotnet tool install --global dotnet-gcdump
+```
+
+To use it, for example:
+
+```sh
+# `hw-readline` is a standard Hello World, with a `Console.ReadLine()` at the end
+$ dotnet run --project hw-readline.csproj
+Hello, World!
+Press <ENTER> to continue
+
+# Then from another shell...
+
+# Determine which process ID to dump
+$ ps | grep 'dotnet.*hw-re'
+33972 ttys049    0:01.86 dotnet run --project hw-readline.csproj
+33977 ttys050    0:00.00 grep dotnet.*hw-re
+
+# Collect the GC info
+$ dotnet gcdump collect --process-id 33972
+Writing gcdump to '.../hw-readline/20230314_113922_33972.gcdump'...
+	Finished writing 5624131 bytes.
+```
+See the [`dotnet-gcdump` documentation][dotnet-gcdump]
+for further details about its usage.
+
+This will connect to a process and save a `*.gcdump` file. You can
+open this file in Visual Studio on Windows, for example:
+
+![Visual Studio GC Heap Dump](../images/VS-GC-Dump.png)
+
+To get this data from an Android application, you need all the above
+setup for `adb shell`, `dsrouter`, etc. except you need to change the
+provider for `dotnet-trace`:
+
+```sh
+$  dotnet-trace collect --diagnostic-port /tmp/maui-app --providers Microsoft-DotNETRuntimeMonoProfiler:0xC900001:4
+```
+
+`0xC900001`, a bitmask, enables the following event types:
+
+* `GCKeyword`
+* `GCHeapCollectKeyword`
+* `GCRootKeyword`
+
+See the [`Microsoft-DotNETRuntimeMonoProfiler` event types][mono-events] for more info.
+
+`:4` enables "Informational" verbosity, where the different logging
+levels are described by [`dotnet-trace help` output][dotnet-trace-help].
+
+This saves a `.nettrace` file with GC events that are not available
+with the default provider.
+
+To actually view this data, you'll have to use one of:
+
+* https://github.com/lateralusX/diagnostics-nettrace-samples
+* https://github.com/filipnavara/mono-gcdump
+
+Using `mono-gcdump`:
+
+```sh
+$ dotnet run --project path/to/filipnavara/mono-gcdump/mono-gcdump.csproj -- convert foo.nettrace
+```
+
+This saves a `foo.gcdump` that you can open in Visual Studio.
+
+See the [dotnet/runtime documentation][gc-dumps-on-mono] for
+additional details.
+
+[dotnet-gcdump]: https://learn.microsoft.com/dotnet/core/diagnostics/dotnet-gcdump
+[mono-events]: https://github.com/dotnet/runtime/blob/c887c92d8af4ce65b19962b777f96ae8eb997a42/src/coreclr/vm/ClrEtwAll.man#L7433-L7468
+[dotnet-trace-help]: https://github.com/dotnet/diagnostics/blob/6d755e8b5435b1380c118e9d81e075654b0330c9/documentation/dotnet-trace-instructions.md#dotnet-trace-help
+[gc-dumps-on-mono]: https://github.com/dotnet/runtime/blob/728fd85bc7ad04f5a0ea2ad0d4d8afe371ff9b64/docs/design/mono/diagnostics-tracing.md#collect-gc-dumps-on-monovm
+
 ## How to `dotnet trace` our build?
 
 Setting this up is easy, the main issue is there end up being

diff --git a/Documentation/images/VS-GC-Dump.png b/Documentation/images/VS-GC-Dump.png
diff --git a/Documentation/previous-releases.md b/Documentation/previous-releases.md
@@ -3,6 +3,8 @@ Xamarin.Android Previous Releases
 
 | Platform        | Link   |
 |-----------------|--------|
+| **Commercial Xamarin.Android 13.1 (d17-4)** for Windows+Visual Studio 2022                  | [Download][commercial-d17-4-Windows-x86_64] |
+| **Commercial Xamarin.Android 13.1 (d17-4)** for macOS                                       | [Download][commercial-d17-4-macOS-x86_64]   |
 | **Commercial Xamarin.Android 13.0 (d17-3)** for Windows+Visual Studio 2022                  | [Download][commercial-d17-3-Windows-x86_64] |
 | **Commercial Xamarin.Android 13.0 (d17-3)** for macOS                                       | [Download][commercial-d17-3-macOS-x86_64]   |
 | **Commercial Xamarin.Android 12.3 (d17-2)** for Windows+Visual Studio 2022                  | [Download][commercial-d17-2-Windows-x86_64] |
@@ -66,3 +68,5 @@ Xamarin.Android Previous Releases
 [commercial-d17-2-macOS-x86_64]:          https://aka.ms/xamarin-android-commercial-d17-2-macos
 [commercial-d17-3-Windows-x86_64]:        https://aka.ms/xamarin-android-commercial-d17-3-windows
 [commercial-d17-3-macOS-x86_64]:          https://aka.ms/xamarin-android-commercial-d17-3-macos
+[commercial-d17-4-Windows-x86_64]:        https://aka.ms/xamarin-android-commercial-d17-4-windows
+[commercial-d17-4-macOS-x86_64]:          https://aka.ms/xamarin-android-commercial-d17-4-macos