diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index c74674d432..0a2da72772 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -35,7 +35,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     Remove comment above ^
 
     Set TargetType="$(OutputType)" to TargetType="Library" - Razor is always a .dll
-    
+
     Remove Returns="@(CscCommandLineArgs)"
     Remove <Import Project="Microsoft.Managed.Core.targets"/>
     Remove Returns="@(CscCommandLineArgs)"
@@ -60,7 +60,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     Remove additional steps after calling CSC
 
     Add our FileWrites after the call to CSC
-    
+
     Add Condition="'@(RazorCompile)'!=''" as a condition to the RazorCoreCompile target.
   -->
   <Target Name="RazorCoreCompile"
@@ -117,6 +117,10 @@ Copyright (c) .NET Foundation. All rights reserved.
       <LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion>
     </PropertyGroup>
 
+    <PropertyGroup>
+      <RazorCompilationErrorLog Condition="'$(RazorCompilationErrorLog)'==''">$(IntermediateOutputPath)$(RazorTargetName).Compilation.log</RazorCompilationErrorLog>
+    </PropertyGroup>
+
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"
@@ -137,7 +141,7 @@ Copyright (c) .NET Foundation. All rights reserved.
          EmitDebugInformation="$(DebugSymbols)"
          EnvironmentVariables="$(CscEnvironment)"
          ErrorEndLocation="$(ErrorEndLocation)"
-         ErrorLog="$(ErrorLog)"
+         ErrorLog="$(RazorCompilationErrorLog)"
          ErrorReport="$(ErrorReport)"
          Features="$(Features)"
          FileAlignment="$(FileAlignment)"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
index 18e39122e2..4627554192 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -180,6 +180,10 @@ Copyright (c) .NET Foundation. All rights reserved.
       <UseSharedCompilation>true</UseSharedCompilation>
     </PropertyGroup>
 
+    <PropertyGroup>
+      <RazorComponentErrorLog Condition="'$(RazorComponentErrorLog)'==''"><$(IntermediateOutputPath)$(RazorTargetName).Component.log/RazorComponentErrorLog>
+    </PropertyGroup>
+
     <Csc
          AdditionalLibPaths="$(AdditionalLibPaths)"
          AddModules="@(AddModules)"
@@ -198,7 +202,7 @@ Copyright (c) .NET Foundation. All rights reserved.
          EmitDebugInformation="$(DebugSymbols)"
          EnvironmentVariables="$(CscEnvironment)"
          ErrorEndLocation="$(ErrorEndLocation)"
-         ErrorLog="$(ErrorLog)"
+         ErrorLog="$(RazorComponentErrorLog)"
          ErrorReport="$(ErrorReport)"
          Features="$(Features)"
          FileAlignment="$(FileAlignment)"
@@ -265,10 +269,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     </PropertyGroup>
   </Target>
 
-  <!-- 
+  <!--
     Once RazorCompileComponentDeclaration is completed, we have all the inputs required for code generation of
     RazorComponents and RazorGenerate items. We'll initialize the inputs for RazorGenerate and invoke it.
-    This should result in RazorGenerate \ RazorTagHelper targets no-oping when it get invoked as 
+    This should result in RazorGenerate \ RazorTagHelper targets no-oping when it get invoked as
     part of PrepareForRun \ PrepareForPublish for non-components (.cshtml) files.
    -->
   <Target