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

Jump to bottom

Delete MSTest.TestAdapter.props #2677

Closed
wants to merge 4 commits into from
Closed

Delete MSTest.TestAdapter.props #2677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b802211
move definitions
vikukush Apr 8, 2024
4d765b0
Update MSTest.TestAdapter.targets
vikukush Apr 8, 2024
28cfd34
BeforeTargets directly GenerateAdditionalSources
vikukush Apr 8, 2024
33c90be
remove references to deleted file
vikukush Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions TestFx.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{CA01DAF5
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{3B88BD67-C767-466D-8C9C-C14681544B84}"
ProjectSection(SolutionItems) = preProject
src\Adapter\Build\Common\MSTest.TestAdapter.props = src\Adapter\Build\Common\MSTest.TestAdapter.props
src\Adapter\Build\Common\MSTest.TestAdapter.targets = src\Adapter\Build\Common\MSTest.TestAdapter.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Universal", "Universal", "{89314305-F815-4969-9B1B-8AEDE109DEC4}"
ProjectSection(SolutionItems) = preProject
src\Adapter\Build\Universal\MSTest.TestAdapter.props = src\Adapter\Build\Universal\MSTest.TestAdapter.props
src\Adapter\Build\Universal\MSTest.TestAdapter.targets = src\Adapter\Build\Universal\MSTest.TestAdapter.targets
EndProjectSection
EndProject
Expand Down
21 changes: 0 additions & 21 deletions src/Adapter/Build/Common/MSTest.TestAdapter.props
View file
Open in desktop

This file was deleted.

34 changes: 34 additions & 0 deletions src/Adapter/Build/Common/MSTest.TestAdapter.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
<Project>

<PropertyGroup>
<EnableMSTestV2CopyResources Condition=" '$(EnableMSTestV2CopyResources)' == '' ">true</EnableMSTestV2CopyResources>
<EnableMSTestRunner Condition=" '$(EnableMSTestRunner)' == '' ">false</EnableMSTestRunner>
<IsTestingPlatformApplication>$(EnableMSTestRunner)</IsTestingPlatformApplication>
</PropertyGroup>

<!-- Override settings from Microsoft.Testing.Platform.MSBuild.targets that are imported before this file -->
<PropertyGroup Condition=" $(IsTestingPlatformApplication) == 'True' ">
<GenerateTestingPlatformConfigurationFile Condition=" '$(GenerateTestingPlatformConfigurationFile)' == '' " >True</GenerateTestingPlatformConfigurationFile>
<GenerateTestingPlatformEntryPoint Condition=" '$(GenerateTestingPlatformEntryPoint)' == '' " >True</GenerateTestingPlatformEntryPoint>
</PropertyGroup>
<PropertyGroup Condition=" $(IsTestingPlatformApplication) != 'True' ">
<GenerateTestingPlatformConfigurationFile />
<GenerateTestingPlatformEntryPoint />
</PropertyGroup>
</PropertyGroup>
<Target Name="OverrideTestingPlatformSettings" Condition=" '$(EnableMSTestRunner)' == 'true' " BeforeTargets="Build;GenerateAdditionalSources">
<ItemGroup>
<AssemblyMetadata Remove="Microsoft.Testing.Platform.Application" />
</ItemGroup>
</Target>

<ItemGroup>
<!--
!!! IMPORTANT !!!
DO NOT CHANGE THE GUID, IT'S A WELL KNOWN EXTENSION POINT AND THIS EXTENSION NEEDS TO BE REGISTERED AT THE END
WE HAVE CODE INSIDE THE TASK 'TestingPlatformEntryPoint' TO ENSURE THE ORDER OF THE REGISTRATION BASED ON THIS GUID
-->
<TestingPlatformBuilderHook Include="031F8871-2660-4208-8F6B-FC142B40ABFF" Condition=" $(GenerateTestingPlatformEntryPoint) == 'true' " >
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am pretty sure this part is defined too late here. Let me check.

<DisplayName>MSTest</DisplayName>
<TypeFullName>Microsoft.VisualStudio.TestTools.UnitTesting.TestingPlatformBuilderHook</TypeFullName>
</TestingPlatformBuilderHook>
</ItemGroup>

<!-- Handle the coexistance between testing platform and Microsoft.NET.Test.Sdk -->
<PropertyGroup>
<GenerateTestingPlatformEntryPoint Condition=" '$(GenerateTestingPlatformEntryPoint)' == '' ">$(EnableMSTestRunner)</GenerateTestingPlatformEntryPoint>
Expand Down
5 changes: 0 additions & 5 deletions src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.Linux.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,39 +30,34 @@
$CommonFileElements$

<!-- netstandard2.0 -->
<file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\netstandard2.0\" />
<file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" 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="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\netcoreapp3.1\" />
<file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" 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="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\net6.0\MSTest.TestAdapter.props" />
<file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\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\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="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\net7.0\MSTest.TestAdapter.props" />
<file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\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\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="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\net8.0\MSTest.TestAdapter.props" />
<file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\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\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net8.0\" />
Expand Down
7 changes: 0 additions & 7 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 @@ -35,31 +35,27 @@
$CommonFileElements$

<!-- netstandard2.0 -->
<file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\netstandard2.0\" />
<file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
<file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" 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="$RepoRoot$src\Adapter\Build\Universal\MSTest.TestAdapter.props" target="build\uap10.0\MSTest.TestAdapter.props" />
<file src="$RepoRoot$src\Adapter\Build\Universal\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="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\netcoreapp3.1\" />
<file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
<file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" 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="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\net6.0\MSTest.TestAdapter.props" />
<file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\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\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\" />
Expand All @@ -69,23 +65,20 @@
<file src="net6.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net6.0\" />

<!-- net7.0 -->
<file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\net7.0\MSTest.TestAdapter.props" />
<file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\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\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="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\net8.0\MSTest.TestAdapter.props" />
<file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\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\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\" />

<!-- net462 -->
<file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\net462\" />
<file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.targets" target="build\net462\" />
<file src="net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net462\" />
<file src="net462\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net462\" />
Expand Down