Skip to content

[ci] Use new 1ES Hosted win2019 Pool #6063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 8, 2021
Merged

[ci] Use new 1ES Hosted win2019 Pool #6063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions build-tools/automation/azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ variables:
DotNet6Version: 6.0.100-preview.3.21202.5
HostedMacImage: macOS-10.15
HostedWinVS2019: Hosted Windows 2019 with VS2019
VSEngWinVS2019: Xamarin-Android-Win2019
VSEngWinVS2019: android-win-2019
# Run all tests if:
# - User who queued the job requested it (They set XA.RunAllTests to true)
# - This is the master integration branch (Pipeline defaults XA.RunAllTests to true)
Expand Down Expand Up @@ -171,8 +171,6 @@ stages:

- template: yaml-templates\clean.yaml

- template: yaml-templates\update-vs.yaml

- script: |
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%USERPROFILE%\android-toolchain\$(XA.Jdk11.Folder)
displayName: set JI_JAVA_HOME
Expand Down Expand Up @@ -293,8 +291,6 @@ stages:

- template: yaml-templates\clean.yaml

- template: yaml-templates\update-vs.yaml

- script: |
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%USERPROFILE%\android-toolchain\$(XA.Jdk11.Folder)
displayName: set JI_JAVA_HOME
Expand Down
1 change: 0 additions & 1 deletion build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:

- template: setup-test-environment.yaml
parameters:
updateVS: true
jdkTestFolder: ${{ parameters.jdkTestFolder }}

- task: DownloadPipelineArtifact@1
Expand Down