From 6dee2f548a6acd3673de4ce65fab5d201e894230 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 11 Oct 2019 13:53:16 -0700
Subject: [PATCH] Ensure Microsoft.AspNetCore.Razor.RuntimeCompilation has the
 right build targets (#14863)

* Include build and build transitive folders in RuntimeCompilation package
* Use a different folder name to allow GitHub indexing. See https://github.com/aspnet/AspNetCore/issues/14846
* Add a test to verify transitive build targets work

Fixes https://github.com/aspnet/AspNetCore/issues/14813
Fixes https://github.com/aspnet/AspNetCore/issues/12768
---
 .../Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj   | 3 ++-
 .../Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets  | 0
 .../test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj   | 3 ++-
 src/ProjectTemplates/test/MvcTemplateTest.cs                   | 3 +--
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename src/Mvc/Mvc.Razor.RuntimeCompilation/src/{build/netcoreapp3.0 => targets}/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets (100%)

diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
index 5d40de9229..1476267dfc 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
@@ -23,6 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="build\$(DefaultNetCoreTargetFramework)\*" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)" />
+    <None Include="targets\$(PackageId).targets" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\$(PackageId).targets" />
+    <None Include="targets\$(PackageId).targets" Pack="true" PackagePath="buildTransitive\$(DefaultNetCoreTargetFramework)\$(PackageId).targets" />
   </ItemGroup>
 </Project>
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/build/netcoreapp3.0/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/targets/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets
similarity index 100%
rename from src/Mvc/Mvc.Razor.RuntimeCompilation/src/build/netcoreapp3.0/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets
rename to src/Mvc/Mvc.Razor.RuntimeCompilation/src/targets/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
index 6f9e357218..4664e85890 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
     <!-- We have tests that test runtime view compilation. -->
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
     <IsTestAssetProject>true</IsTestAssetProject>
@@ -21,4 +20,6 @@
     <Reference Include="Microsoft.AspNetCore.Diagnostics" />
   </ItemGroup>
 
+  <Import Project="..\..\..\Mvc.Razor.RuntimeCompilation\src\targets\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets" />
+
 </Project>
diff --git a/src/ProjectTemplates/test/MvcTemplateTest.cs b/src/ProjectTemplates/test/MvcTemplateTest.cs
index 9ebaf1afc6..af43914ed2 100644
--- a/src/ProjectTemplates/test/MvcTemplateTest.cs
+++ b/src/ProjectTemplates/test/MvcTemplateTest.cs
@@ -25,13 +25,12 @@ namespace Templates.Test
         public ProjectFactoryFixture ProjectFactory { get; }
         public ITestOutputHelper Output { get; }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/14022")]
+        [Fact]
         public async Task MvcTemplate_NoAuthFSharp() => await MvcTemplateCore(languageOverride: "F#");
 
         [Fact]
         public async Task MvcTemplate_NoAuthCSharp() => await MvcTemplateCore(languageOverride: null);
 
-
         private async Task MvcTemplateCore(string languageOverride)
         {
             Project = await ProjectFactory.GetOrCreateProject("mvcnoauth" + (languageOverride == "F#" ? "fsharp" : "csharp"), Output);