From e64954c9c738c71424a1cb3397a8bbbb11a7a5be Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Sat, 20 Jan 2018 18:42:28 -0800
Subject: [PATCH] Undo compatibility error messages

We're going another way with Razor SDK interop. The Web SDK
will make a choice whether to enable MvcPrecompilation or RazorSDK, and
the Razor SDK will support all of the settings from MvcPrecompilation.
---
 .gitignore                                    |  1 +
 ...AspNetCore.Mvc.Razor.Compatibility.targets | 95 -------------------
 ...AspNetCore.Mvc.Razor.ViewCompilation.props | 11 ---
 ...pNetCore.Mvc.Razor.ViewCompilation.targets | 10 +-
 testapps/Directory.Build.props                |  3 -
 5 files changed, 2 insertions(+), 118 deletions(-)
 delete mode 100644 src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Compatibility.targets
 delete mode 100644 src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.props

diff --git a/.gitignore b/.gitignore
index 18dc1b7b58..15a9207874 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,5 @@ node_modules
 *.orig
 BuildInfo.generated.cs
 msbuild.log
+msbuild.binlog
 global.json
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
deleted file mode 100644
index 15adbc0dd9..0000000000
--- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Compatibility.targets
+++ /dev/null
@@ -1,95 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    Either precompilation or Razor SDK should be allowed to run, but not both. We make the decision here about which one
-    wins based on whether the project file has set any properties/items that we care about.
-    
-    We expect these targets to always be imported before the Razor SDK targets so we can make the decision in the least
-    breaking way.
-    
-    There are a few important cases.
-    
-      1.  The project doesn't customize anything. We expect that this is the most common case, and would be the default
-          for applications created in 2.0. The desired outcome is that compilation happens on publish using Razor SDK.
-          We can accomplish this without any special handling in this file, it's the default.
-      
-      2.  The application has explicitly enabled both MvcPrecompilation and Razor SDK. This should result in an error.
-      
-      3.  The project explicitly turned on MvcPrecompilation. The desired outcome is that compilation happens
-          on publish using MvcPrecompilation.
-      
-      4.  The project explicitly turned off MvcPrecompilation. This happens because MvcPrecompilation wasn't a great fit
-          for all scenarios. The desired outcome is that neither Razor SDK nor MvcPrecompilation runs.
-          
-      5.  The project customized some settings from MvcPrecompilation. There are a few of cases here, and the challenge
-          is dealing with evaluation order (both items and properties). The desired outcome is that compilation happens
-          on publish using MvcPrecompilation.
-          
-          5a. If the application just used the properties, we can turn off Razor SDK during evaluation. 
-          
-          5b. If the application adds files to MvcRazorFilesToCompile we can't detect this early enough to disable the
-              the Razor SDK due to evaluation (items vs properties). We have to report an error in this case.
-          
-          5c. If the application explicitly enables Razor SDK, this should result in an error.
-
-    There's no supported case where we used both systems, and there's no case where we need to provide a warning about
-    compatibility or migration.
-  -->
-  <PropertyGroup>
-    <_MvcPrecompilationExplicitlyEnabled Condition="'$(MvcRazorCompileOnPublish)'=='true'">true</_MvcPrecompilationExplicitlyEnabled>
-    <_MvcPrecompilationExplicitlyDisabled Condition="'$(MvcRazorCompileOnPublish)'=='false'">true</_MvcPrecompilationExplicitlyDisabled>
-    <_RazorSdkExplicitlyEnabled Condition="'$(RazorCompileOnBuild)'=='true' or '$(RazorCompileOnPublish)'=='true'">true</_RazorSdkExplicitlyEnabled>
-    <_RazorSdkExplicitlyDisabled Condition="'$(RazorCompileOnBuild)'=='false' and '$(RazorCompileOnPublish)'=='false'">true</_RazorSdkExplicitlyDisabled>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(_MvcPrecompilationExplicitlyEnabled)'=='true' and '$(_RazorSdkExplicitlyEnabled)'=='true'">
-    <!-- 
-      This is case 2, both sets of targets are explicitly enabled. Report an error because we don't support what the
-      project is asking for.
-    -->
-    <_RazorSdkCompatibilityError Include="Using the Razor SDK (RazorCompileOnBuild or RazorCompileOnPublish) and MvcPrecompilation (MvcRazorCompileOnPublish) together is not supported'."/>
-  </ItemGroup>
-
-  <PropertyGroup Condition="'$(_MvcPrecompilationExplicitlyEnabled)'=='true' and '$(_RazorSdkExplicitlyEnabled)'!='true'">
-    <!-- 
-      This is case 3, we should use MvcPrecompilation and ignore the Razor SDK.
-    -->
-    <RazorCompileOnPublish>false</RazorCompileOnPublish>
-    <RazorCompileOnBuild>false</RazorCompileOnBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(_MvcPrecompilationExplicitlyDisabled)'=='true' and '$(_RazorSdkExplicitlyEnabled)'!='true'">
-    <!-- 
-      This is case 4, we should ignore the Razor SDK to be as compatible as possible with the 2.0 expectations.
-    -->
-    <RazorCompileOnPublish>false</RazorCompileOnPublish>
-    <RazorCompileOnBuild>false</RazorCompileOnBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(_MvcPrecompilationExplicitlyEnabled)'!='true' and ('$(MvcRazorOutputPath)'!='' or '$(MvcRazorContentRoot)'!='' or '$(MvcRazorExcludeViewFilesFromPublish)'!='' or '$(MvcRazorExcludeRefAssembliesFromPublish)'!='')">
-    <!-- 
-      If we get here we know that the project file has set some of the MvcPrecompilation properties (case 5).
-      
-      Unfortunately we can't detect if the project has added anything to MvcRazorFilesToCompile at this point, so we can't
-      skip the Razor SDK targets.
-    -->
-    <_MvcPrecompilationImplicitlyEnabled>true</_MvcPrecompilationImplicitlyEnabled>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(_MvcPrecompilationImplicitlyEnabled)'=='true' and '$(_RazorSdkExplicitlyEnabled)'!='true'">
-    <!--
-      This is case 5a, the project file sets MvcPrecompilation setttings, and we can safely turn off the Razor SDK.
-    -->
-    <RazorCompileOnPublish>false</RazorCompileOnPublish>
-    <RazorCompileOnBuild>false</RazorCompileOnBuild>
-  </PropertyGroup>
-
-  <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 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'"/>
-  </ItemGroup>
-
-</Project>
-
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.props b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.props
deleted file mode 100644
index a777086900..0000000000
--- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <!-- 
-      Force the precompilation compatibility targets to be imported before the Razor targets. We only want one of precompilation or Razor SDK
-      to run. We use the precompilation targets to determine which one wins.
-    -->
-    <CustomBeforeRazorSdkTargets>$(MSBuildThisFileDirectory)Microsoft.AspNetCore.Mvc.Razor.Compatibility.targets</CustomBeforeRazorSdkTargets>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets
index e026bad426..a004fb4821 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets
@@ -1,14 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <!--
-    Reports compatibility errors between these targets and the Razor SDK that were discovered during
-    the evaluation phase.
-  -->
-  <Target Name="_ReportRazorSdkCompatibilityError" Condition="'@(_RazorSdkCompatibilityError)'!=''" BeforeTargets="RazorResolveGenerateInputs">
-    <Error Text="@(_RazorSdkCompatibilityError)"/>
-  </Target>
 
-  <Target Name="_ResolveInputArguments" DependsOnTargets="_ReportRazorSdkCompatibilityError">
+  <Target Name="_ResolveInputArguments">
 
     <PropertyGroup>
       <MvcRazorOutputPath Condition="'$(MvcRazorOutputPath)'==''">$(IntermediateOutputPath)</MvcRazorOutputPath>
@@ -170,7 +163,6 @@
 
   <Target Name="_MvcRazorResolveFilesToCompute"
     AfterTargets="ComputeRefAssembliesToPublish"
-    DependsOnTargets="_ReportRazorSdkCompatibilityError"
     Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool'and '$(MvcRazorCompileOnPublish)'=='true'">
 
     <PropertyGroup>
diff --git a/testapps/Directory.Build.props b/testapps/Directory.Build.props
index 70cec336b5..4f2b2a52d6 100644
--- a/testapps/Directory.Build.props
+++ b/testapps/Directory.Build.props
@@ -14,7 +14,4 @@
     <SignAssembly>false</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">false</PublicSign>
   </PropertyGroup>
-
-    <Import Project="..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.props"/>
-
 </Project>