Skip to content
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

Simplify adapter props and targets #4397

Merged
merged 3 commits into from
Dec 20, 2024
Merged

Simplify adapter props and targets #4397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
612ee14
Simplify adapter props and targets
Evangelink Dec 20, 2024
3c8021c
Merge branch 'main' into simpler-target-adapter
Evangelink Dec 20, 2024
7d085cf
Merge branch 'main' into simpler-target-adapter
Evangelink Dec 20, 2024
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 @@ -22,7 +22,7 @@ function Confirm-NugetPackages {
"MSTest.Sdk" = 15;
"MSTest.Internal.TestFx.Documentation" = 10;
"MSTest.TestFramework" = 148;
"MSTest.TestAdapter" = 82;
"MSTest.TestAdapter" = 74;
"MSTest" = 6;
"MSTest.Analyzers" = 10;
}
Expand Down
18 changes: 6 additions & 12 deletions src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.NonWindows.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,48 +36,42 @@

<!-- netstandard2.0 -->
<file src="netstandard2.0\build\common\MSTest.TestAdapter.props" target="build\netstandard2.0\" />
<file src="netstandard2.0\build\netfx-netcore-netstandard\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\netstandard2.0\" />
<file src="netstandard2.0\build\common\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netstandard2.0\" />
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\netstandard2.0\" />
<file src="netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\netstandard2.0\" />

<!-- netcoreapp3.1 -->
<file src="netcoreapp3.1\build\common\MSTest.TestAdapter.props" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\build\netfx-netcore-netstandard\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\build\common\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
Evangelink marked this conversation as resolved.
Show resolved Hide resolved
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\netcoreapp3.1\" />

<!-- net6.0 -->
<file src="net6.0\build\common\MSTest.TestAdapter.props" target="build\net6.0\MSTest.TestAdapter.props" />
<file src="net6.0\build\net\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
<file src="net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net6.0\" />
<file src="net6.0\build\common\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
<file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\" />
<file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net6.0\" />
<file src="net6.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net6.0\" />

<!-- net7.0 -->
<file src="net7.0\build\common\MSTest.TestAdapter.props" target="build\net7.0\MSTest.TestAdapter.props" />
<file src="net7.0\build\net\MSTest.TestAdapter.targets" target="build\net7.0\MSTest.TestAdapter.targets" />
<file src="net7.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net7.0\" />
<file src="net7.0\build\common\MSTest.TestAdapter.targets" target="build\net7.0\MSTest.TestAdapter.targets" />
<file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net7.0\" />
<file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net7.0\" />
<file src="net7.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net7.0\" />

<!-- net8.0 -->
<file src="net8.0\build\common\MSTest.TestAdapter.props" target="build\net8.0\MSTest.TestAdapter.props" />
<file src="net8.0\build\net\MSTest.TestAdapter.targets" target="build\net8.0\MSTest.TestAdapter.targets" />
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net8.0\" />
<file src="net8.0\build\common\MSTest.TestAdapter.targets" target="build\net8.0\MSTest.TestAdapter.targets" />
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net8.0\" />
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net8.0\" />
<file src="net8.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net8.0\" />

<!-- net9.0 -->
<file src="net9.0\build\common\MSTest.TestAdapter.props" target="build\net9.0\MSTest.TestAdapter.props" />
<file src="net9.0\build\net\MSTest.TestAdapter.targets" target="build\net9.0\MSTest.TestAdapter.targets" />
<file src="net9.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net9.0\" />
<file src="net9.0\build\common\MSTest.TestAdapter.targets" target="build\net9.0\MSTest.TestAdapter.targets" />
<file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net9.0\" />
<file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net9.0\" />
<file src="net9.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net9.0\" />
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<None Update="build\uwp\MSTest.TestAdapter.targets" Condition=" '$(TargetFramework)' == '$(UwpMinimum)' ">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="build\net\MSTest.TestAdapter.targets">
<None Update="build\common\MSTest.TestAdapter.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="PACKAGE.md">
Expand Down
22 changes: 7 additions & 15 deletions src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,32 +47,28 @@

<!-- netstandard2.0 -->
<file src="netstandard2.0\build\common\MSTest.TestAdapter.props" target="build\netstandard2.0\" />
<file src="netstandard2.0\build\netfx-netcore-netstandard\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\netstandard2.0\" />
<file src="netstandard2.0\build\common\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netstandard2.0\" />
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\netstandard2.0\" />
<file src="netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\netstandard2.0\" />

