From fa8accfa59264c213341a11d52ba8e471b655cc3 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] 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>