From 46e147371743e9bcdccf025357a840f61b487de0 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Mon, 22 Sep 2025 06:48:54 -0700
Subject: [PATCH] Revert "MSBUILD Server dogfood (#115766)"

This reverts commit 121c2f59f1a2d29ff0ffdbb7549dd5961bde0428.
---
 eng/build.ps1                                        | 10 ----------
 eng/build.sh                                         |  4 ----
 eng/pipelines/common/global-build-job.yml            |  4 ----
 eng/pipelines/common/templates/global-build-step.yml |  3 ---
 eng/pipelines/global-build.yml                       |  3 ---
 5 files changed, 24 deletions(-)

diff --git a/eng/build.ps1 b/eng/build.ps1
index 3a9086175533a8..994a5e15e4feba 100644
--- a/eng/build.ps1
+++ b/eng/build.ps1
@@ -266,16 +266,6 @@ if ($vs) {
   # Disable .NET runtime signature validation errors which errors for local builds
   $env:VSDebugger_ValidateDotnetDebugLibSignatures=0;
 
-  # MSBuild Server dogfood.
-  if ($env:DOTNET_CLI_USE_MSBUILD_SERVER -eq $null) 
-  {
-    $env:DOTNET_CLI_USE_MSBUILD_SERVER = 1
-  }
-  if ($env:MSBUILDUSESERVER -eq $null) 
-  {
-    $env:MSBUILDUSESERVER = 1
-  }
-
   # Respect the RuntimeConfiguration variable for building inside VS with different runtime configurations
   if ($runtimeConfiguration)
   {
diff --git a/eng/build.sh b/eng/build.sh
index 3b605496ecba28..2b97fd0ba50bea 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -14,10 +14,6 @@ while [[ -h "$source" ]]; do
 done
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 
-# MSBuild Server dogfood.
-export MSBUILDUSESERVER="${MSBUILDUSESERVER:-1}"
-export DOTNET_CLI_USE_MSBUILD_SERVER="${DOTNET_CLI_USE_MSBUILD_SERVER:-1}"
-
 usage()
 {
   echo "Common settings:"
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index ca80d638a44d6e..d76f7075d72f8a 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -81,10 +81,6 @@ jobs:
         - ${{ format('build_{0}{1}_{2}_{3}_{4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(globalBuild.buildConfig, parameters.buildConfig), globalBuild.nameSuffix) }}
 
     variables:
-      - name: "MSBUILDUSESERVER"
-        value: "1"
-      - name: "DOTNET_CLI_USE_MSBUILD_SERVER"
-        value: "1"
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           - group: DotNet-HelixApi-Access
           - group: AzureDevOps-Artifact-Feeds-Pats
diff --git a/eng/pipelines/common/templates/global-build-step.yml b/eng/pipelines/common/templates/global-build-step.yml
index e2cc704facde1f..983e27c7422c8e 100644
--- a/eng/pipelines/common/templates/global-build-step.yml
+++ b/eng/pipelines/common/templates/global-build-step.yml
@@ -12,9 +12,6 @@ parameters:
 steps:
   - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) ${{ parameters.crossArg }} ${{ parameters.buildArgs }} ${{ parameters.targetCxxLibraryConfigurationArgs }} $(_officialBuildParameter) $(_overrideTestScriptWindowsCmdParameter)
     displayName: ${{ parameters.displayName }}
-    env:
-      MSBUILDUSESERVER: '1'
-      DOTNET_CLI_USE_MSBUILD_SERVER: '1'
     ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
       continueOnError: ${{ parameters.shouldContinueOnError }}
     ${{ if ne(parameters.container, '') }}:
diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml
index 3e0c4f6d11cc79..3739929fbb9f7c 100644
--- a/eng/pipelines/global-build.yml
+++ b/eng/pipelines/global-build.yml
@@ -60,9 +60,6 @@ extends:
                 eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
                 eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
                 eq(variables['isRollingBuild'], true))
-          env:
-            MSBUILDUSESERVER: 1
-            DOTNET_CLI_USE_MSBUILD_SERVER: 1
 
       #
       # Build with RuntimeFlavor only. This exercise code paths where only RuntimeFlavor is