Skip to content

Commit cffb1a3

Browse files
grendellogrendello
committed
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) ...
2 parents 0d47383 + 52d1570 commit cffb1a3

File tree

99 files changed

+3781
-3484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+3781
-3484
lines changed

‎.external

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
xamarin/monodroid:main@dbc9c67e7bd45744e5174dd7e94e5b642418bef9
1+
xamarin/monodroid:main@057b17fe491f51823eb814f0163bb92686e24991
22
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d

‎Configuration.props

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,22 @@
180180
</PropertyGroup>
181181
<PropertyGroup>
182182
<AdbToolPath Condition=" '$(AdbToolPath)' == '' ">$(AndroidSdkFullPath)\platform-tools\</AdbToolPath>
183-
<AdbToolExe Condition=" '$(AdbToolExe)' == '' ">adb</AdbToolExe>
183+
<AdbToolExe Condition=" '$(AdbToolExe)' == '' and '$(HostOS)' != 'Windows' ">adb</AdbToolExe>
184+
<AdbToolExe Condition=" '$(AdbToolExe)' == '' and '$(HostOS)' == 'Windows' ">adb.exe</AdbToolExe>
184185
<AvdManagerHome Condition=" '$(AvdManagerHome)' == '' ">$(AndroidToolchainDirectory)</AvdManagerHome>
185-
<AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' ">avdmanager</AvdManagerToolExe>
186+
<AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' != 'Windows' ">avdmanager</AvdManagerToolExe>
187+
<AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' == 'Windows' ">avdmanager.bat</AvdManagerToolExe>
186188
<AndroidToolPath Condition=" '$(AndroidToolPath)' == '' ">$(AndroidSdkFullPath)\tools</AndroidToolPath>
187189
<AndroidToolsBinPath Condition=" '$(AndroidToolsBinPath)' == '' ">$(AndroidToolPath)\bin</AndroidToolsBinPath>
188-
<AndroidToolExe Condition=" '$(AndroidToolExe)' == '' ">android</AndroidToolExe>
189190
<CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">7.0</CommandLineToolsFolder>
190191
<CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">8512546_latest</CommandLineToolsVersion>
191192
<CommandLineToolsBinPath Condition=" '$(CommandLineToolsBinPath)' == '' ">$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin</CommandLineToolsBinPath>
192193
<!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-3.xml -->
193194
<EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">9364964</EmulatorVersion>
194195
<EmulatorPkgRevision Condition=" '$(EmulatorPkgRevision)' == '' ">32.1.9</EmulatorPkgRevision>
195196
<EmulatorToolPath Condition=" '$(EmulatorToolPath)' == '' ">$(AndroidSdkFullPath)\emulator</EmulatorToolPath>
196-
<EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' ">emulator</EmulatorToolExe>
197+
<EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' and '$(HostOS)' != 'Windows' ">emulator</EmulatorToolExe>
198+
<EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' and '$(HostOS)' == 'Windows' ">emulator.exe</EmulatorToolExe>
197199
<NdkBuildPath Condition=" '$(NdkBuildPath)' == '' And '$(HostOS)' != 'Windows' ">$(AndroidNdkDirectory)\ndk-build</NdkBuildPath>
198200
<NdkBuildPath Condition=" '$(NdkBuildPath)' == '' And '$(HostOS)' == 'Windows' ">$(AndroidNdkDirectory)\ndk-build.cmd</NdkBuildPath>
199201
<BundleToolJarPath Condition=" '$(BundleToolJarPath)' == '' ">$(MicrosoftAndroidSdkOutDir)bundletool.jar</BundleToolJarPath>

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
3636
-->
3737
<AndroidPackVersion>34.0.0</AndroidPackVersion>
38-
<AndroidPackVersionSuffix>rc.1</AndroidPackVersionSuffix>
38+
<AndroidPackVersionSuffix>rc.2</AndroidPackVersionSuffix>
3939
</PropertyGroup>
4040

4141
<!-- Common <PackageReference/> versions -->

‎Documentation/building/unix/dependencies.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ and to enable it again, issue the following command:
135135

136136
## macOS Dependencies
137137

