From 25ffb671b333c541870eb55d827f5c4949547a33 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 27 Feb 2024 16:06:56 +0100
Subject: [PATCH] Enable razor in unified-build (#18776)

Co-authored-by: Eric StJohn <ericstj@microsoft.com>
---
 .../content/repo-projects/Directory.Build.targets           | 3 ---
 src/SourceBuild/content/repo-projects/arcade.proj           | 5 -----
 src/SourceBuild/content/repo-projects/razor.proj            | 6 ++++++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 61bf69783..729425f21 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -322,8 +322,6 @@
                             UpdateEngCommonFiles;
                             CreateBuildInputProps;
                             SetSourceBuiltSdkOverrides">
-    <Exec Command="$(DotnetTool) build-server shutdown" />
-
     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Building $(RepositoryName)" />
     <Message Importance="High" Text="Running command:" />
     <Message Importance="High" Text="  $(BuildCommand)" />
@@ -737,7 +735,6 @@
       <TransitiveRepositoryReference Remove="roslyn" />
       <TransitiveRepositoryReference Remove="msbuild" />
       <TransitiveRepositoryReference Remove="aspnetcore" />
-      <TransitiveRepositoryReference Remove="razor" />
       <TransitiveRepositoryReference Remove="nuget-client" />
       <TransitiveRepositoryReference Remove="fsharp" />
       <TransitiveRepositoryReference Remove="vstest" />
diff --git a/src/SourceBuild/content/repo-projects/arcade.proj b/src/SourceBuild/content/repo-projects/arcade.proj
index 47f27e4b6..90189525b 100644
--- a/src/SourceBuild/content/repo-projects/arcade.proj
+++ b/src/SourceBuild/content/repo-projects/arcade.proj
@@ -15,11 +15,6 @@
     <BuiltSdkPackageOverride Include="@(ArcadeCMakeSdkOverride)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EnvironmentVariables Include="UsingToolMicrosoftNetCompilers=false" />
-    <EnvironmentVariables Include="useInstalledDotNetCli=false" />
-  </ItemGroup>
-
   <ItemGroup>
     <ExtraPackageVersionPropsPackageInfo Include="NuGetVersion" Version="%24(NuGetPackagingVersion)" />
   </ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj
index 99eca651e..156d33d6c 100644
--- a/src/SourceBuild/content/repo-projects/razor.proj
+++ b/src/SourceBuild/content/repo-projects/razor.proj
@@ -1,5 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <!-- The toolset compiler doesn't get killed with 'build-server shutdown'.
+         Instead of disabling shared compilation, disable the toolset compiler package. -->
+    <BuildArgs>$(BuildArgs) /p:UsingToolMicrosoftNetCompilers=false</BuildArgs>
+  </PropertyGroup>
+
   <ItemGroup>
     <RepositoryReference Include="arcade" />
   </ItemGroup>