From 80bc741a5215e36001184cb9157d23ea2c33c396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Thu, 22 May 2025 12:40:02 +0200
Subject: [PATCH 1/2] Warning on unsupported tfms (#15072)

* Add warning when restoring old TFM

* revert

* Revert "revert"

This reverts commit 81c7638c71d308b1bb857c23c1f8916abc51a7f6.
---
 eng/verify-nupkgs.ps1                                    | 2 +-
 .../Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.csproj | 3 +++
 .../Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec | 9 ++++++++-
 .../Microsoft.NET.Test.Sdk.targets                       | 6 ++++++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets

diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
index 8b922cde5f..9c23ac52d8 100644
--- a/eng/verify-nupkgs.ps1
+++ b/eng/verify-nupkgs.ps1
@@ -18,7 +18,7 @@ function Verify-Nuget-Packages {
     Write-Host "Starting Verify-Nuget-Packages."
     $expectedNumOfFiles = @{
         "Microsoft.CodeCoverage"                      = 59;
-        "Microsoft.NET.Test.Sdk"                      = 15;
+        "Microsoft.NET.Test.Sdk"                      = 20;
         "Microsoft.TestPlatform"                      = 619;
         "Microsoft.TestPlatform.Build"                = 20;
         "Microsoft.TestPlatform.CLI"                  = 481;
diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.csproj b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.csproj
index 1764ba0ef3..6c3cb6a586 100644
--- a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.csproj
+++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.csproj
@@ -29,6 +29,9 @@
     <None Update="Microsoft.NET.Test.Sdk.props">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Microsoft.NET.Test.Sdk.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="netcoreapp\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
index 54e0694f48..12c281a274 100644
--- a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
+++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
@@ -21,10 +21,17 @@
     <file src="netstandard2.0\netcoreapp\*" target="build\net8.0\" />
     <file src="netstandard2.0\netfx\*" target="build\net462\" />
 
-    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\net462\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\net8.0\" />
     <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\net8.0\" />
     <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\net462\" />
 
+    <!-- Add incompatibility warning. -->
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="buildMultiTargeting\netcoreapp2.0\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="build\netcoreapp2.0\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="buildMultiTargeting\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="build\netstandard2.0\" />
+
     <file src="netstandard2.0\_._" target="lib/net8.0" />
     <file src="netstandard2.0\_._" target="lib/net462" />
   </files>
diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets
new file mode 100644
index 0000000000..6ef96e693d
--- /dev/null
+++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets
@@ -0,0 +1,6 @@
+<Project InitialTargets="NonCompatibleTargetFrameworkError_Microsoft_NET_Test_Sdk_net8_0">
+  <Target Name="NonCompatibleTargetFrameworkError_Microsoft_NET_Test_Sdk_net8_0"
+          Condition="'$(SuppressTfmSupportBuildWarnings)' == ''">
+    <Warning Text="Microsoft.NET.Test.Sdk doesn't support $(TargetFramework) and has not been tested with it. Consider upgrading your TargetFramework to net8.0 or later. You may also set &lt;SuppressTfmSupportBuildWarnings&gt;true&lt;/SuppressTfmSupportBuildWarnings&gt; in the project file to ignore this warning and attempt to run in this unsupported configuration at your own risk." />
+  </Target>
+</Project>

From 5b8e9e41146b0852e5dec1f1a25f07e1ef8f27eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Thu, 29 May 2025 18:10:03 +0200
Subject: [PATCH 2/2] Make the warning error, and restore previous props so we
 attempt to run (#15078)

* Make the warning error, and restore previous props so we get errors when user suppresses

* Update src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec

* Correct file count, because we are adding more props

* Wrong edit
---
 eng/verify-nupkgs.ps1                            |  2 +-
 .../Microsoft.NET.Test.Sdk.nuspec                | 16 +++++++++++++++-
 .../Microsoft.NET.Test.Sdk.targets               |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
index 9c23ac52d8..f1595e100f 100644
--- a/eng/verify-nupkgs.ps1
+++ b/eng/verify-nupkgs.ps1
@@ -18,7 +18,7 @@ function Verify-Nuget-Packages {
     Write-Host "Starting Verify-Nuget-Packages."
     $expectedNumOfFiles = @{
         "Microsoft.CodeCoverage"                      = 59;
-        "Microsoft.NET.Test.Sdk"                      = 20;
+        "Microsoft.NET.Test.Sdk"                      = 25;
         "Microsoft.TestPlatform"                      = 619;
         "Microsoft.TestPlatform.Build"                = 20;
         "Microsoft.TestPlatform.CLI"                  = 481;
diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
index 12c281a274..13812afbd9 100644
--- a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
+++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
@@ -8,10 +8,15 @@
         <dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
         <dependency id="Microsoft.CodeCoverage" version="$Version$" />
       </group>
+
       <group targetFramework="net462">
         <!-- TestHost gets shipped with vstest.console -->
         <dependency id="Microsoft.CodeCoverage" version="$Version$" />
       </group>
+
+      <group targetFramework="native0.0">
+      </group>
+      
     </dependencies>
   </metadata>
 
@@ -26,13 +31,22 @@
     <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\net8.0\" />
     <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\net462\" />
 
-    <!-- Add incompatibility warning. -->
+    <!-- Add incompatibility error, and add the props, in case user decides to ignore it. -->
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\netcoreapp2.0\" />
     <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="buildMultiTargeting\netcoreapp2.0\" />
+
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\netcoreapp2.0\" />
     <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="build\netcoreapp2.0\" />
+
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\netstandard2.0\" />
     <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="buildMultiTargeting\netstandard2.0\" />
+
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\netstandard2.0\" />
     <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="build\netstandard2.0\" />
 
     <file src="netstandard2.0\_._" target="lib/net8.0" />
     <file src="netstandard2.0\_._" target="lib/net462" />
+
+    <file src="netstandard2.0\_._" target="lib/native" />
   </files>
 </package>
diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets
index 6ef96e693d..d2d47da66e 100644
--- a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets
+++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets
@@ -1,6 +1,6 @@
 <Project InitialTargets="NonCompatibleTargetFrameworkError_Microsoft_NET_Test_Sdk_net8_0">
   <Target Name="NonCompatibleTargetFrameworkError_Microsoft_NET_Test_Sdk_net8_0"
-          Condition="'$(SuppressTfmSupportBuildWarnings)' == ''">
-    <Warning Text="Microsoft.NET.Test.Sdk doesn't support $(TargetFramework) and has not been tested with it. Consider upgrading your TargetFramework to net8.0 or later. You may also set &lt;SuppressTfmSupportBuildWarnings&gt;true&lt;/SuppressTfmSupportBuildWarnings&gt; in the project file to ignore this warning and attempt to run in this unsupported configuration at your own risk." />
+          Condition="'$(SuppressTfmSupportBuildErrors)' == ''">
+    <Error Text="Microsoft.NET.Test.Sdk doesn't support $(TargetFramework) and has not been tested with it. Consider upgrading your TargetFramework to net8.0 or later. You may also set &lt;SuppressTfmSupportBuildErrors&gt;true&lt;/SuppressTfmSupportBuildErrors&gt; in the project file to ignore this warning and attempt to run in this unsupported configuration at your own risk." />
   </Target>
 </Project>