From afa467d3db77c4f4cce05b372bd2635857b39f33 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 22 Aug 2019 11:17:41 -0700
Subject: [PATCH] Run a specific list of SDK tests as integration tests

Instead of trying to get all of the SDK tests to run, create a list of tests to use as integration tests
---
 test/SdkTests/SdkTests.csproj |  1 +
 test/SdkTests/TestConfig.xml  | 81 +++++++++++++++++++++++++++--------
 2 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj
index dd7a02253..e00bd4a47 100644
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@@ -224,6 +224,7 @@
       <TestArgs>$(TestArgs) -xml "$(ResultsXmlPath)"</TestArgs>
       <TestArgs>$(TestArgs) -html "$(ResultsHtmlPath)" $(TestRunnerAdditionalArguments)</TestArgs>
       <TestArgs>$(TestArgs) &gt; $(ResultsStdOutPath) 2&gt;&amp;1</TestArgs>
+      <TestArgs>$(TestArgs) -testList SdkIntegrationTests</TestArgs>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml
index 6b3aec8bc..3a7a4998c 100644
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@@ -1,4 +1,50 @@
 <Tests>
+  <TestList Name="SdkIntegrationTests">
+    <!-- Build tests -->
+    <Method Name="Microsoft.NET.Build.Tests.AppHostTests.It_builds_a_runnable_apphost_by_default" />
+    <Class Name="Microsoft.NET.Build.Tests.DesignTimeBuildTests" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TransitiveFrameworkReferenceFromPackageReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TransitiveFrameworkReferenceFromProjectReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.WPFFrameworkReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.WindowsDesktopFrameworkReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.WindowsFormAndWPFFrameworkReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.WindowsFormsFrameworkReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantBuildsToBeIncremental.ResolvePackageAssets_runs_incrementally" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildADesktopExe.It_builds_a_simple_desktop_app" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildADesktopExeWithFSharp" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildALibrary.It_builds_the_library_successfully" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildALibraryWithFSharp.It_builds_the_library_successfully" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildALibraryWithVB.It_builds_the_library_successfully" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.BuildWithTransitiveReferenceToNetCoreAppPackage" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_with_conflicts_from_the_output_folder" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_the_app_from_the_output_folder" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_the_app_with_conflicts_from_the_output_folder" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetStandard2Library" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_builds_a_runnable_output" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAUnitTestProject" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithTransitiveProjectRefs.It_builds_the_project_successfully" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToResolveConflicts.FilesFromAspNetCoreSharedFrameworkAreNotIncluded" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenThatWeWantToUseVB" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps" />
+    
+    <!-- Publish tests -->
+    <Class Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp" />
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_run" />
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_self_contained_apps_to_the_publish_folder_and_the_app_should_run" />
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_with_a_publish_profile" />
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASelfContainedApp.It_can_make_a_Windows_GUI_exe" />
+    <Class Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp" />
+    <Class Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp" />
+    <Class Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunCrossgen" />
+    <Class Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink" />
+    <Class Name="Microsoft.NET.Publish.Tests.PublishWebApp" />
+    <Class Name="Microsoft.NET.Publish.Tests.PublishWpfApp" />
+    
+  </TestList>
+  
+  <SkippedTests>
     <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.RuntimeFrameworkVersionCanBeSpecifiedOnFrameworkReference"
             Skip="true"
             Issue="https://github.com/dotnet/sdk/pull/3221"
@@ -70,24 +116,25 @@
             Issue=""
             Reason="Needs .NET Core 1.1"/>
 
-  <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantAllResourcesInSatellite.TestSatelliteResources"
-          Skip="true"
-          Issue=""
-          Reason="Needs .NET Core 1.1"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantAllResourcesInSatellite.TestSatelliteResources"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
 
-  <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantAllResourcesInSatellite.It_retrieves_strings_successfully"
-          Skip="true"
-          Issue=""
-          Reason="Needs .NET Core 1.1"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantAllResourcesInSatellite.It_retrieves_strings_successfully"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
 
-  <Method Name="Microsoft.NET.Build.Tests.GivenThereAreDefaultItems.Compile_items_can_be_explicitly_specified_while_default_EmbeddedResource_items_are_used"
-          Skip="true"
-          Issue=""
-          Reason="Needs .NET Core 1.1"/>
-
-  <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_succeeds_when_RuntimeIdentifier_and_PlatformTarget_mismatch_but_PT_is_AnyCPU"
-          Skip="true"
-          Issue=""
-          Reason="Needs .NET Core 1.1"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenThereAreDefaultItems.Compile_items_can_be_explicitly_specified_while_default_EmbeddedResource_items_are_used"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
 
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_succeeds_when_RuntimeIdentifier_and_PlatformTarget_mismatch_but_PT_is_AnyCPU"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
+    
+  </SkippedTests>
 </Tests>