From 90e7e2b4a3f39beb804a0af5f56a9a856b4472ba Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 8 Sep 2022 15:27:30 -0700
Subject: [PATCH 1/3] Try reenabling all the tests listed in the installer repo
 as a lot of them were disabled long ago. Let's see which pass.

---
 test/SdkTests/TestConfig.xml | 100 -----------------------------------
 1 file changed, 100 deletions(-)

diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml
index 7f25ca27a..a8ecb980f 100644
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@@ -45,105 +45,5 @@
   </TestList>
   
   <SkippedTests>
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToUseVB.It_builds_a_vb_wpf_app"
-            Skip="true"
-            Issue="https://github.com/dotnet/wpf/issues/1734"
-            Reason="VB templates removed from wpf"/>
-
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_run"
-            Skip="true"
-            Issue="https://github.com/dotnet/sdk/pull/3574"
-            Reason="Test update needed (in PR)"/>
-
-    <!-- <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_targets_the_right_framework_depending_on_output_type"
-            Skip="true"
-            Issue=""
-            Reason="Test needs to be updated with new patches (along with SDK stage 0 update)"/> -->
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_RID_specific_runnable_output"
-            Skip="true"
-            Issue=""
-            Reason="Test doesn't work with newer RIDs"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_framework_dependent_RID_specific_runnable_output"
-            Skip="true"
-            Issue=""
-            Reason="Test doesn't work with newer RIDs"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_handles_mismatched_implicit_package_versions"
-            Skip="true"
-            Issue=""
-            Reason="Test doesn't work with newer RIDs"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithTransitiveProjectRefs.It_builds_the_project_successfully"
-            Skip="true"
-            Issue=""
-            Reason="Needs .NET Core 1.1"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrary.It_builds_the_project_successfully"
-            Skip="true"
-            Issue=""
-            Reason="Needs .NET Core 1.1"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrary.It_builds_the_project_successfully_twice"
-            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.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.GivenThatWeWantToBuildADesktopExeWithFSharp.It_builds_a_simple_desktop_app"
-            Skip="true"
-            Issue="https://github.com/dotnet/coreclr/issues/27275"
-            Reason="F# compiler is failing on .NET 5 runtime"
-            />
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildALibraryWithFSharp.It_builds_the_library_successfully"
-            Skip="true"
-            Issue="https://github.com/dotnet/coreclr/issues/27275"
-            Reason="F# compiler is failing on .NET 5 runtime"
-            /> -->
-
-    <Method Name="Microsoft.NET.Publish.Tests.PublishWpfApp.It_publishes_and_runs_self_contained_wpf_app"
-            Skip="true"
-            Issue=""
-            Reason="Assumes `dotnet new wpf`produces a netcoreapp3.1 app, will get fixed when sdk takes .NET 5 stage 0"
-            />
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.It_does_not_download_desktop_targeting_packs_on_unix"
-            Skip="true"
-            Issue=""
-            Reason="Assumes netcoreapp3.1 targeting pack is bundled, which it is not in 5.0 SDK. Will resolve when sdk takes newer stage 0 and hits same issue."/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.It_builds_on_windows_with_the_windows_desktop_sdk"
-            Skip="true"
-            Issue="https://github.com/dotnet/wpf/issues/2363"
-            Reason="Desktop SDK missing required files."/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_runs_single_file_apps"
-            Skip="true"
-            Issue=""
-            Reason="Need all .NET core runtime"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_hello_world_app"
-            Skip="true"
-            Issue=""
-            Reason="https://github.com/dotnet/installer/pull/8966#issuecomment-721111308"/>
   </SkippedTests>
 </Tests>

From ebd867dbb0dd32a1d864bd2e25c8c4f77fdfcfe6 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 16 Sep 2022 11:17:51 -0700
Subject: [PATCH 2/3] Add back another failing test.

---
 test/SdkTests/TestConfig.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml
index 6e874025c..e711a24b1 100644
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@@ -49,6 +49,10 @@
             Skip="true"
             Issue="https://github.com/dotnet/sdk/pull/3574"
             Reason="Test update needed (in PR)"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_runs_single_file_apps"
+            Skip="true"
+            Issue=""
+            Reason="Need all .NET core runtime"/>
     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_keeps_symbols_by_default"
             Skip="true"
             Issue=""

From a3f54d61f0824c3d9ed8be1e9a70c20ba8ab9bd2 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 16 Sep 2022 13:30:52 -0700
Subject: [PATCH 3/3] Add back a few more exclusions

---
 test/SdkTests/TestConfig.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml
index e711a24b1..f7b88ab47 100644
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@@ -53,6 +53,14 @@
             Skip="true"
             Issue=""
             Reason="Need all .NET core runtime"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_RID_specific_runnable_output"
+            Skip="true"
+            Issue=""
+            Reason="Test doesn't work with newer RIDs"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_framework_dependent_RID_specific_runnable_output"
+            Skip="true"
+            Issue=""
+            Reason="Test doesn't work with newer RIDs"/>
     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_keeps_symbols_by_default"
             Skip="true"
             Issue=""