Remove setup-msvc side-by-side mitigation (#5641)

eng/pipelines/templates/jobs/archetype-sdk-client.yml

@@ -200,8 +200,6 @@ jobs:
           workingDirectory: $(Agent.TempDirectory)
           displayName: Download and Install Doxygen
 
-        - template: /eng/pipelines/templates/steps/setup-msvc.yml
-
         - template: /eng/pipelines/templates/steps/vcpkg.yml
 
         - template: /eng/pipelines/templates/steps/cmake-build.yml

eng/pipelines/templates/jobs/ci.tests.yml

@@ -111,8 +111,6 @@ jobs:
 
       - template: /eng/pipelines/templates/steps/fix-1es-image-apt-azure-sources.yml
 
-      - template: /eng/pipelines/templates/steps/setup-msvc.yml
-
       - pwsh: sudo apt update && sudo apt install -y $(AptDependencies)
         retryCountOnTaskFailure: 10
         condition: and(succeeded(), ne(variables['AptDependencies'], ''))

eng/pipelines/templates/jobs/cmake-generate.tests.yml

@@ -77,8 +77,6 @@ jobs:
 
   - template: /eng/pipelines/templates/steps/fix-1es-image-apt-azure-sources.yml
 
-  - template: /eng/pipelines/templates/steps/setup-msvc.yml
-
   - pwsh: sudo apt update && sudo apt install -y $(AptDependencies)
     retryCountOnTaskFailure: 10
     condition: and(succeeded(), ne(variables['AptDependencies'], ''))

eng/pipelines/templates/jobs/live.tests.yml

@@ -104,8 +104,6 @@ jobs:
           
   - template: /eng/pipelines/templates/steps/fix-1es-image-apt-azure-sources.yml
 
-  - template: /eng/pipelines/templates/steps/setup-msvc.yml
-
   # Add g++5 repo to ubuntu
   - bash: sudo sh -c "echo 'deb http://ftp.debian.org/debian/ stretch main' >> /etc/apt/sources.list"
     displayName: Add g++ 5

eng/pipelines/templates/steps/setup-msvc.yml

@@ -1,21 +0,0 @@
-# This temporary fix resolves an issue on Win2022 machines that have multiple
-# MSVC versions installed side-by-side. When this issue is resolved, remove this
-# template and references:
-# https://github.com/actions/runner-images/issues/9701
-
-steps:
-  - pwsh: |
-      $tempFile = New-TemporaryFile;
-      systeminfo.exe /fo csv > $tempFile
-      $osName = (Import-Csv $tempFile).'OS Name'
-
-      Write-Host "OS Name: $osName"
-      if (!($osName -like '*2022*')) {
-        Write-Host "OS is not Windows Server 2022, skipping MSVC changes"
-        exit 0
-      }
-
-      Remove-item 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\Microsoft.VCToolsVersion.v143.default.*' -Force
-      Get-ChildItem 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\' -Name | Write-Host
-    displayName: Setup MSVC
-    condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))