Skip to content

Commit 94c71bf

Browse files
[rel/3.8] Ship props/targets of MSTest.TestFramework and MSTest.TestAdapter in both build and buildTransitive (#5221)
Co-authored-by: Youssef1313 <[email protected]>
1 parent ccbaf50 commit 94c71bf

25 files changed

+99
-3
lines changed

eng/verify-nupkgs.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ function Confirm-NugetPackages {
2020
Write-Verbose "Starting Confirm-NugetPackages."
2121
$expectedNumOfFiles = @{
2222
"MSTest.Sdk" = 15
23-
"MSTest.TestFramework" = 150
24-
"MSTest.TestAdapter" = 77
23+
"MSTest.TestFramework" = 154
24+
"MSTest.TestAdapter" = 93
2525
"MSTest" = 14
2626
"MSTest.Analyzers" = 56
2727
}

src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.NonWindows.nuspec

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,41 +40,52 @@
4040
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\netstandard2.0\" />
4141
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\netstandard2.0\" />
4242
<file src="netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\netstandard2.0\" />
43-
43+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\netstandard2.0\MSTest.TestAdapter.props" target="build\netstandard2.0\" />
44+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\netstandard2.0\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
4445
<!-- netcoreapp3.1 -->
4546
<file src="netcoreapp3.1\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\netcoreapp3.1\" />
4647
<file src="netcoreapp3.1\buildTransitive\common\MSTest.TestAdapter.targets" target="buildTransitive\netcoreapp3.1\" />
4748
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\netcoreapp3.1\" />
4849
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\netcoreapp3.1\" />
4950
<file src="netcoreapp3.1\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\netcoreapp3.1\" />
51+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\netcoreapp3.1\MSTest.TestAdapter.props" target="build\netcoreapp3.1\" />
52+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\netcoreapp3.1\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
5053

5154
<!-- net6.0 -->
5255
<file src="net6.0\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\net6.0\MSTest.TestAdapter.props" />
5356
<file src="net6.0\buildTransitive\common\MSTest.TestAdapter.targets" target="buildTransitive\net6.0\MSTest.TestAdapter.targets" />
5457
<file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\net6.0\" />
5558
<file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net6.0\" />
5659
<file src="net6.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\net6.0\" />
60+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net6.0\MSTest.TestAdapter.props" target="build\net6.0\" />
61+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net6.0\MSTest.TestAdapter.targets" target="build\net6.0\" />
5762

5863
<!-- net7.0 -->
5964
<file src="net7.0\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\net7.0\MSTest.TestAdapter.props" />
6065
<file src="net7.0\buildTransitive\common\MSTest.TestAdapter.targets" target="buildTransitive\net7.0\MSTest.TestAdapter.targets" />
6166
<file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\net7.0\" />
6267
<file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net7.0\" />
6368
<file src="net7.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\net7.0\" />
69+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net7.0\MSTest.TestAdapter.props" target="build\net7.0\" />
70+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net7.0\MSTest.TestAdapter.targets" target="build\net7.0\" />
6471

6572
<!-- net8.0 -->
6673
<file src="net8.0\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\net8.0\MSTest.TestAdapter.props" />
6774
<file src="net8.0\buildTransitive\common\MSTest.TestAdapter.targets" target="buildTransitive\net8.0\MSTest.TestAdapter.targets" />
6875
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\net8.0\" />
6976
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net8.0\" />
7077
<file src="net8.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\net8.0\" />
78+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net8.0\MSTest.TestAdapter.props" target="build\net8.0\" />
79+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net8.0\MSTest.TestAdapter.targets" target="build\net8.0\" />
7180

7281
<!-- net9.0 -->
7382
<file src="net9.0\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\net9.0\MSTest.TestAdapter.props" />
7483
<file src="net9.0\buildTransitive\common\MSTest.TestAdapter.targets" target="buildTransitive\net9.0\MSTest.TestAdapter.targets" />
7584
<file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\net9.0\" />
7685
<file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net9.0\" />
7786
<file src="net9.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\net9.0\" />
87+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net9.0\MSTest.TestAdapter.props" target="build\net9.0\" />
88+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net9.0\MSTest.TestAdapter.targets" target="build\net9.0\" />
7889

7990
<!-- Localization -->
8091
<!-- All TFMs share the same resx + TestAdapter depends on PlatformServices + TestFramework so all resources are available -->

src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.nuspec

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,26 @@
4848
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\netstandard2.0\" />
4949
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\netstandard2.0\" />
5050
<file src="netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\netstandard2.0\" />
51+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\netstandard2.0\MSTest.TestAdapter.props" target="build\netstandard2.0\" />
52+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\netstandard2.0\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
5153

5254
<!-- uap10.0 -->
5355
<file src="uap10.0.16299\buildTransitive\uwp\MSTest.TestAdapter.props" target="buildTransitive\uap10.0\MSTest.TestAdapter.props" />
5456
<file src="uap10.0.16299\buildTransitive\uwp\MSTest.TestAdapter.targets" target="buildTransitive\uap10.0\MSTest.TestAdapter.targets" />
5557
<file src="$ArtifactsBinDir$MSTestAdapter.PlatformServices\$Configuration$\uap10.0.16299\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\uap10.0\" />
5658
<file src="uap10.0.16299\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\uap10.0\" />
5759
<file src="uap10.0.16299\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\uap10.0\" />
60+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\uap10.0\MSTest.TestAdapter.props" target="build\uap10.0\" />
61+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\uap10.0\MSTest.TestAdapter.targets" target="build\uap10.0\" />
5862

5963
<!-- netcoreapp3.1 -->
6064
<file src="netcoreapp3.1\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\netcoreapp3.1\" />
6165
<file src="netcoreapp3.1\buildTransitive\common\MSTest.TestAdapter.targets" target="buildTransitive\netcoreapp3.1\" />
6266
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\netcoreapp3.1\" />
6367
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\netcoreapp3.1\" />
6468
<file src="netcoreapp3.1\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\netcoreapp3.1\" />
69+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\netcoreapp3.1\MSTest.TestAdapter.props" target="build\netcoreapp3.1\" />
70+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\netcoreapp3.1\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
6571

6672
<!-- net6.0 -->
6773
<file src="net6.0\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\net6.0\MSTest.TestAdapter.props" />
@@ -71,20 +77,26 @@
7177
<file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net6.0\" />
7278
<file src="net6.0-windows10.0.18362.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net6.0\winui" />
7379
<file src="net6.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\net6.0\" />
80+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net6.0\MSTest.TestAdapter.props" target="build\net6.0\" />
81+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net6.0\MSTest.TestAdapter.targets" target="build\net6.0\" />
7482

7583
<!-- net7.0 -->
7684
<file src="net7.0\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\net7.0\MSTest.TestAdapter.props" />
7785
<file src="net7.0\buildTransitive\common\MSTest.TestAdapter.targets" target="buildTransitive\net7.0\MSTest.TestAdapter.targets" />
7886
<file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\net7.0\" />
7987
<file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net7.0\" />
8088
<file src="net7.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\net7.0\" />
89+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net7.0\MSTest.TestAdapter.props" target="build\net7.0\" />
90+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net7.0\MSTest.TestAdapter.targets" target="build\net7.0\" />
8191

8292
<!-- net8.0 -->
8393
<file src="net8.0\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\net8.0\MSTest.TestAdapter.props" />
8494
<file src="net8.0\buildTransitive\common\MSTest.TestAdapter.targets" target="buildTransitive\net8.0\MSTest.TestAdapter.targets" />
8595
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\net8.0\" />
8696
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net8.0\" />
8797
<file src="net8.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\net8.0\" />
98+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net8.0\MSTest.TestAdapter.props" target="build\net8.0\" />
99+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net8.0\MSTest.TestAdapter.targets" target="build\net8.0\" />
88100

89101
<!-- net9.0 -->
90102
<file src="net9.0\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\net9.0\MSTest.TestAdapter.props" />
@@ -94,13 +106,18 @@
94106
<file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net9.0\" />
95107
<file src="net9.0-windows10.0.17763.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net9.0\uwp" />
96108
<file src="net9.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\net9.0\" />
109+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net9.0\MSTest.TestAdapter.props" target="build\net9.0\" />
110+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net9.0\MSTest.TestAdapter.targets" target="build\net9.0\" />
97111

98112
<!-- net462 -->
99113
<file src="net462\buildTransitive\common\MSTest.TestAdapter.props" target="buildTransitive\net462\" />
100114
<file src="net462\buildTransitive\common\MSTest.TestAdapter.targets" target="buildTransitive\net462\" />
101115
<file src="net462\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="buildTransitive\net462\" />
102116
<file src="net462\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="buildTransitive\net462\" />
103117
<file src="net462\Microsoft.TestPlatform.AdapterUtilities.dll" target="buildTransitive\net462\" />
118+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net462\MSTest.TestAdapter.props" target="build\net462\" />
119+
<file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\build\net462\MSTest.TestAdapter.targets" target="build\net462\" />
120+
104121
<!--
105122
For .NET Framework, when using AppDomains (default) with VSTest, VSTest uses a custom assembly resolver that only
106123
considers VS folders and MSTest.TestAdapter NuGet folder to look for deps, resulting in TestFramework.dll not
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\net462\MSTest.TestAdapter.props" />
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\net462\MSTest.TestAdapter.targets" />
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\net6.0\MSTest.TestAdapter.props" />
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\net6.0\MSTest.TestAdapter.targets" />
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\net7.0\MSTest.TestAdapter.props" />
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\net7.0\MSTest.TestAdapter.targets" />
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\buildTransitive\net8.0\MSTest.TestAdapter.props" />
3+
</Project>

0 commit comments

Comments
 (0)