Merge branch 'merge/release/2.2-to-master'

.vsts-pipelines/builds/ci-public.yml

@@ -9,25 +9,7 @@ resources:
     type: github
     endpoint: DotNet-Bot GitHub Connection
     name: aspnet/BuildTools
-    ref: refs/heads/master
-    
-# Workaround https://dotnet.visualstudio.com/internal/_workitems/edit/28.
-# When this is fixed, we can simplify the build to just this
-#
-# phases:
-# - template: .vsts-pipelines/templates/project-ci.yml@buildtools
-#
+    ref: refs/heads/release/2.2
 
 phases:
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: macOS
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: Windows
-- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
-  parameters:
-    agentOs: Linux
-    # Workaround https://dotnet.visualstudio.com/internal/_workitems/edit/28
-    # VSTS hangs indefinitely when running Razor tests.
-    buildArgs: "-p:SkipTests=true"
+- template: .vsts-pipelines/templates/project-ci.yml@buildtools

test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerIntegrationTest.cs

@@ -143,7 +143,9 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             // it reaches server creation part.
         }
 
-        [Fact]
+        // Skipping on linux/mac because of https://github.com/aspnet/Razor/issues/2507.
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         [InitializeTestProject("SimpleMvc")]
         public async Task ManualServerShutdown_NoPipeName_ShutsDownServer()
         {