From 9eaae753040ba6c1f8e400f773bc9bd6a0fe43dd Mon Sep 17 00:00:00 2001
From: Jason Malinowski <jason.malinowski@microsoft.com>
Date: Fri, 31 Jul 2015 15:54:15 -0700
Subject: [PATCH] Remove the CIBuild flag from the source tree

This flag was only used to add unecessary differences of behavior
from local developer builds. By removing the flag everything acts
the same.
---
 BuildAndTest.proj | 7 ++-----
 cibuild.cmd       | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/BuildAndTest.proj b/BuildAndTest.proj
index a63e0f1b6dc..5536a020179 100644
--- a/BuildAndTest.proj
+++ b/BuildAndTest.proj
@@ -12,12 +12,9 @@
   <PropertyGroup>
     <RoslynSolution>$(MSBuildThisFileDirectory)Roslyn.sln</RoslynSolution>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <RunTestArgs></RunTestArgs>
-    <RunTestArgs Condition="'$(Test64)' == 'true'">-test64</RunTestArgs>
+    <RunTestArgs>$(RunTestArgs) -xml</RunTestArgs>
+    <RunTestArgs Condition="'$(Test64)' == 'true'">$(RunTestArgs) -test64</RunTestArgs>
     <IncludePattern Condition="'$(IncludePattern)' == ''">*.UnitTests*.dll</IncludePattern>
-
-    <!-- Emit XML in a CIBuild in order to get structured test results -->
-    <RunTestArgs Condition="'$(CIBuild)' == 'true'">$(RunTestArgs) -xml</RunTestArgs>
   </PropertyGroup>
 
   <Target Name="RestorePackages">
diff --git a/cibuild.cmd b/cibuild.cmd
index 879794598bd..4998b04cbb5 100644
--- a/cibuild.cmd
+++ b/cibuild.cmd
@@ -24,14 +24,14 @@ move Binaries\%BuildConfiguration%\* %RoslynRoot%\Binaries\Bootstrap
 msbuild /v:m /t:Clean build/Toolset.sln /p:Configuration=%BuildConfiguration%
 taskkill /F /IM vbcscompiler.exe
 
-msbuild /v:m /m /p:BootstrapBuildPath=%RoslynRoot%\Binaries\Bootstrap BuildAndTest.proj /p:CIBuild=true /p:Configuration=%BuildConfiguration%
+msbuild /v:m /m /p:BootstrapBuildPath=%RoslynRoot%\Binaries\Bootstrap BuildAndTest.proj /p:Configuration=%BuildConfiguration%
 if ERRORLEVEL 1 (
     taskkill /F /IM vbcscompiler.exe
     echo Build failed
     exit /b 1
 )
 
-msbuild /v:m /m /p:BootstrapBuildPath=%RoslynRoot%\Binaries\Bootstrap src/Samples/Samples.sln /p:CIBuild=true /p:Configuration=%BuildConfiguration%
+msbuild /v:m /m /p:BootstrapBuildPath=%RoslynRoot%\Binaries\Bootstrap src/Samples/Samples.sln /p:Configuration=%BuildConfiguration%
 if ERRORLEVEL 1 (
     taskkill /F /IM vbcscompiler.exe
     echo Build failed
-- 
GitLab