From de8aa5bffa759ccf2511875895db648e316ea86e Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 15 Jul 2019 18:18:29 -0700
Subject: [PATCH] Desktop tests \n\nCommit migrated from
 https://github.com/dotnet/aspnetcore-tooling/commit/6f5da448efa6a4aa756cb182bbd30d0cc3c137d6

---
 .../BuildIntegrationTest22NetFx.cs            |  2 ++
 .../BuildIntegrationTestLegacy.cs             | 31 ++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
index b4b5e993c2..1afad21f83 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest22NetFx.cs
@@ -3,10 +3,12 @@
 
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
+    [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
     public class BuildIntegrationTest22NetFx : BuildIntegrationTestLegacy
     {
         public BuildIntegrationTest22NetFx(LegacyBuildServerTestFixture buildServer)
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
index f3f7e38a6e..51b65c384e 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTestLegacy.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
@@ -29,8 +30,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             return new Disposable();
         }
 
-        [Fact]
-        public async Task Building_Project()
+        [ConditionalFact]
+        public virtual async Task Building_Project()
         {
             using (CreateTestProject())
             {
@@ -54,7 +55,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
+        [ConditionalFact]
         public virtual async Task BuildingProject_CopyToOutputDirectoryFiles()
         {
             using (CreateTestProject())
@@ -71,8 +72,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
-        public async Task Publish_Project()
+        [ConditionalFact]
+        public virtual async Task Publish_Project()
         {
             using (CreateTestProject())
             {
@@ -91,8 +92,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
-        public async Task Publish_NoopsWithMvcRazorCompileOnPublish_False()
+        [ConditionalFact]
+        public virtual async Task Publish_NoopsWithMvcRazorCompileOnPublish_False()
         {
             using (CreateTestProject())
             {
@@ -108,8 +109,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact] // This will use the old precompilation tool, RazorSDK shouldn't get involved.
-        public async Task Build_WithMvcRazorCompileOnPublish_Noops()
+        [ConditionalFact] // This will use the old precompilation tool, RazorSDK shouldn't get involved.
+        public virtual async Task Build_WithMvcRazorCompileOnPublish_Noops()
         {
             using (CreateTestProject())
             {
@@ -124,8 +125,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
-        public async Task Build_DoesNotAddRelatedAssemblyPart_IfToolSetIsNotRazorSdk()
+        [ConditionalFact]
+        public virtual async Task Build_DoesNotAddRelatedAssemblyPart_IfToolSetIsNotRazorSdk()
         {
             using (CreateTestProject())
             {
@@ -139,8 +140,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
-        public async Task Build_DoesNotPrintsWarnings_IfProjectFileContainsRazorFiles()
+        [ConditionalFact]
+        public virtual async Task Build_DoesNotPrintsWarnings_IfProjectFileContainsRazorFiles()
         {
             using (CreateTestProject())
             {
@@ -152,8 +153,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        [Fact]
-        public async Task Publish_IncludesRefAssemblies_WhenCopyRefAssembliesToPublishDirectoryIsSet()
+        [ConditionalFact]
+        public virtual async Task Publish_IncludesRefAssemblies_WhenCopyRefAssembliesToPublishDirectoryIsSet()
         {
             using (CreateTestProject())
             {