Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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" = 15;
"Microsoft.NET.Test.Sdk" = 25;
"Microsoft.TestPlatform" = 619;
"Microsoft.TestPlatform.Build" = 20;
"Microsoft.TestPlatform.CLI" = 481;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
23 changes: 22 additions & 1 deletion src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
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 @@ -21,11 +26,27 @@
<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 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>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project InitialTargets="NonCompatibleTargetFrameworkError_Microsoft_NET_Test_Sdk_net8_0">
<Target Name="NonCompatibleTargetFrameworkError_Microsoft_NET_Test_Sdk_net8_0"
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>