diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 036e040a4e22..4ae58563f859 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -30,8 +30,6 @@ variables: value: $(Build.ArtifactStagingDirectory)/logs - name: TestResultsDirectory value: $(Build.ArtifactStagingDirectory)/test-results -- name: provisioningVS - value: true - name: provisionator.xcode value: '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx' - name: provisionator.path diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml index 90d4ce4bde16..3d50f45799b1 100644 --- a/eng/pipelines/handlers.yml +++ b/eng/pipelines/handlers.yml @@ -131,9 +131,6 @@ stages: pool: name: ${{ BuildPlatform.poolName }} vmImage: ${{ BuildPlatform.vmImage }} - ${{ if eq(BuildPlatform.name, 'Windows') }}: - demands: - - ImageOverride -equals server2022-VS2022-17-2-p1 ${{ if startsWith(BuildPlatform.poolName, 'VSEng-VSMac-Xamarin-Shared') }}: demands: - macOS.Name -equals BigSur @@ -186,9 +183,6 @@ stages: pool: name: ${{ PackPlatform.poolName }} vmImage: ${{ PackPlatform.vmImage }} - ${{ if eq(PackPlatform.name, 'Windows') }}: - demands: - - ImageOverride -equals server2022-VS2022-17-2-p1 ${{ if startsWith(PackPlatform.poolName, 'VSEng-VSMac-Xamarin-Shared') }}: demands: - macOS.Name -equals BigSur @@ -221,9 +215,6 @@ stages: pool: name: ${{ BuildPlatform.poolName }} vmImage: ${{ BuildPlatform.vmImage }} - ${{ if eq(BuildPlatform.name, 'Windows') }}: - demands: - - ImageOverride -equals server2022-VS2022-17-2-p1 ${{ if startsWith(BuildPlatform.poolName, 'VSEng-VSMac-Xamarin-Shared') }}: demands: - macOS.Name -equals BigSur @@ -282,9 +273,6 @@ stages: pool: name: ${{ BuildPlatform.poolName }} vmImage: ${{ BuildPlatform.vmImage }} - ${{ if eq(BuildPlatform.name, 'Windows') }}: - demands: - - ImageOverride -equals server2022-VS2022-17-2-p1 ${{ if startsWith(BuildPlatform.poolName, 'VSEng-VSMac-Xamarin-Shared') }}: demands: - macOS.Name -equals BigSur diff --git a/eng/pipelines/maui-release.yml b/eng/pipelines/maui-release.yml index 3a7e3f44e450..a108f6074ed9 100644 --- a/eng/pipelines/maui-release.yml +++ b/eng/pipelines/maui-release.yml @@ -69,9 +69,6 @@ stages: pool: name: ${{ PackPlatform.poolName }} vmImage: ${{ PackPlatform.vmImage }} - ${{ if eq(PackPlatform.name, 'Windows') }}: - demands: - - ImageOverride -equals server2022-VS2022-17-2-p1 ${{ if startsWith(PackPlatform.poolName, 'VSEng-VSMac-Xamarin-Shared') }}: demands: - macOS.Name -equals BigSur