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

Don't copy runner to test output during regular builds #96826

Merged
merged 4 commits into from
Jan 22, 2024
Merged

Don't copy runner to test output during regular builds #96826

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b06b55
Don't copy runner to test output during regular builds
ericstj Jan 10, 2024
dceca23
Refine xunit 1651 workaround until we can pick up the fix
ericstj Jan 18, 2024
a32b085
Update eng/testing/xunit/xunit.console.targets
ericstj Jan 18, 2024
1193391
Update xunit.console.targets
ViktorHofer Jan 22, 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
12 changes: 2 additions & 10 deletions eng/testing/xunit/xunit.console.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@

<!-- ResolveAssemblyReferences is the target that populates ReferenceCopyLocalPaths which is what is copied to output directory. -->
<Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetsMobile)' != 'true' or '$(BundleXunitRunner)' == 'true'">
<ItemGroup>
<!-- Copy test runner to output directory -->
<ItemGroup Condition="'$(ArchiveTests)' == 'true'">
<!-- When ArchiveTests is set, copy xunit.runner.console to output directory -->
<None Include="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\*"
Exclude="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\xunit.console.*exe.config;
$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\xunit.console.x86.exe;
Expand All @@ -85,13 +85,5 @@
CopyToOutputDirectory="PreserveNewest"
Visible="false" />
</ItemGroup>

<!-- Workaround for https://github.com/xunit/xunit/issues/1651 -->
<ItemGroup Condition="'$(ArchiveTests)' != 'true'">
<None Remove="$(Pkgxunit_runner_visualstudio)\build\net452\xunit.runner.utility.net452.dll" />
ericstj marked this conversation as resolved.
Show resolved Hide resolved
<None Remove="$(Pkgxunit_runner_visualstudio)\build\net452\xunit.runner.reporters.net452.dll" />
<None Remove="$(Pkgxunit_runner_visualstudio)\build\netcoreapp2.1\xunit.runner.utility.netcoreapp10.dll" />
<None Remove="$(Pkgxunit_runner_visualstudio)\build\netcoreapp2.1\xunit.runner.reporters.netcoreapp10.dll" />
</ItemGroup>
</Target>
</Project>
Loading