138-
The [`android-toolchain.projitems`](../../../build-tools/android-toolchain/android-toolchain.projitems), and
139-
[`monodroid.projitems`](../../../src/monodroid/monodroid.projitems) project files, among
138+
The [`android-toolchain.projitems`](../../../build-tools/android-toolchain/android-toolchain.projitems), among
140139
others, use the `@(RequiredProgram)` build action to check for the existence
141140
of a program within `$PATH` during the build. If a required program doesn't
142141
exist, then the build will fail and a suggested `brew install` command line

‎Documentation/building/windows/instructions.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,18 @@ MSBuild version 15 or later is required.
2020

2121
5. In a [Developer Command Prompt][developer-prompt], prepare the project:
2222

23-
dotnet msbuild Xamarin.Android.sln -t:Prepare
23+
dotnet msbuild Xamarin.Android.sln -t:Prepare -nodeReuse:false
24+
dotnet msbuild external\Java.Interop\Java.Interop.sln -t:Prepare -nodeReuse:false
2425

2526
This will ensure that the build dependencies are installed, perform
2627
`git submodule update`, download NuGet dependencies, and other
2728
"preparatory" and pre-build tasks that need to be performed.
2829

2930
6. Build the project:
3031

31-
dotnet-local.cmd build Xamarin.Android.sln -m:1
32+
dotnet-local.cmd build Xamarin.Android.sln -nodeReuse:false
3233

