Skip to content

Make the warning error, and restore previous props so we attempt to run #15078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 29, 2025
Merged

Make the warning error, and restore previous props so we attempt to run #15078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de87181
Make the warning error, and restore previous props so we get errors w…
nohwnd May 28, 2025
2f4c0a0
Update src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
nohwnd May 29, 2025
0ff279a
Correct file count, because we are adding more props
nohwnd May 29, 2025
5c3ddeb
Merge branch 'error-on-unsupported-tfms-and-add-native' of https://gi…
nohwnd May 29, 2025
c8244c6
Wrong edit
nohwnd May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/verify-nupkgs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 15 additions & 1 deletion src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
4 changes: 2 additions & 2 deletions src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>