From 84ea85192bb26fefe33648e5aba912f6828f912c Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 26 Jan 2024 11:46:10 -0800
Subject: [PATCH 1/4] Separate out the test exclusions that apply to stable
 SDKs when we're targeting the latest downlevel runtime.

This should simplify things as we want to run these tests at least some of the time but codeflow ends up removing them.
---
 test/SdkTests/SdkTests.csproj         |   6 +-
 test/SdkTests/TestConfig.xml          | 200 --------------------------
 test/SdkTests/TestConfigStableSDK.xml | 200 ++++++++++++++++++++++++++
 3 files changed, 205 insertions(+), 201 deletions(-)
 create mode 100644 test/SdkTests/TestConfigStableSDK.xml

diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj
index 8902bb1a6..dd8620df0 100644
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@@ -1,4 +1,4 @@
-<Project>
+<Project>
 
   <PropertyGroup>
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
@@ -215,6 +215,10 @@
       <TestArgs>$(TestArgs) -testList SdkIntegrationTests</TestArgs>
     </PropertyGroup>
 
+    <PropertyGroup Condition="$(StabilizePackageVersion) == 'true'">
+      <!-- Add list of tests to skip in stable SDKS -->
+      <TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipStableSDK.xml"</TestArgs>
+    </PropertyGroup>
 
     <PropertyGroup Condition="('$(OS)' == 'Windows_NT') And ('$(Architecture)' == 'x86')">
       <!-- Add list of tests to skip on x86 -->
diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml
index 245dd40e7..9b38840fd 100644
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@@ -45,10 +45,6 @@
   </TestList>
   
   <SkippedTests>
-    <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.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_runs_single_file_apps"
             Skip="true"
             Issue=""
@@ -61,205 +57,9 @@
             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=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_links_simple_app_without_analysis_warnings_and_it_runs"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_does_not_include_leftover_artifacts_on_second_run"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_warning_level_independently"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_runs_incrementally"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_symbols_option_can_override_defaults_from_debugger_support"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_removes_symbols_when_debugger_support_is_disabled"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.PrepareForILLink_can_set_IsTrimmable"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_remove_symbols"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_defaults_keep_nonframework"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_root_descriptor"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_global_TrimMode"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_only_runs_when_switch_is_enabled"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_error_on_nonboolean_optimization_flag"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_a_single_file_including_pdbs"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.PrepareForILLink_can_set_TrimMode"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_enable_analysis_warnings"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_error_on_portable_app"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_not_as_errors"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.TrimmingOptions_are_defaulted_correctly_on_trimmed_apps"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_errors_fail_the_build"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_as_errors"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_roots_IntermediateAssembly"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_as_errors_independently"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_disable_analysis_warnings"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_ignore_warnings"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_analysis_level"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_enable_analysis_warnings_without_PublishTrimmed"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning_when_trim_analysis_warnings_are_suppressed_on_net6plus"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_old_defaults_keep_nonframework"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_dont_display_time_awareness_message_on_incremental_build"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_IsTrimmable_metadata_can_override_attribute"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_IsTrimmable_attribute"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning_up_to_net5_by_default"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_dont_display_informational_warning_by_default_on_net6plus"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_analysis_warnings_are_enabled_by_default"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_TrimMode_applies_to_IsTrimmable_assemblies"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Build.Tests.AppHostTests.It_builds_a_runnable_apphost_by_default"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_can_include_ni_pdbs_in_single_file"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.WindowsFormsAppCanBuildOnNonWindows"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_framework_assemblies"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_hello_world_app_trim_mode_link"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_hello_world_app_trim_mode_copyused"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_publishing_single_file_with_win7"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_net7_defaults_trim_nonframework"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libraries"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted_libraries"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_use_latest_with_unsupported_target_framework"
             Skip="true"
             Issue=""
             Reason="Requires props file not in installer repo"/>
-     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>   
   </SkippedTests>
 </Tests>
diff --git a/test/SdkTests/TestConfigStableSDK.xml b/test/SdkTests/TestConfigStableSDK.xml
new file mode 100644
index 000000000..7140b5f76
--- /dev/null
+++ b/test/SdkTests/TestConfigStableSDK.xml
@@ -0,0 +1,200 @@
+<Tests>
+  <SkippedTests>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_keeps_symbols_by_default"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_links_simple_app_without_analysis_warnings_and_it_runs"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_does_not_include_leftover_artifacts_on_second_run"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_warning_level_independently"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_runs_incrementally"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_symbols_option_can_override_defaults_from_debugger_support"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_removes_symbols_when_debugger_support_is_disabled"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.PrepareForILLink_can_set_IsTrimmable"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_remove_symbols"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_defaults_keep_nonframework"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_root_descriptor"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_global_TrimMode"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_only_runs_when_switch_is_enabled"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_error_on_nonboolean_optimization_flag"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_a_single_file_including_pdbs"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.PrepareForILLink_can_set_TrimMode"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_enable_analysis_warnings"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_error_on_portable_app"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_not_as_errors"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.TrimmingOptions_are_defaulted_correctly_on_trimmed_apps"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_errors_fail_the_build"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_as_errors"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_roots_IntermediateAssembly"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_treat_warnings_as_errors_independently"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_disable_analysis_warnings"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_ignore_warnings"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_analysis_level"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_accepts_option_to_enable_analysis_warnings_without_PublishTrimmed"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning_when_trim_analysis_warnings_are_suppressed_on_net6plus"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_old_defaults_keep_nonframework"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_dont_display_time_awareness_message_on_incremental_build"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_IsTrimmable_metadata_can_override_attribute"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_respects_IsTrimmable_attribute"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning_up_to_net5_by_default"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_dont_display_informational_warning_by_default_on_net6plus"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_analysis_warnings_are_enabled_by_default"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_TrimMode_applies_to_IsTrimmable_assemblies"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Build.Tests.AppHostTests.It_builds_a_runnable_apphost_by_default"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_can_include_ni_pdbs_in_single_file"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.WindowsFormsAppCanBuildOnNonWindows"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_framework_assemblies"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_hello_world_app_trim_mode_link"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_hello_world_app_trim_mode_copyused"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_publishing_single_file_with_win7"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_net7_defaults_trim_nonframework"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.IsTrimmable_warns_when_expected_for_not_correctly_multitargeted_libraries"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.EnableSingleFile_warns_when_expected_for_not_correctly_multitargeted_libraries"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>   
+  </SkippedTests>
+</Tests>