33-
7. In order to use the in-tree Xamarin.Android, build xabuild:
34-
35-
msbuild tools/xabuild/xabuild.csproj /restore
36-
37-
8. (For Microsoft team members only - Optional) In a [Developer Command
34+
7. (For Microsoft team members only - Optional) In a [Developer Command
3835
Prompt][developer-prompt], build external proprietary git
3936
dependencies:
4037

‎Documentation/guides/building-apps/build-properties.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,6 +1303,20 @@ This is only used when building `system` applications.
13031303

13041304
Support for this property was added in Xamarin.Android 11.3.
13051305

1306+
## AndroidStripILAfterAOT
1307+
1308+
A bool property that specifies whether or not the *method bodies* of AOT compiled methods will be removed.
1309+
1310+
The default value is `false`, and the method bodies of AOT compiled methods will *not* be removed.
1311+
1312+
When set to `true`, [`$(AndroidEnableProfiledAot)`](#androidenableprofiledaot) is set to `false` by default.
1313+
This means that in Release configuration builds -- in which
1314+
[`$(RunAOTCompilation)`](#runaotcompilation) is `true` by default -- AOT is enabled for *everything*.
1315+
This can result in increased app sizes. This behavior can be overridden by explicitly setting
1316+
`$(AndroidEnableProfiledAot)` to `true` within your project file.
1317+
1318+
Support for this property was added in .NET 8.
1319+
13061320
## AndroidSupportedAbis
13071321

13081322
A string property that contains a

‎Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ _PREPARE_ARGS =
2424
all:
2525
$(call DOTNET_BINLOG,all) $(MSBUILD_FLAGS) $(SOLUTION)
2626
$(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj
27-
$(call MSBUILD_BINLOG,all,$(_SLN_BUILD)) /restore $(MSBUILD_FLAGS) tools/xabuild/xabuild.csproj
2827

2928
-include bin/Build$(CONFIGURATION)/rules.mk
3029

@@ -95,7 +94,6 @@ MSBUILD_FLAGS += /p:AndroidApiLevel=$(API_LEVEL) /p:AndroidFrameworkVersion=$(wo
9594
endif
9695

9796
all-tests::
98-
$(call MSBUILD_BINLOG,build-xabuild) /restore tools/xabuild/xabuild.csproj /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS)
9997
MSBUILD="$(MSBUILD)" $(call MSBUILD_BINLOG,all-tests,tools/scripts/xabuild) /restore $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln
10098

10199
pack-dotnet::

‎NuGet.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
1212
<!-- Android binary, to support delta APK install -->
1313
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
14-
<!-- Added manually for dotnet/runtime 6.0.11 -->
15-
<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" />
16-
<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" />
14+
<!-- Added manually for dotnet/runtime 7.0.11 -->
15+
<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" />
16+
<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" />
1717
</packageSources>
1818
<disabledPackageSources />
1919
</configuration>

‎build-tools/api-merge/merge-configuration.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,6 @@
2525
<File Path="api-34.xml.in" Level="34" />
2626
</Inputs>
2727
<Outputs>
28-
<File Path="api-19.xml" LastLevel="19" />
29-
<File Path="api-20.xml" LastLevel="20" />
30-
<File Path="api-21.xml" LastLevel="21" />
31-
<File Path="api-22.xml" LastLevel="22" />
32-
<File Path="api-23.xml" LastLevel="23" />
33-
<File Path="api-24.xml" LastLevel="24" />
34-
<File Path="api-25.xml" LastLevel="25" />
35-
<File Path="api-26.xml" LastLevel="26" />
36-
<File Path="api-27.xml" LastLevel="27" />
37-
<File Path="api-28.xml" LastLevel="28" />
38-
<File Path="api-29.xml" LastLevel="29" />
39-
<File Path="api-30.xml" LastLevel="30" />
40-
<File Path="api-31.xml" LastLevel="31" />
41-
<File Path="api-32.xml" LastLevel="32" />
42-
<File Path="api-33.xml" LastLevel="33" />
4328
<File Path="api-34.xml" LastLevel="34" />
4429
</Outputs>
4530
</Configuration>

‎build-tools/automation/azure-pipelines-apidocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ stages:
5959
- checkout: self
6060
submodules: recursive
6161

62-
- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-11"
62+
- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-17"
6363
displayName: set JI_JAVA_HOME
6464

6565
# Set MSBuild property overrides if parameters are set

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ stages:
112112
restoreNUnitConsole: false
113113
updateMono: false
114114
xaprepareScenario: EmulatorTestDependencies
115-
115+
116116
- task: DownloadPipelineArtifact@2
117117
inputs:
118118
artifactName: $(TestAssembliesArtifactName)
@@ -140,7 +140,7 @@ stages:
140140
arguments: -t:PrepareJavaInterop -c $(XA.Build.Configuration) --no-restore
141141
displayName: prepare java.interop $(XA.Build.Configuration)
142142
continueOnError: false
143-
143+
144144
- template: yaml-templates/start-stop-emulator.yaml
145145

146146
- template: yaml-templates/apk-instrumentation.yaml
@@ -201,7 +201,7 @@ stages:
201201
extraBuildArgs: -p:TestsFlavor=AotLlvm -p:EnableLLVM=true -p:AndroidEnableProfiledAot=false
202202
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
203203
artifactFolder: $(DotNetTargetFramework)-AotLlvm
204-
204+
205205
- template: yaml-templates/apk-instrumentation.yaml
206206
parameters:
207207
configuration: $(XA.Build.Configuration)
@@ -220,13 +220,19 @@ stages:
220220
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Xamarin.Android.JcwGen_Tests-Signed.apk
221221
artifactFolder: $(DotNetTargetFramework)-FastDev_Assemblies_Dexes
222222
extraBuildArgs: /p:AndroidFastDeploymentType=Assemblies:Dexes
223-
223+
224224
- template: yaml-templates/run-nunit-tests.yaml
225225
parameters:
226226
testRunTitle: Xamarin.Android.Tools.Aidl-Tests - macOS
227227
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Tools.Aidl-Tests.dll
228228
testResultsFile: TestResult-Aidl-Tests-macOS-$(XA.Build.Configuration).xml
229229

230+
- task: ShellScript@2
231+
displayName: Test dotnet-local.sh
232+
inputs:
233+
scriptPath: dotnet-local.sh
234+
args: build samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj
235+
230236
- ${{ if ne(parameters.macTestAgentsUseCleanImages, true) }}:
231237
- template: yaml-templates/start-stop-emulator.yaml
232238
parameters:
@@ -273,9 +279,15 @@ stages:
273279
parameters:
274280
testRunTitle: Xamarin.Android.Build.Tests - Linux .NET 6 Smoke Tests
275281
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
276-
dotNetTestExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)"
282+
dotNetTestExtraArgs: --filter "TestCategory = SmokeTests"
277283
testResultsFile: TestResult-NETSmokeMSBuildTests-Linux-$(XA.Build.Configuration).xml
278284

285+
- task: ShellScript@2
286+
displayName: Test dotnet-local.sh
287+
inputs:
288+
scriptPath: dotnet-local.sh
289+
args: build samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj
290+
279291
- template: yaml-templates/upload-results.yaml
280292
parameters:
281293
configuration: $(XA.Build.Configuration)

‎build-tools/automation/yaml-templates/build-windows.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,13 @@ stages:
9696
testRunTitle: Smoke MSBuild Tests - Windows Dotnet Build
9797
testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\$(DotNetStableTargetFramework)\Xamarin.Android.Build.Tests.dll
9898
testResultsFile: TestResult-SmokeMSBuildTests-WinDotnetBuild-$(XA.Build.Configuration).xml
99-
dotNetTestExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)"
99+
dotNetTestExtraArgs: --filter "TestCategory = SmokeTests"
100+
101+
- task: BatchScript@1
102+
displayName: Test dotnet-local.cmd
103+
inputs:
104+
filename: dotnet-local.cmd
105+
arguments: build samples\HelloWorld\HelloWorld\HelloWorld.DotNet.csproj
100106

101107
- template: upload-results.yaml
102108
parameters:

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
testAssembliesArtifactName: $(TestAssembliesArtifactName)
88

99
steps:
10-
- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-11"
10+
- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-17"
1111
displayName: set JI_JAVA_HOME
1212

1313
- template: use-dot-net.yaml
@@ -32,9 +32,18 @@ steps:
3232
workingDirectory: ${{ parameters.xaSourcePath }}
3333
displayName: make prepare-update-mono
3434

35-
# Clone and prepare monodroid with submodules, but disregard the unused xamarin-android submodule.
35+
# Clone 'monodroid' without submodules
3636
- checkout: monodroid
3737
clean: true
38+
path: s/xamarin-android/external/monodroid
39+
40+
# Tell git to ignore the 'xamarin-android' submodule, which is large and unneeded
41+
- script: git config submodule."external/xamarin-android".update none
42+
workingDirectory: xamarin-android/external/monodroid
43+
displayName: Ignore XA submodule
44+
45+
# Clone 'monodroid' with the rest of the submodules
46+
- checkout: monodroid
3847
submodules: recursive
3948
path: s/xamarin-android/external/monodroid
4049
persistCredentials: true

‎build-tools/automation/yaml-templates/run-msbuild-tests.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
parameters:
2-
testOS: # 'macOS' or 'Windows'
3-
jobName: # Name of the job
4-
jobDisplayName: # Display name of the job
5-
agentCount: # Number of build agents to run in parallel
6-
testFilter: # Filter used to select tests (NUnit test selection language, not dotnet test filter language)
2+
testOS: '' # 'macOS' or 'Windows'
3+
jobName: '' # Name of the job
4+
jobDisplayName: '' # Display name of the job
5+
agentCount: 1 # Number of build agents to run in parallel
6+
testFilter: '' # Filter used to select tests (NUnit test selection language, not dotnet test filter language)
77
xaSourcePath: $(System.DefaultWorkingDirectory)
88
repositoryAlias: 'self'
99
commit: ''
@@ -48,7 +48,7 @@ jobs:
4848
- template: run-sliced-nunit-tests.yaml
4949
parameters:
5050
testAssembly: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
51-
testFilter: ${{ parameters.testFilter }} $(ExcludedNUnitCategories)
51+
testFilter: ${{ parameters.testFilter }}
5252
testRunTitle: Xamarin.Android.Build.Tests - ${{ parameters.testOS }}
5353
retryFailedTests: false
5454
xaSourcePath: ${{ parameters.xaSourcePath }}

‎build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
parameters:
2-
testAssembly: # NUnit test assembly to run
3-
testFilter: # Filter used to select tests (NUnit test selection language, not dotnet test filter language)
4-
testRunTitle: # Title of the test run
2+
testAssembly: '' # NUnit test assembly to run
3+
testFilter: '' # Filter used to select tests (NUnit test selection language, not dotnet test filter language)
4+
testRunTitle: '' # Title of the test run
55
xaSourcePath: $(System.DefaultWorkingDirectory)
66
retryFailedTests: true # Retry failed tests once
77

88
steps:
9-
- pwsh: |
10-
dotnet-test-slicer `
11-
slice `
12-
--test-assembly="${{ parameters.testAssembly }}" `
13-
--test-filter="${{ parameters.testFilter }}" `
14-
--slice-number=$(System.JobPositionInPhase) `
15-
--total-slices=$(System.TotalJobsInPhase) `
9+
- ${{if parameters.testFilter}}:
10+
- pwsh: >-
11+
dotnet-test-slicer slice
12+
--test-assembly="${{ parameters.testAssembly }}"
13+
--test-filter="${{ parameters.testFilter }}"
14+
--slice-number=$(System.JobPositionInPhase)
15+
--total-slices=$(System.TotalJobsInPhase)
1616
--outfile="${{ parameters.testAssembly }}.runsettings"
17-
displayName: Slice unit tests
17+
displayName: Slice unit tests with filter
18+
failOnStderr: true
19+
- ${{ else }}:
20+
- pwsh: >-
21+
dotnet-test-slicer slice
22+
--test-assembly="${{ parameters.testAssembly }}"
23+
--slice-number=$(System.JobPositionInPhase)
24+
--total-slices=$(System.TotalJobsInPhase)
25+
--outfile="${{ parameters.testAssembly }}.runsettings"
26+
displayName: Slice unit tests
27+
failOnStderr: true
1828
1929
- ${{ if eq(parameters.retryFailedTests, 'false') }}:
2030
# If we aren't using auto-retry logic, then this is just a simple template call

‎build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ stages:
5757
- template: run-sliced-nunit-tests.yaml
5858
parameters:
5959
testAssembly: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
60-
testFilter: cat != TimeZoneInfo & cat != Localization $(ExcludedNUnitCategories)
60+
testFilter: $(ExcludedNightlyNUnitCategories)
6161
testRunTitle: MSBuildDeviceIntegration On Device - macOS
6262

6363
- ${{ if ne(parameters.usesCleanImages, true) }}:

‎build-tools/automation/yaml-templates/stage-msbuild-tests.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ stages:
2121
testOS: macOS
2222
jobName: mac_msbuild_tests
2323
jobDisplayName: macOS > Tests > MSBuild
24-
agentCount: 10
25-
testFilter: cat != Dummy # This is because $(ExcludedNUnitCategories) gets appended which starts with '&'
24+
agentCount: 8
2625
xaSourcePath: ${{ parameters.xaSourcePath }}
2726
repositoryAlias: ${{ parameters.repositoryAlias }}
2827
commit: ${{ parameters.commit }}
@@ -34,7 +33,6 @@ stages:
3433
jobName: win_msbuild_tests
3534
jobDisplayName: Windows > Tests > MSBuild
3635
agentCount: 6
37-
testFilter: cat != Dummy # This is because $(ExcludedNUnitCategories) gets appended which starts with '&'
3836
xaSourcePath: ${{ parameters.xaSourcePath }}
3937
repositoryAlias: ${{ parameters.repositoryAlias }}
4038
commit: ${{ parameters.commit }}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ variables:
4848
value: false
4949
- name: IsRelOrTargetingRel
5050
value: $[or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['System.PullRequest.TargetBranch'], 'release/'))]
51-
- name: DotNetNUnitCategories
52-
value: '& TestCategory != DotNetIgnore & TestCategory != HybridAOT & TestCategory != MkBundle & TestCategory != MonoSymbolicate & TestCategory != StaticProject & TestCategory != SystemApplication'
5351
- name: DefaultTestSdkPlatforms # Comma-separated SDK Platform(s) to install on test agents (no spaces)
5452
value: 33,34
55-
- name: ExcludedNUnitCategories
56-
value: '& cat != DotNetIgnore & cat != HybridAOT & cat != MkBundle & cat != MonoSymbolicate & cat != StaticProject & cat != SystemApplication'
53+
- name: ExcludedNightlyNUnitCategories
54+
value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'

‎build-tools/create-android-api/create-android-api.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<!-- We don't generate 'api.xml' files for older API levels we no longer ship -->
3939
<ItemGroup>
4040
<_MergedXmlFiles
41-
Condition=" %(ApiFileDefinition.Level) >= 19 "
41+
Condition=" %(ApiFileDefinition.Level) >= 34 "
4242
Include="@(ApiFileDefinition)" />
4343
</ItemGroup>
4444
</Target>

‎build-tools/gradle/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎build-tools/manifest-attribute-codegen/manifest-definition.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@
345345
<a name='sspPrefix' format='string' api-level='19' />
346346
<a name='sspPattern' format='string' api-level='19' />
347347
<a name='pathAdvancedPattern' api-level='26' />
348+
<a name='pathSuffix' api-level='31' />
348349
</e>
349350
<e name='category'>
350351
<parent>intent-filter</parent>

0 commit comments

Comments
 (0)