From db909922e46b4ad73d96c793d6651864d04fb3de Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 2 Jun 2017 16:45:13 -0700
Subject: [PATCH 1/2] Revert "Skip desktop testing to work around corefx
 issue."

This reverts commit 27c6ad410e2d7b7cfd3da0e654583a308ae0c59e.
---
 .../RuntimeFlavors.cs                                    | 9 ++++-----
 .../SimpleAppX86DesktopOnlyTest.cs                       | 2 +-
 .../ClassLibraryWithPrecompiledViews.csproj              | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/RuntimeFlavors.cs b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/RuntimeFlavors.cs
index b40a7e54eb..c1bd137100 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/RuntimeFlavors.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/RuntimeFlavors.cs
@@ -15,11 +15,10 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation
             get
             {
                 yield return RuntimeFlavor.CoreClr;
-                // Can't run on CLR until https://github.com/dotnet/corefx/issues/20364 is resolved.
-                //if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                //{
-                //    yield return RuntimeFlavor.Clr;
-                //}
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    yield return RuntimeFlavor.Clr;
+                }
             }
         }
 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/SimpleAppX86DesktopOnlyTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/SimpleAppX86DesktopOnlyTest.cs
index 12d32351ad..e9cbdfead2 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/SimpleAppX86DesktopOnlyTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/SimpleAppX86DesktopOnlyTest.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation
 
         public ApplicationTestFixture Fixture { get; }
 
-        [Fact(Skip = "https://github.com/dotnet/corefx/issues/20364")]
+        [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/134")]
         public async Task Precompilation_WorksForSimpleApps()
         {
             // Arrange
diff --git a/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj b/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj
index f6aaa943f8..5d65410110 100644
--- a/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj
+++ b/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj
@@ -12,6 +12,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
-  <Target Name="PrecompileRazorViews" AfterTargets="Build" DependsOnTargets="MvcRazorPrecompile" Condition="'$(TargetFramework)'!='' AND '$(TargetFramework)'!='net461'" />
+  <Target Name="PrecompileRazorViews" AfterTargets="Build" DependsOnTargets="MvcRazorPrecompile" Condition="'$(TargetFramework)'!=''" />
 
 </Project>

From 265c980c2bce0eb7d92ed989ae9d5b81c697a0d4 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Mon, 5 Jun 2017 16:42:04 -0700
Subject: [PATCH 2/2] Manually construct the precompilation nupkg.

- We needed to manually construct the precompilation nupkg in order for the tool to work in 32 and 64 bitness OS'.
---
 ...spNetCore.Mvc.Razor.ViewCompilation.csproj | 22 +++++++++++++++++--
 .../lib/net461/_._                            |  0
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/net461/_._

diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj
index 3b984b59f5..c0b303a5f1 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj
@@ -11,11 +11,29 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <OutputType>exe</OutputType>
     <X86ProjectDirectory>..\..\tools\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86\</X86ProjectDirectory>
+
+    <!--
+      This prevents dotnet from automatically generating a lib/tfm/*.dll; in turn we're then able
+      to exclude the lib/net461 and manually construct only the necessary folders:
+      - lib/netcoreapp2.0/...
+      - runtimes/win7-x64/lib/...
+      - runtimes/win7-x86/lib/...
+    -->
+    <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="build\**\*" Pack="true" PackagePath="%(Identity)" />
-    <None Include="$(X86ProjectDirectory)\bin\$(Configuration)\net461\win7-x86\$(MSBuildThisFileName)-x86.exe" Pack="true" PackagePath="lib\net461\$(MSBuildThisFileName)-x86.exe" />
+    <None Include="build\common.targets" Pack="true" PackagePath="%(Identity)" />
+    <None Include="lib\net461\_._" Pack="true" PackagePath="%(Identity)" />
+    <None Include="build\netcoreapp2.0\*" Pack="true" PackagePath="%(Identity)" />
+    <None Include="bin\$(Configuration)\netcoreapp2.0\$(AssemblyName).dll" Pack="true" PackagePath="lib\netcoreapp2.0\$(AssemblyName).dll" />
+    <None Include="bin\$(Configuration)\netcoreapp2.0\$(AssemblyName).runtimeconfig.json" Pack="true" PackagePath="lib\netcoreapp2.0\$(AssemblyName).runtimeconfig.json" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <None Include="build\net461\*" Pack="true" PackagePath="%(Identity)" />
+    <None Include="bin\$(Configuration)\net461\win7-x64\$(AssemblyName).exe" Pack="true" PackagePath="runtimes\win7-x64\lib\net461\$(AssemblyName).exe" />
+    <None Include="$(X86ProjectDirectory)\bin\$(Configuration)\net461\win7-x86\$(AssemblyName)-x86.exe" Pack="true" PackagePath="runtimes\win7-x86\lib\net461\$(AssemblyName)-x86.exe" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/net461/_._ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/net461/_._
new file mode 100644
index 0000000000..e69de29bb2