<!-- uap10.0 -->
<file src="uap10.0.16299\build\uwp\MSTest.TestAdapter.props" target="build\uap10.0\MSTest.TestAdapter.props" />
<file src="uap10.0.16299\build\uwp\MSTest.TestAdapter.targets" target="build\uap10.0\MSTest.TestAdapter.targets" />
<file src="uap10.0.16299\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\uap10.0\" />
<file src="$ArtifactsBinDir$MSTestAdapter.PlatformServices\$Configuration$\uap10.0.16299\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\uap10.0\" />
<file src="uap10.0.16299\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\uap10.0\" />
<file src="uap10.0.16299\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\uap10.0\" />

<!-- netcoreapp3.1 -->
<file src="netcoreapp3.1\build\common\MSTest.TestAdapter.props" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\build\netfx-netcore-netstandard\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\build\common\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\netcoreapp3.1\" />

<!-- net6.0 -->
<file src="net6.0\build\common\MSTest.TestAdapter.props" target="build\net6.0\MSTest.TestAdapter.props" />
<file src="net6.0\build\net\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
<file src="net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net6.0\" />
<file src="net6.0\build\common\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
<file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\" />
<file src="$ArtifactsBinDir$MSTestAdapter.PlatformServices\$Configuration$\net6.0-windows10.0.18362.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\winui\" />
<file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net6.0\" />
Expand All @@ -81,32 +77,28 @@

<!-- net7.0 -->
<file src="net7.0\build\common\MSTest.TestAdapter.props" target="build\net7.0\MSTest.TestAdapter.props" />
<file src="net7.0\build\net\MSTest.TestAdapter.targets" target="build\net7.0\MSTest.TestAdapter.targets" />
<file src="net7.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net7.0\" />
<file src="net7.0\build\common\MSTest.TestAdapter.targets" target="build\net7.0\MSTest.TestAdapter.targets" />
<file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net7.0\" />
<file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net7.0\" />
<file src="net7.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net7.0\" />

<!-- net8.0 -->
<file src="net8.0\build\common\MSTest.TestAdapter.props" target="build\net8.0\MSTest.TestAdapter.props" />
<file src="net8.0\build\net\MSTest.TestAdapter.targets" target="build\net8.0\MSTest.TestAdapter.targets" />
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net8.0\" />
<file src="net8.0\build\common\MSTest.TestAdapter.targets" target="build\net8.0\MSTest.TestAdapter.targets" />
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net8.0\" />
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net8.0\" />
<file src="net8.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net8.0\" />

<!-- net9.0 -->
<file src="net9.0\build\common\MSTest.TestAdapter.props" target="build\net9.0\MSTest.TestAdapter.props" />
<file src="net9.0\build\net\MSTest.TestAdapter.targets" target="build\net9.0\MSTest.TestAdapter.targets" />
<file src="net9.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net9.0\" />
<file src="net9.0\build\common\MSTest.TestAdapter.targets" target="build\net9.0\MSTest.TestAdapter.targets" />
<file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net9.0\" />
<file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net9.0\" />
<file src="net9.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net9.0\" />

<!-- net462 -->
<file src="net462\build\common\MSTest.TestAdapter.props" target="build\net462\" />
<file src="net462\build\netfx-netcore-netstandard\MSTest.TestAdapter.targets" target="build\net462\" />
<file src="net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net462\" />
<file src="net462\build\common\MSTest.TestAdapter.targets" target="build\net462\" />
<file src="net462\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net462\" />
<file src="net462\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net462\" />
<file src="net462\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net462\" />
Expand Down
0 ...pter/build/net/MSTest.TestAdapter.targets → ...r/build/common/MSTest.TestAdapter.targets
View file
Open in desktop
File renamed without changes.
88 changes: 0 additions & 88 deletions src/Adapter/MSTest.TestAdapter/build/netfx-netcore-netstandard/MSTest.TestAdapter.targets
View file
Open in desktop

This file was deleted.

29 changes: 3 additions & 26 deletions src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,7 @@
<Project>

<ItemGroup>
<TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll">
<Link>Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>False</Visible>
</TestAdapterContent>
<TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll">
<Link>Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>False</Visible>
</TestAdapterContent>
<TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.TestPlatform.AdapterUtilities.dll">
<Link>Microsoft.TestPlatform.AdapterUtilities.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>False</Visible>
</TestAdapterContent>
</ItemGroup>

<ItemGroup>
<!--
Including `@(TestAdapterContent)` in the `None` ItemGroup to get the `CopyToOutputDirectory` behavior be default,
package consumers can opt-out of this behavior by removing `@(TestAdapterContent)` from the `None` ItemGroup
(i.e. `<None Remove="@(TestAdapterContent)" />`)
-->
<None Include="@(TestAdapterContent)" />
</ItemGroup>
<PropertyGroup>
<EnableMSTestV2CopyResources Condition=" '$(EnableMSTestV2CopyResources)' == '' ">true</EnableMSTestV2CopyResources>
</PropertyGroup>

</Project>
Loading
Loading