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

Make Testhost packable except in source-only #46480

Merged
merged 2 commits into from
Feb 4, 2025
Merged

Make Testhost packable except in source-only #46480

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6894293
Make Testhost packable except in source-only
mmitche Feb 3, 2025
451d6c5
Update IsPackable condition for Testhost to Windows
mmitche Feb 3, 2025
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
24 changes: 24 additions & 0 deletions src/SourceBuild/patches/vstest/0001-Make-Testhost-packable-except-in-source-only.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <[email protected]>
Date: Mon, 3 Feb 2025 10:10:50 -0800
Subject: [PATCH] Make Testhost packable except in source-only

Backport PR: https://github.com/microsoft/vstest/pull/15001

---
.../Microsoft.TestPlatform.TestHost.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
index b23cfbab5..af4e6f1e5 100644
--- a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
+++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
@@ -5,7 +5,7 @@

<PropertyGroup>
<!-- Don't produce this package when building from source or inside the VMR as it doesn't build correctly on non-Windows. -->
Copy link
Member

Choose a reason for hiding this comment

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

Update this comment when sending the PR to VSTest?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ya I will if the test here succeeds.

- <IsPackable Condition="'$(DotNetBuild)' != 'true'">true</IsPackable>
+ <IsPackable Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(OS)' == 'Windows_NT'">true</IsPackable>
<NuspecFile>Microsoft.TestPlatform.TestHost.nuspec</NuspecFile>
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
<PackageId>Microsoft.TestPlatform.TestHost</PackageId>
Loading