diff --git a/.pipelines/v2/oneFuzz.yml b/.pipelines/v2/oneFuzz.yml index 7800b80e02..adcce3fe5d 100644 --- a/.pipelines/v2/oneFuzz.yml +++ b/.pipelines/v2/oneFuzz.yml @@ -36,8 +36,6 @@ stages: name: SHINE-OSS-L ${{ if eq(parameters.useVSPreview, true) }}: demands: ImageOverride -equals SHINE-VS17-Preview - ${{ else }}: - demands: ImageOverride -equals SHINE-VS17-Latest-2022 buildPlatforms: - ${{ parameters.platform }} buildConfigurations: [Release] diff --git a/.pipelines/v2/release.yml b/.pipelines/v2/release.yml index 853d1ebeb9..71f80f574b 100644 --- a/.pipelines/v2/release.yml +++ b/.pipelines/v2/release.yml @@ -52,8 +52,6 @@ extends: name: SHINE-INT-S ${{ if eq(parameters.useVSPreview, true) }}: demands: ImageOverride -equals SHINE-VS17-Preview - ${{ else }}: - demands: ImageOverride -equals SHINE-VS17-Latest-2022 os: windows sdl: tsa: @@ -77,8 +75,6 @@ extends: # Our INT agents have a large disk mounted at P:\ - ${{ if eq(parameters.useVSPreview, true) }}: - ImageOverride -equals SHINE-VS17-Preview - - ${{ else }}: - - ImageOverride -equals SHINE-VS17-Latest-2022 os: windows variables: IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations @@ -127,7 +123,6 @@ extends: parameters: pool: name: SHINE-INT-L - demands: ImageOverride -equals SHINE-VS17-Latest-2022 os: windows official: true codeSign: true diff --git a/.pipelines/v2/templates/pipeline-ci-build.yml b/.pipelines/v2/templates/pipeline-ci-build.yml index 15501764b8..30c1dbc757 100644 --- a/.pipelines/v2/templates/pipeline-ci-build.yml +++ b/.pipelines/v2/templates/pipeline-ci-build.yml @@ -50,8 +50,6 @@ stages: name: SHINE-OSS-L ${{ if eq(parameters.useVSPreview, true) }}: demands: ImageOverride -equals SHINE-VS17-Preview - ${{ else }}: - demands: ImageOverride -equals SHINE-VS17-Latest-2022 buildPlatforms: - ${{ platform }} buildConfigurations: [Release] diff --git a/.pipelines/v2/templates/pipeline-ui-tests-full-build.yml b/.pipelines/v2/templates/pipeline-ui-tests-full-build.yml index f825e1a40d..a2373feb80 100644 --- a/.pipelines/v2/templates/pipeline-ui-tests-full-build.yml +++ b/.pipelines/v2/templates/pipeline-ui-tests-full-build.yml @@ -30,8 +30,6 @@ stages: name: SHINE-OSS-L ${{ if eq(parameters.useVSPreview, true) }}: demands: ImageOverride -equals SHINE-VS17-Preview - ${{ else }}: - demands: ImageOverride -equals SHINE-VS17-Latest-2022 buildPlatforms: - ${{ parameters.platform }} buildConfigurations: [Release] diff --git a/.pipelines/v2/templates/pipeline-ui-tests-official-build.yml b/.pipelines/v2/templates/pipeline-ui-tests-official-build.yml index 9f7abe8d64..1da11324fe 100644 --- a/.pipelines/v2/templates/pipeline-ui-tests-official-build.yml +++ b/.pipelines/v2/templates/pipeline-ui-tests-official-build.yml @@ -27,7 +27,6 @@ stages: name: SHINE-INT-L ${{ else }}: name: SHINE-OSS-L - demands: ImageOverride -equals SHINE-VS17-Latest-2022 buildPlatforms: - ${{ parameters.platform }} uiTestModules: ${{ parameters.uiTestModules }}