From 9f5d51656a15e863534ead2cf98c90a3d0f91d71 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Thu, 18 Jan 2018 11:27:46 -0800
Subject: [PATCH] Fix check for use of compile items

This check was wrong, and since it runs after properties are evaluated,
we can use the results from evaulating properties to fix it.
---
 .../Microsoft.AspNetCore.Mvc.Razor.Compatibility.targets      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Compatibility.targets b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Compatibility.targets
index 18017d54eb..15adbc0dd9 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Compatibility.targets
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Compatibility.targets
@@ -83,9 +83,9 @@
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
   </PropertyGroup>
 
-  <ItemGroup Condition="'@(MvcRazorFilesToCompile)'!='' and '$(_MvcPrecompilationExplicitlyDisabled)'!='true' and '$(_RazorSdkExplicitlyDisabled)'!='true'">
+  <ItemGroup Condition="'@(MvcRazorFilesToCompile)'!='' and ('$(RazorCompileOnBuild)'=='true' or '$(RazorCompileOnPublish)'=='true')">
     <!-- 
-      This is case 5b or 5b, the project file has modified the MvcPrecompilation items but hasn't turned the Razor SDK. 
+      This is case 5b or 5b, the project file has modified the MvcPrecompilation items but hasn't turned the Razor SDK off. 
       We can't disable the Razor SDK at this point, it's too late in the evaluation pass.
     -->
     <_RazorSdkCompatibilityError Include="Using the Razor SDK (RazorCompileOnBuild or RazorCompileOnPublish) and MvcRazorFilesToCompile together is not supported. To disable the Razor SDK targets, and use MvcPrecompilation set the property 'MvcRazorCompileOnPublish' to 'true' in the project file. To use the Razor SDK instead, replace 'MvcRazorFilesToCompile' with 'RazorGenerate'"/>