Skip to content

Commit

Permalink
Merge branch 'main' into blazor-hang
Browse files Browse the repository at this point in the history
* main:
  [ci] Stop building classic test suites. (dotnet#7938)
  • Loading branch information
grendello committed Apr 7, 2023
2 parents e3d2649 + 1df887b commit 581194e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 24 deletions.
19 changes: 0 additions & 19 deletions build-tools/automation/yaml-templates/build-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ stages:
parameters:
remove_dotnet: true

# xabuild still depends on .NET Core 3 or earlier
- template: use-dot-net.yaml
parameters:
version: 3.1
quality: GA

# 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.
# The VS installer will attempt to resume any failed or partial installation before trying to downgrade Xamarin.Android.
# VSIXInstaller.exe will exit non-zero when the downgrade attempt is a no-op, so we will allow this step to fail silently.
Expand Down Expand Up @@ -92,19 +86,6 @@ stages:
displayName: Build Solution
continueOnError: false

- task: MSBuild@1
displayName: msbuild xabuild
inputs:
solution: tools\xabuild\xabuild.csproj
configuration: $(XA.Build.Configuration)
msbuildArguments: /restore /bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-xabuild.binlog

- task: CmdLine@1
displayName: xabuild Xamarin.Android-Tests
inputs:
filename: bin\$(XA.Build.Configuration)\bin\xabuild.exe
arguments: Xamarin.Android-Tests.sln /restore /p:Configuration=$(XA.Build.Configuration) /bl:$(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\dotnet-build-tests.binlog

- template: install-apkdiff.yaml

- template: run-nunit-tests.yaml
Expand Down
5 changes: 0 additions & 5 deletions build-tools/automation/yaml-templates/commercial-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ steps:
displayName: CodeQL 3000 Finalize
condition: and(succeededOrFailed(), eq(variables['Codeql.Enabled'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))

# Build test assemblies
- script: make all-tests CONFIGURATION=$(XA.Build.Configuration)
workingDirectory: ${{ parameters.xaSourcePath }}
displayName: make all-tests

# Restore needs to be executed first or MicroBuild targets won't be imported in time
- task: MSBuild@1
displayName: msbuild /t:Restore sign-content.proj
Expand Down

0 comments on commit 581194e

Please sign in to comment.