From d097adee5f2d5d95f6a0e92f56678573ab482d3d Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 8 Aug 2018 10:48:16 -0700 Subject: [PATCH] Unblock VSTS linux builds (#2526) * Unblock VSTS linux builds * Updated yml --- .vsts-pipelines/builds/ci-public.yml | 20 +------------------ .../BuildServerIntegrationTest.cs | 4 +++- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml index 21b9d89282..f5087d9c30 100644 --- a/.vsts-pipelines/builds/ci-public.yml +++ b/.vsts-pipelines/builds/ci-public.yml @@ -10,24 +10,6 @@ resources: endpoint: DotNet-Bot GitHub Connection name: aspnet/BuildTools ref: refs/heads/release/2.2 - -# 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 -# 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 diff --git a/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerIntegrationTest.cs b/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerIntegrationTest.cs index e570b9ee93..efd1187c6e 100644 --- a/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerIntegrationTest.cs +++ b/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() {