Merge pull request #18490 from jmarolf/test-move/run-project-system-vsi

Add option to run just netcore integration tests

build/scripts/cibuild.ps1

@@ -6,6 +6,7 @@ param (
     [switch]$testPerfCorrectness = $false,
     [switch]$testPerfRun = $false,
     [switch]$testVsi = $false,
+    [switch]$testVsiNetCore = $false,
     [switch]$skipTest = $false,
     [switch]$skipRestore = $false,
     [switch]$skipCommitPrinting = $false,
@@ -21,6 +22,8 @@ function Print-Usage() {
     Write-Host "  -release Perform release build."
     Write-Host "  -test32  Run unit tests in the 32-bit runner.  This is the default."
     Write-Host "  -test64  Run units tests in the 64-bit runner."
+    Write-Host "  -$testVsi  Run all integration tests."
+    Write-Host "  -$testVsiNetCore  Run just dotnet core integration tests."
 }
 
 function Run-MSBuild() {
@@ -139,9 +142,16 @@ try {
     $target = if ($skipTest) { "Build" } else { "BuildAndTest" }
     $test64Arg = if ($test64) { "true" } else { "false" }
     $testVsiArg = if ($testVsi) { "true" } else { "false" }
+    $testVsiArg = if ($testVsiNetCore) { "true" } else { "false" }
     $buildLog = Join-Path $binariesdir "Build.log"
 
-    Run-MSBuild /p:BootstrapBuildPath="$bootstrapDir" BuildAndTest.proj /t:$target /p:Configuration=$buildConfiguration /p:Test64=$test64Arg /p:TestVsi=$testVsiArg /p:PathMap="$($repoDir)=q:\roslyn" /p:Feature=pdb-path-determinism /fileloggerparameters:LogFile="$buildLog"`;verbosity=diagnostic /p:DeployExtension=false
+    if ($testVsiNetCore) { 
+        Run-MSBuild /p:BootstrapBuildPath="$bootstrapDir" BuildAndTest.proj /t:$target /p:Configuration=$buildConfiguration /p:Test64=$test64Arg /p:TestVsi=$testVsiArg /p:Trait="Feature=NetCore" /p:PathMap="$($repoDir)=q:\roslyn" /p:Feature=pdb-path-determinism /fileloggerparameters:LogFile="$buildLog"`;verbosity=diagnostic /p:DeployExtension=false
+    }
+    else {
+        Run-MSBuild /p:BootstrapBuildPath="$bootstrapDir" BuildAndTest.proj /t:$target /p:Configuration=$buildConfiguration /p:Test64=$test64Arg /p:TestVsi=$testVsiArg /p:PathMap="$($repoDir)=q:\roslyn" /p:Feature=pdb-path-determinism /fileloggerparameters:LogFile="$buildLog"`;verbosity=diagnostic /p:DeployExtension=false
+    }
+
     exit 0
 }
 catch {

src/Test/Utilities/Desktop/Traits.cs

@@ -18,6 +18,7 @@ public static class Features
             public const string FixIncorrectTokens = nameof(FixIncorrectTokens);
             public const string Formatting = nameof(Formatting);
             public const string LinkedFileDiffMerging = nameof(LinkedFileDiffMerging);
+            public const string NetCore = nameof(NetCore);
             public const string NormalizeModifiersOrOperators = nameof(NormalizeModifiersOrOperators);
             public const string ReduceTokens = nameof(ReduceTokens);
             public const string RemoveUnnecessaryLineContinuation = nameof(RemoveUnnecessaryLineContinuation);

src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpErrorListNetCore.cs

@@ -15,18 +15,21 @@ public CSharpErrorListNetCore(VisualStudioInstanceFactory instanceFactory)
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.ErrorList)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void ErrorList()
         {
             base.ErrorList();
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.ErrorList)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void ErrorLevelWarning()
         {
             base.ErrorLevelWarning();
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.ErrorList)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void ErrorsDuringMethodBodyEditing()
         {
             base.ErrorsDuringMethodBodyEditing();

src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpSquigglesNetCore.cs

@@ -15,12 +15,14 @@ public CSharpSquigglesNetCore(VisualStudioInstanceFactory instanceFactory)
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.ErrorSquiggles)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void VerifySyntaxErrorSquiggles()
         {
             base.VerifySyntaxErrorSquiggles();
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.ErrorSquiggles)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void VerifySemanticErrorSquiggles()
         {
             base.VerifySemanticErrorSquiggles();

src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicErrorListNetCore.cs

@@ -15,6 +15,7 @@ public BasicErrorListNetCore(VisualStudioInstanceFactory instanceFactory)
 
         [Test.Utilities.WorkItem(1825 , "https://github.com/dotnet/roslyn-project-system/issues/1825")]
         [Fact(Skip = "https://github.com/dotnet/roslyn-project-system/issues/1825"), Trait(Traits.Feature, Traits.Features.ErrorList)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void ErrorList()
         {
             base.ErrorList();
@@ -22,6 +23,7 @@ public override void ErrorList()
 
         [Test.Utilities.WorkItem(1825 , "https://github.com/dotnet/roslyn-project-system/issues/1825")]
         [Fact(Skip = "https://github.com/dotnet/roslyn-project-system/issues/1825"), Trait(Traits.Feature, Traits.Features.ErrorList)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void ErrorsDuringMethodBodyEditing()
         {
             base.ErrorsDuringMethodBodyEditing();

src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicSquigglesNetCore.cs

@@ -16,6 +16,7 @@ public BasicSquigglesNetCore(VisualStudioInstanceFactory instanceFactory)
 
         [Test.Utilities.WorkItem(1825, "https://github.com/dotnet/roslyn-project-system/issues/1825")]
         [Fact(Skip = "1825"), Trait(Traits.Feature, Traits.Features.ErrorSquiggles)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void VerifySyntaxErrorSquiggles()
         {
             base.VerifySyntaxErrorSquiggles();
@@ -23,6 +24,7 @@ public override void VerifySyntaxErrorSquiggles()
 
         [Test.Utilities.WorkItem(1825, "https://github.com/dotnet/roslyn-project-system/issues/1825")]
         [Fact(Skip = "1825"), Trait(Traits.Feature, Traits.Features.ErrorSquiggles)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void VerifySemanticErrorSquiggles()
         {
             base.VerifySemanticErrorSquiggles();

src/VisualStudio/IntegrationTest/IntegrationTests/Workspace/WorkspacesNetCore.cs

@@ -18,12 +18,14 @@ public WorkspacesNetCore(VisualStudioInstanceFactory instanceFactory)
         }
 
         [Fact(Skip = "https://github.com/dotnet/roslyn-project-system/issues/1825"), Trait(Traits.Feature, Traits.Features.Workspace)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void OpenCSharpThenVBSolution()
         {
             base.OpenCSharpThenVBSolution();
         }
 
         [Fact(Skip = "https://github.com/dotnet/roslyn-project-system/issues/1826"), Trait(Traits.Feature, Traits.Features.Workspace)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void MetadataReference()
         {
             var project = new ProjectUtils.Project(ProjectName);
@@ -46,6 +48,7 @@ public override void ProjectReference()
         }
 
         [Fact(Skip = "https://github.com/dotnet/roslyn-project-system/issues/1825"), Trait(Traits.Feature, Traits.Features.Workspace)]
+        [Trait(Traits.Feature, Traits.Features.NetCore)]
         public override void ProjectProperties()
         {
             VisualStudio.SolutionExplorer.CreateSolution(nameof(WorkspacesDesktop));