From 8a35ac3fbb2bf53da560d2266a368fe2b6c2ee2c Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 26 Jan 2024 15:00:03 -0800
Subject: [PATCH 2/4] Rename the XML file Add a specific test back to the
 exclusion list Move two tests to the linux-only exclusion list

---
 test/SdkTests/TestConfig.xml                              | 4 ++++
 .../{TestConfigStableSDK.xml => TestToSkipStableSDK.xml}  | 8 --------
 test/SdkTests/TestsToSkipLinux.xml                        | 8 ++++++++
 3 files changed, 12 insertions(+), 8 deletions(-)
 rename test/SdkTests/{TestConfigStableSDK.xml => TestToSkipStableSDK.xml} (96%)

diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml
index 9b38840fd..f5b3aa523 100644
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@@ -61,5 +61,9 @@
             Skip="true"
             Issue=""
             Reason="Requires props file not in installer repo"/>
+    <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="Requires the 1.1 runtime, renenable when removed"/>
   </SkippedTests>
 </Tests>
diff --git a/test/SdkTests/TestConfigStableSDK.xml b/test/SdkTests/TestToSkipStableSDK.xml
similarity index 96%
rename from test/SdkTests/TestConfigStableSDK.xml
rename to test/SdkTests/TestToSkipStableSDK.xml
index 7140b5f76..d1138b370 100644
--- a/test/SdkTests/TestConfigStableSDK.xml
+++ b/test/SdkTests/TestToSkipStableSDK.xml
@@ -4,10 +4,6 @@
             Skip="true"
             Issue=""
             Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_links_simple_app_without_analysis_warnings_and_it_runs"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_does_not_include_leftover_artifacts_on_second_run"
             Skip="true"
             Issue=""
@@ -152,10 +148,6 @@
             Skip="true"
             Issue=""
             Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
-    <Method Name="Microsoft.NET.Build.Tests.AppHostTests.It_builds_a_runnable_apphost_by_default"
-            Skip="true"
-            Issue=""
-            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_can_include_ni_pdbs_in_single_file"
             Skip="true"
             Issue=""
diff --git a/test/SdkTests/TestsToSkipLinux.xml b/test/SdkTests/TestsToSkipLinux.xml
index b2bfd698a..adc3dcbc5 100644
--- a/test/SdkTests/TestsToSkipLinux.xml
+++ b/test/SdkTests/TestsToSkipLinux.xml
@@ -6,5 +6,13 @@
     <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_builds_a_runnable_output"
             Skip="true"
             Reason=".NET Core 1.1 fails to publish on distributions with unsupported RIDs."/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_links_simple_app_without_analysis_warnings_and_it_runs"
+            Skip="true"
+            Issue=""
+            Reason="Fails on 3.1 on linux for missing ICU package"/>
+    <Method Name="Microsoft.NET.Build.Tests.AppHostTests.It_builds_a_runnable_apphost_by_default"
+            Skip="true"
+            Issue=""
+            Reason="Fails on 3.1 on linux for missing ICU package"/>
   </SkippedTests>
 </Tests>

From 6409fc11b827f5cfb2ac6e058cfce8d252591b0f Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 30 Jan 2024 17:11:10 -0800
Subject: [PATCH 3/4] Fix the file rename

---
 .../{TestToSkipStableSDK.xml => TestsToSkipStableSDK.xml}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/SdkTests/{TestToSkipStableSDK.xml => TestsToSkipStableSDK.xml} (100%)

diff --git a/test/SdkTests/TestToSkipStableSDK.xml b/test/SdkTests/TestsToSkipStableSDK.xml
similarity index 100%
rename from test/SdkTests/TestToSkipStableSDK.xml
rename to test/SdkTests/TestsToSkipStableSDK.xml

From 700b78e1fdf8f25eb72243942f98d33263a74ca2 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Wed, 31 Jan 2024 14:47:44 -0800
Subject: [PATCH 4/4] add an additional test to disable

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

diff --git a/test/SdkTests/TestsToSkipStableSDK.xml b/test/SdkTests/TestsToSkipStableSDK.xml
index d1138b370..550025aa6 100644
--- a/test/SdkTests/TestsToSkipStableSDK.xml
+++ b/test/SdkTests/TestsToSkipStableSDK.xml
@@ -185,6 +185,10 @@
             Issue=""
             Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
      <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>  
+     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_links_simple_app_without_analysis_warnings_and_it_runs"
             Skip="true"
             Issue=""
             Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>