From 27c6ad410e2d7b7cfd3da0e654583a308ae0c59e Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 26 May 2017 16:32:57 -0700
Subject: [PATCH] Skip desktop testing to work around corefx issue.

#128
---
 .../RuntimeFlavors.cs                                    | 9 +++++----
 .../SimpleAppX86DesktopOnlyTest.cs                       | 2 +-
 .../ClassLibraryWithPrecompiledViews.csproj              | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

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