Skip to content

Commit 1df887b

Browse files
authored
[ci] Stop building classic test suites. (#7938)
Now that we no longer run any Classic test suites in main, we no longer need to build them with Xamarin.Android-Tests.sln. The .NET test suites that we do use are built in Xamarin.Android.sln or built locally on the test agents with the installed XA test packages. This saves about 7.5 minutes from the Mac Build.
1 parent 209c8c6 commit 1df887b

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ stages:
4545
parameters:
4646
remove_dotnet: true
4747

48-
# xabuild still depends on .NET Core 3 or earlier
49-
- template: use-dot-net.yaml
50-
parameters:
51-
version: 3.1
52-
quality: GA
53-
5448
# Downgrade the XA .vsix installed into the instance of VS that we are building with so that we don't restore/build against a test version.
5549
# The VS installer will attempt to resume any failed or partial installation before trying to downgrade Xamarin.Android.
5650
# VSIXInstaller.exe will exit non-zero when the downgrade attempt is a no-op, so we will allow this step to fail silently.
@@ -92,19 +86,6 @@ stages:
9286
displayName: Build Solution
9387
continueOnError: false
9488

95-
- task: MSBuild@1
96-
displayName: msbuild xabuild
97-
inputs:
98-
solution: tools\xabuild\xabuild.csproj
99-
configuration: $(XA.Build.Configuration)
100-
msbuildArguments: /restore /bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-xabuild.binlog
101-
102-
- task: CmdLine@1
103-
displayName: xabuild Xamarin.Android-Tests
104-
inputs:
105-
filename: bin\$(XA.Build.Configuration)\bin\xabuild.exe
106-
arguments: Xamarin.Android-Tests.sln /restore /p:Configuration=$(XA.Build.Configuration) /bl:$(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\dotnet-build-tests.binlog
107-
10889
- template: install-apkdiff.yaml
10990

11091
- template: run-nunit-tests.yaml

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ steps:
6060
displayName: CodeQL 3000 Finalize
6161
condition: and(succeededOrFailed(), eq(variables['Codeql.Enabled'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
6262

63-
# Build test assemblies
64-
- script: make all-tests CONFIGURATION=$(XA.Build.Configuration)
65-
workingDirectory: ${{ parameters.xaSourcePath }}
66-
displayName: make all-tests
67-
6863
# Restore needs to be executed first or MicroBuild targets won't be imported in time
6964
- task: MSBuild@1
7065
displayName: msbuild /t:Restore sign-content.proj

0 commit comments

Comments
 (0)