Merge branch 'main' into maui-perf

* main: (38 commits) Bump to dotnet/installer@2809943e7a 8.0.100-rc.2.23431.5 (dotnet#8317) [build] Use Microsoft OpenJDK 17.0.8 (dotnet#8309) [Mono.Android] Add missing `[Flags]` attribute for generated enums. (dotnet#8310) Bump to dotnet/installer@c5e45fd659 8.0.100-rc.2.23427.4 (dotnet#8305) [xaprepare] Improve dotnet-install script logging (dotnet#8312) [xaprepare] Fix dotnet-install script size check (dotnet#8311) [Xamarin.Android.Build.Tasks] improve net6.0 "out of support" message (dotnet#8307) [monodroid] Fix the EnableNativeAnalyzers build (dotnet#8293) Bump to dotnet/installer@56d8c6497c 8.0.100-rc.2.23422.31 (dotnet#8291) [Xamarin.Android.Build.Tasks] Fix APT2264 error on Windows. (dotnet#8289) [Mono.Android] Marshal .NET stack trace to Throwable.getStackTrace() (dotnet#8185) [tests] Skip sign check when installing MAUI (dotnet#8288) Bump to xamarin/monodroid@057b17fe (dotnet#8286) [Xamarin.Android.Build.Tasks] add $(AndroidStripILAfterAOT) (dotnet#8172) Bump to dotnet/installer@ec2c1ec1b1 8.0.100-rc.2.23420.6 (dotnet#8281) Bump to dotnet/installer@001d8e4465 8.0.100-rc.2.23417.14 (dotnet#8276) [Mono.Android] [IntentFilter] pathSuffix & pathAdvancedPattern (dotnet#8261) $(AndroidPackVersionSuffix)=rc.2; net8 is 34.0.0-rc.2 (dotnet#8278) Bump to xamarin/xamarin-android-tools/main@52f0866 (dotnet#8241) [build] set file extension for common `ToolExe` values (dotnet#8267) ...
grendello · Sep 4, 2023 · cffb1a3 · cffb1a3
2 parents 0d47383 + 52d1570
commit cffb1a3
Show file tree

Hide file tree

Showing 99 changed files with 3,781 additions and 3,484 deletions.
diff --git a/.external b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:main@dbc9c67e7bd45744e5174dd7e94e5b642418bef9
+xamarin/monodroid:main@057b17fe491f51823eb814f0163bb92686e24991
 mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
diff --git a/Configuration.props b/Configuration.props
@@ -180,20 +180,22 @@
   </PropertyGroup>
   <PropertyGroup>
     <AdbToolPath Condition=" '$(AdbToolPath)' == '' ">$(AndroidSdkFullPath)\platform-tools\</AdbToolPath>
-    <AdbToolExe Condition=" '$(AdbToolExe)' == '' ">adb</AdbToolExe>
+    <AdbToolExe Condition=" '$(AdbToolExe)' == '' and '$(HostOS)' != 'Windows' ">adb</AdbToolExe>
+    <AdbToolExe Condition=" '$(AdbToolExe)' == '' and '$(HostOS)' == 'Windows' ">adb.exe</AdbToolExe>
     <AvdManagerHome Condition=" '$(AvdManagerHome)' == '' ">$(AndroidToolchainDirectory)</AvdManagerHome>
-    <AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' ">avdmanager</AvdManagerToolExe>
+    <AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' != 'Windows' ">avdmanager</AvdManagerToolExe>
+    <AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' == 'Windows' ">avdmanager.bat</AvdManagerToolExe>
     <AndroidToolPath Condition=" '$(AndroidToolPath)' == '' ">$(AndroidSdkFullPath)\tools</AndroidToolPath>
     <AndroidToolsBinPath Condition=" '$(AndroidToolsBinPath)' == '' ">$(AndroidToolPath)\bin</AndroidToolsBinPath>
-    <AndroidToolExe Condition=" '$(AndroidToolExe)' == '' ">android</AndroidToolExe>
     <CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">7.0</CommandLineToolsFolder>
     <CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">8512546_latest</CommandLineToolsVersion>
     <CommandLineToolsBinPath Condition=" '$(CommandLineToolsBinPath)' == '' ">$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin</CommandLineToolsBinPath>
     <!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-3.xml -->
     <EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">9364964</EmulatorVersion>
     <EmulatorPkgRevision Condition=" '$(EmulatorPkgRevision)' == '' ">32.1.9</EmulatorPkgRevision>
     <EmulatorToolPath Condition=" '$(EmulatorToolPath)' == '' ">$(AndroidSdkFullPath)\emulator</EmulatorToolPath>
-    <EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' ">emulator</EmulatorToolExe>
+    <EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' and '$(HostOS)' != 'Windows'  ">emulator</EmulatorToolExe>
+    <EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' and '$(HostOS)' == 'Windows'  ">emulator.exe</EmulatorToolExe>
     <NdkBuildPath Condition=" '$(NdkBuildPath)' == '' And '$(HostOS)' != 'Windows' ">$(AndroidNdkDirectory)\ndk-build</NdkBuildPath>
     <NdkBuildPath Condition=" '$(NdkBuildPath)' == '' And '$(HostOS)' == 'Windows' ">$(AndroidNdkDirectory)\ndk-build.cmd</NdkBuildPath>
     <BundleToolJarPath Condition=" '$(BundleToolJarPath)' == '' ">$(MicrosoftAndroidSdkOutDir)bundletool.jar</BundleToolJarPath>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -35,7 +35,7 @@
          * Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
     -->
     <AndroidPackVersion>34.0.0</AndroidPackVersion>
-    <AndroidPackVersionSuffix>rc.1</AndroidPackVersionSuffix>
+    <AndroidPackVersionSuffix>rc.2</AndroidPackVersionSuffix>
   </PropertyGroup>
 
   <!-- Common <PackageReference/> versions -->

diff --git a/Documentation/building/unix/dependencies.md b/Documentation/building/unix/dependencies.md
@@ -135,8 +135,7 @@ and to enable it again, issue the following command:
 
 ## macOS Dependencies
 
-The [`android-toolchain.projitems`](../../../build-tools/android-toolchain/android-toolchain.projitems), and
-[`monodroid.projitems`](../../../src/monodroid/monodroid.projitems) project files, among
+The [`android-toolchain.projitems`](../../../build-tools/android-toolchain/android-toolchain.projitems), among
 others, use the `@(RequiredProgram)` build action to check for the existence
 of a program within `$PATH` during the build. If a required program doesn't
 exist, then the build will fail and a suggested `brew install` command line

diff --git a/Documentation/building/windows/instructions.md b/Documentation/building/windows/instructions.md
@@ -20,21 +20,18 @@ MSBuild version 15 or later is required.
 
  5. In a [Developer Command Prompt][developer-prompt], prepare the project:
 
-        dotnet msbuild Xamarin.Android.sln -t:Prepare
+        dotnet msbuild Xamarin.Android.sln -t:Prepare -nodeReuse:false
+        dotnet msbuild external\Java.Interop\Java.Interop.sln -t:Prepare -nodeReuse:false
 
     This will ensure that the build dependencies are installed, perform
     `git submodule update`, download NuGet dependencies, and other
     "preparatory" and pre-build tasks that need to be performed.
 
  6. Build the project:
 
-        dotnet-local.cmd build Xamarin.Android.sln -m:1
+        dotnet-local.cmd build Xamarin.Android.sln  -nodeReuse:false
 
- 7. In order to use the in-tree Xamarin.Android, build xabuild:
-
-         msbuild tools/xabuild/xabuild.csproj /restore
-
- 8. (For Microsoft team members only - Optional) In a [Developer Command
+ 7. (For Microsoft team members only - Optional) In a [Developer Command
     Prompt][developer-prompt], build external proprietary git
     dependencies:
 

diff --git a/Documentation/guides/building-apps/build-properties.md b/Documentation/guides/building-apps/build-properties.md
@@ -1303,6 +1303,20 @@ This is only used when building `system` applications.
 
 Support for this property was added in Xamarin.Android 11.3.
 
+## AndroidStripILAfterAOT
+
+A bool property that specifies whether or not the *method bodies* of AOT compiled methods will be removed.
+
+The default value is `false`, and the method bodies of AOT compiled methods will *not* be removed.
+
+When set to `true`, [`$(AndroidEnableProfiledAot)`](#androidenableprofiledaot) is set to `false` by default.
+This means that in Release configuration builds -- in which
+[`$(RunAOTCompilation)`](#runaotcompilation) is `true` by default -- AOT is enabled for *everything*.
+This can result in increased app sizes. This behavior can be overridden by explicitly setting
+`$(AndroidEnableProfiledAot)` to `true` within your project file.
+
+Support for this property was added in .NET 8.
+
 ## AndroidSupportedAbis
 
 A string property that contains a

diff --git a/Makefile b/Makefile
@@ -24,7 +24,6 @@ _PREPARE_ARGS =
 all:
 	$(call DOTNET_BINLOG,all) $(MSBUILD_FLAGS) $(SOLUTION)
 	$(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj
-	$(call MSBUILD_BINLOG,all,$(_SLN_BUILD)) /restore $(MSBUILD_FLAGS) tools/xabuild/xabuild.csproj
 
 -include bin/Build$(CONFIGURATION)/rules.mk
 
@@ -95,7 +94,6 @@ MSBUILD_FLAGS += /p:AndroidApiLevel=$(API_LEVEL) /p:AndroidFrameworkVersion=$(wo
 endif
 
 all-tests::
-	$(call MSBUILD_BINLOG,build-xabuild) /restore tools/xabuild/xabuild.csproj /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS)
 	MSBUILD="$(MSBUILD)" $(call MSBUILD_BINLOG,all-tests,tools/scripts/xabuild) /restore $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln
 
 pack-dotnet::

diff --git a/NuGet.config b/NuGet.config
@@ -11,9 +11,9 @@
     <!-- 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 6.0.11 -->
-    <add key="darc-pub-dotnet-emsdk-c3fc739" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-runtime-1e1f688" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-1e1f688d/nuget/v3/index.json" />
+    <!-- Added manually for dotnet/runtime 7.0.11 -->
+    <add key="darc-pub-dotnet-emsdk-fcd8602" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fcd86021/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-0ece505" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-0ece5051/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>
diff --git a/build-tools/api-merge/merge-configuration.xml b/build-tools/api-merge/merge-configuration.xml
@@ -25,21 +25,6 @@
     <File Path="api-34.xml.in" Level="34" />
   </Inputs>
   <Outputs>
-    <File Path="api-19.xml" LastLevel="19" />
-    <File Path="api-20.xml" LastLevel="20" />
-    <File Path="api-21.xml" LastLevel="21" />
-    <File Path="api-22.xml" LastLevel="22" />
-    <File Path="api-23.xml" LastLevel="23" />
-    <File Path="api-24.xml" LastLevel="24" />
-    <File Path="api-25.xml" LastLevel="25" />
-    <File Path="api-26.xml" LastLevel="26" />
-    <File Path="api-27.xml" LastLevel="27" />
-    <File Path="api-28.xml" LastLevel="28" />
-    <File Path="api-29.xml" LastLevel="29" />
-    <File Path="api-30.xml" LastLevel="30" />
-    <File Path="api-31.xml" LastLevel="31" />
-    <File Path="api-32.xml" LastLevel="32" />
-    <File Path="api-33.xml" LastLevel="33" />
     <File Path="api-34.xml" LastLevel="34" />
   </Outputs>
 </Configuration>
diff --git a/build-tools/automation/azure-pipelines-apidocs.yaml b/build-tools/automation/azure-pipelines-apidocs.yaml
@@ -59,7 +59,7 @@ stages:
     - checkout: self
       submodules: recursive
 
-    - script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-11"
+    - script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-17"
       displayName: set JI_JAVA_HOME
 
     # Set MSBuild property overrides if parameters are set

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
@@ -112,7 +112,7 @@ stages:
         restoreNUnitConsole: false
         updateMono: false
         xaprepareScenario: EmulatorTestDependencies
-        
+
     - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: $(TestAssembliesArtifactName)
@@ -140,7 +140,7 @@ stages:
         arguments: -t:PrepareJavaInterop -c $(XA.Build.Configuration) --no-restore
         displayName: prepare java.interop $(XA.Build.Configuration)
         continueOnError: false
-      
+
     - template: yaml-templates/start-stop-emulator.yaml
 
     - template: yaml-templates/apk-instrumentation.yaml
@@ -201,7 +201,7 @@ stages:
         extraBuildArgs: -p:TestsFlavor=AotLlvm -p:EnableLLVM=true -p:AndroidEnableProfiledAot=false
         artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
         artifactFolder: $(DotNetTargetFramework)-AotLlvm
-        
+
     - template: yaml-templates/apk-instrumentation.yaml
       parameters:
         configuration: $(XA.Build.Configuration)
@@ -220,13 +220,19 @@ stages:
         artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Xamarin.Android.JcwGen_Tests-Signed.apk
         artifactFolder: $(DotNetTargetFramework)-FastDev_Assemblies_Dexes
         extraBuildArgs: /p:AndroidFastDeploymentType=Assemblies:Dexes
-        
+
     - template: yaml-templates/run-nunit-tests.yaml
       parameters:
         testRunTitle: Xamarin.Android.Tools.Aidl-Tests - macOS
         testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Tools.Aidl-Tests.dll
         testResultsFile: TestResult-Aidl-Tests-macOS-$(XA.Build.Configuration).xml
 
+    - task: ShellScript@2
+      displayName: Test dotnet-local.sh
+      inputs:
+        scriptPath: dotnet-local.sh
+        args: build samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj
+
     - ${{ if ne(parameters.macTestAgentsUseCleanImages, true) }}:
       - template: yaml-templates/start-stop-emulator.yaml
         parameters:
@@ -273,9 +279,15 @@ stages:
       parameters:
         testRunTitle: Xamarin.Android.Build.Tests - Linux .NET 6 Smoke Tests
         testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
-        dotNetTestExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)"
+        dotNetTestExtraArgs: --filter "TestCategory = SmokeTests"
         testResultsFile: TestResult-NETSmokeMSBuildTests-Linux-$(XA.Build.Configuration).xml
 
+    - task: ShellScript@2
+      displayName: Test dotnet-local.sh
+      inputs:
+        scriptPath: dotnet-local.sh
+        args: build samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj
+
     - template: yaml-templates/upload-results.yaml
       parameters:
         configuration: $(XA.Build.Configuration)

diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml
@@ -96,7 +96,13 @@ stages:
         testRunTitle: Smoke MSBuild Tests - Windows Dotnet Build
         testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\$(DotNetStableTargetFramework)\Xamarin.Android.Build.Tests.dll
         testResultsFile: TestResult-SmokeMSBuildTests-WinDotnetBuild-$(XA.Build.Configuration).xml
-        dotNetTestExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)"
+        dotNetTestExtraArgs: --filter "TestCategory = SmokeTests"
+
+    - task: BatchScript@1
+      displayName: Test dotnet-local.cmd
+      inputs:
+        filename: dotnet-local.cmd
+        arguments: build samples\HelloWorld\HelloWorld\HelloWorld.DotNet.csproj
 
     - template: upload-results.yaml
       parameters:

diff --git a/build-tools/automation/yaml-templates/commercial-build.yaml b/build-tools/automation/yaml-templates/commercial-build.yaml
@@ -7,7 +7,7 @@ parameters:
   testAssembliesArtifactName: $(TestAssembliesArtifactName)
 
 steps:
-- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-11"
+- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-17"
   displayName: set JI_JAVA_HOME
 
 - template: use-dot-net.yaml
@@ -32,9 +32,18 @@ steps:
   workingDirectory: ${{ parameters.xaSourcePath }}
   displayName: make prepare-update-mono
 
-# Clone and prepare monodroid with submodules, but disregard the unused xamarin-android submodule.
+# Clone 'monodroid' without submodules
 - checkout: monodroid
   clean: true
+  path: s/xamarin-android/external/monodroid
+
+# Tell git to ignore the 'xamarin-android' submodule, which is large and unneeded
+- script: git config submodule."external/xamarin-android".update none
+  workingDirectory: xamarin-android/external/monodroid
+  displayName: Ignore XA submodule
+
+# Clone 'monodroid' with the rest of the submodules
+- checkout: monodroid
   submodules: recursive
   path: s/xamarin-android/external/monodroid
   persistCredentials: true

diff --git a/build-tools/automation/yaml-templates/run-msbuild-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-tests.yaml
@@ -1,9 +1,9 @@
 parameters:
-  testOS:                 # 'macOS' or 'Windows'
-  jobName:                # Name of the job
-  jobDisplayName:         # Display name of the job
-  agentCount:             # Number of build agents to run in parallel
-  testFilter:             # Filter used to select tests (NUnit test selection language, not dotnet test filter language)
+  testOS: ''              # 'macOS' or 'Windows'
+  jobName: ''             # Name of the job
+  jobDisplayName: ''      # Display name of the job
+  agentCount: 1           # Number of build agents to run in parallel
+  testFilter: ''          # Filter used to select tests (NUnit test selection language, not dotnet test filter language)
   xaSourcePath: $(System.DefaultWorkingDirectory)
   repositoryAlias: 'self'
   commit: ''
@@ -48,7 +48,7 @@ jobs:
   - template: run-sliced-nunit-tests.yaml
     parameters:
       testAssembly: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
-      testFilter: ${{ parameters.testFilter }} $(ExcludedNUnitCategories)
+      testFilter: ${{ parameters.testFilter }}
       testRunTitle: Xamarin.Android.Build.Tests - ${{ parameters.testOS }}
       retryFailedTests: false
       xaSourcePath: ${{ parameters.xaSourcePath }}

diff --git a/build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml b/build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
@@ -1,20 +1,30 @@
 parameters:
-  testAssembly:           # NUnit test assembly to run
-  testFilter:             # Filter used to select tests (NUnit test selection language, not dotnet test filter language)
-  testRunTitle:           # Title of the test run
+  testAssembly: ''        # NUnit test assembly to run
+  testFilter: ''          # Filter used to select tests (NUnit test selection language, not dotnet test filter language)
+  testRunTitle: ''        # Title of the test run
   xaSourcePath: $(System.DefaultWorkingDirectory)
   retryFailedTests: true  # Retry failed tests once
 
 steps:
-- pwsh: |
-    dotnet-test-slicer `
-      slice `
-      --test-assembly="${{ parameters.testAssembly }}" `
-      --test-filter="${{ parameters.testFilter }}" `
-      --slice-number=$(System.JobPositionInPhase) `
-      --total-slices=$(System.TotalJobsInPhase) `
+- ${{if parameters.testFilter}}:
+  - pwsh: >-
+      dotnet-test-slicer slice
+      --test-assembly="${{ parameters.testAssembly }}"
+      --test-filter="${{ parameters.testFilter }}"
+      --slice-number=$(System.JobPositionInPhase)
+      --total-slices=$(System.TotalJobsInPhase)
       --outfile="${{ parameters.testAssembly }}.runsettings"
-  displayName: Slice unit tests
+    displayName: Slice unit tests with filter
+    failOnStderr: true
+- ${{ else }}:
+  - pwsh: >-
+      dotnet-test-slicer slice
+      --test-assembly="${{ parameters.testAssembly }}"
+      --slice-number=$(System.JobPositionInPhase)
+      --total-slices=$(System.TotalJobsInPhase)
+      --outfile="${{ parameters.testAssembly }}.runsettings"
+    displayName: Slice unit tests
+    failOnStderr: true
 
 - ${{ if eq(parameters.retryFailedTests, 'false') }}:
   # If we aren't using auto-retry logic, then this is just a simple template call

diff --git a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
@@ -57,7 +57,7 @@ stages:
     - template: run-sliced-nunit-tests.yaml
       parameters:
         testAssembly: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
-        testFilter: cat != TimeZoneInfo & cat != Localization $(ExcludedNUnitCategories)
+        testFilter: $(ExcludedNightlyNUnitCategories)
         testRunTitle: MSBuildDeviceIntegration On Device - macOS
 
     - ${{ if ne(parameters.usesCleanImages, true) }}:

diff --git a/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml
@@ -21,8 +21,7 @@ stages:
       testOS: macOS
       jobName: mac_msbuild_tests
       jobDisplayName: macOS > Tests > MSBuild
-      agentCount: 10
-      testFilter: cat != Dummy  # This is because $(ExcludedNUnitCategories) gets appended which starts with '&'
+      agentCount: 8
       xaSourcePath: ${{ parameters.xaSourcePath }}
       repositoryAlias: ${{ parameters.repositoryAlias }}
       commit: ${{ parameters.commit }}
@@ -34,7 +33,6 @@ stages:
       jobName: win_msbuild_tests
       jobDisplayName: Windows > Tests > MSBuild
       agentCount: 6
-      testFilter: cat != Dummy  # This is because $(ExcludedNUnitCategories) gets appended which starts with '&'
       xaSourcePath: ${{ parameters.xaSourcePath }}
       repositoryAlias: ${{ parameters.repositoryAlias }}
       commit: ${{ parameters.commit }}

diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml
@@ -48,9 +48,7 @@ variables:
   value: false
 - name: IsRelOrTargetingRel
   value: $[or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['System.PullRequest.TargetBranch'], 'release/'))]
-- name: DotNetNUnitCategories
-  value: '& TestCategory != DotNetIgnore & TestCategory != HybridAOT & TestCategory != MkBundle & TestCategory != MonoSymbolicate & TestCategory != StaticProject & TestCategory != SystemApplication'
 - name: DefaultTestSdkPlatforms  # Comma-separated SDK Platform(s) to install on test agents (no spaces)
   value: 33,34
-- name: ExcludedNUnitCategories
-  value: '& cat != DotNetIgnore & cat != HybridAOT & cat != MkBundle & cat != MonoSymbolicate & cat != StaticProject & cat != SystemApplication'
+- name: ExcludedNightlyNUnitCategories
+  value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
diff --git a/build-tools/create-android-api/create-android-api.csproj b/build-tools/create-android-api/create-android-api.csproj
@@ -38,7 +38,7 @@
     <!-- We don't generate 'api.xml' files for older API levels we no longer ship -->
     <ItemGroup>
       <_MergedXmlFiles
-          Condition=" %(ApiFileDefinition.Level) >= 19  "
+          Condition=" %(ApiFileDefinition.Level) >= 34  "
           Include="@(ApiFileDefinition)" />
     </ItemGroup>
   </Target>

diff --git a/build-tools/gradle/gradle/wrapper/gradle-wrapper.properties b/build-tools/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/build-tools/manifest-attribute-codegen/manifest-definition.xml b/build-tools/manifest-attribute-codegen/manifest-definition.xml
@@ -345,6 +345,7 @@
         <a name='sspPrefix' format='string' api-level='19' />
         <a name='sspPattern' format='string' api-level='19' />
         <a name='pathAdvancedPattern' api-level='26' />
+        <a name='pathSuffix' api-level='31' />
     </e>
     <e name='category'>
         <parent>intent-filter</parent>