Skip to content

Commit 2081663

Browse files
committed
Re-enable desktop msbuild tests
Fixes #2208
1 parent 7cba5ed commit 2081663

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

build/buildpipeline/windows.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// 'node' indicates to Jenkins that the enclosed block runs on a node that matches
44
// the label 'windows-with-vs'
5-
simpleNode('Windows_NT','latest') {
5+
simpleNode('Windows.10.Enterprise.RS3.ASPNET') {
66
stage ('Checking out source') {
77
checkout scm
88
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ public BuildIntegrationTest(BuildServerTestFixture buildServer)
2525
public Task Build_SimpleMvc_UsingDotnetMSBuildAndWithoutBuildServer_CanBuildSuccessfully()
2626
=> Build_SimpleMvc_WithoutBuildServer_CanBuildSuccessfully(MSBuildProcessKind.Dotnet);
2727

28-
[ConditionalFact(Skip = "https://github.com/aspnet/Razor/issues/2208")]
29-
[OSSkipCondition(OperatingSystems.Linux)]
30-
[OSSkipCondition(OperatingSystems.MacOSX)]
28+
[ConditionalFact]
29+
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
3130
[InitializeTestProject("SimpleMvc")]
3231
public Task Build_SimpleMvc_UsingDesktopMSBuildAndWithoutBuildServer_CanBuildSuccessfully()
3332
=> Build_SimpleMvc_WithoutBuildServer_CanBuildSuccessfully(MSBuildProcessKind.Desktop);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public BuildServerIntegrationTest(BuildServerTestFixture buildServer)
3030
public Task Build_SimpleMvc_WithServer_UsingDotnetMSBuild_CanBuildSuccessfully()
3131
=> Build_SimpleMvc_CanBuildSuccessfully(MSBuildProcessKind.Dotnet);
3232

33-
[ConditionalFact(Skip = "https://github.com/aspnet/Razor/issues/2208")]
33+
[ConditionalFact]
3434
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
3535
[InitializeTestProject("SimpleMvc")]
3636
public Task Build_SimpleMvc_WithServer_UsingDesktopMSBuild_CanBuildSuccessfully()

0 commit comments

Comments
 (0)