Skip to content

Add vstest patch #48571

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

Closed
ViktorHofer wants to merge 2 commits into from
Closed

Add vstest patch #48571

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45ab926
Add vstest patch
ViktorHofer Apr 18, 2025
bd35df5
fix patch
ViktorHofer Apr 18, 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
62 changes: 62 additions & 0 deletions src/SourceBuild/patches/vstest/0001-build-testplatform-packages.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
From 61bc796849d69f53d918fc151ed23efc26f5441e Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 18 Apr 2025 10:38:10 +0200
Subject: [PATCH] Build TestPlatform packages in VMR

Backport: https://github.com/microsoft/vstest/pull/15055

---
.../Microsoft.TestPlatform.Portable.csproj | 7 ++++---
.../Microsoft.TestPlatform/Microsoft.TestPlatform.csproj | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj
index 353675add1..0707c75386 100644
--- a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj
+++ b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj
@@ -16,8 +16,7 @@
</PropertyGroup>

<PropertyGroup>
- <!-- Don't produce this package when building from source or inside the VMR as it relies on a VS license. -->
- <IsPackable Condition="'$(DotNetBuild)' != 'true'">true</IsPackable>
+ <IsPackable>true</IsPackable>
<NuspecFile>Microsoft.TestPlatform.Portable.nuspec</NuspecFile>
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
<PackageId>Microsoft.TestPlatform.Portable</PackageId>
@@ -32,7 +31,9 @@
</PackageDescription>
<!-- Override default license -->
<PackageLicenseFile>LICENSE_VS.txt</PackageLicenseFile>
- <PackageLicenseFullPath>$(SrcPackageFolder)licenses/LICENSE_VS.txt</PackageLicenseFullPath>
+ <!-- Use the MIT license when building from the VMR as the VS license is cloaked out. -->
+ <PackageLicenseFile Condition="'$(DotNetBuild)' == 'true'">LICENSE_MIT.txt</PackageLicenseFile>
+ <PackageLicenseFullPath>$(SrcPackageFolder)licenses/$(PackageLicenseFile)</PackageLicenseFullPath>
</PropertyGroup>

<ItemGroup Label="NuGet">
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
index 4eaf14cca6..728c2402c0 100644
--- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
@@ -15,8 +15,7 @@
</PropertyGroup>

<PropertyGroup>
- <!-- Don't produce this package when building from source or inside the VMR as it relies on a VS license. -->
- <IsPackable Condition="'$(DotNetBuild)' != 'true'">true</IsPackable>
+ <IsPackable>true</IsPackable>
<NuspecFile>Microsoft.TestPlatform.nuspec</NuspecFile>
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
<PackageId>Microsoft.TestPlatform</PackageId>
@@ -34,7 +33,9 @@
</PackageDescription>
<!-- Override default license -->
<PackageLicenseFile>LICENSE_VS.txt</PackageLicenseFile>
- <PackageLicenseFullPath>$(SrcPackageFolder)licenses/LICENSE_VS.txt</PackageLicenseFullPath>
+ <!-- Use the MIT license when building from the VMR as the VS license is cloaked out. -->
+ <PackageLicenseFile Condition="'$(DotNetBuild)' == 'true'">LICENSE_MIT.txt</PackageLicenseFile>
+ <PackageLicenseFullPath>$(SrcPackageFolder)licenses/$(PackageLicenseFile)</PackageLicenseFullPath>
</PropertyGroup>

<ItemGroup Label="NuGet">
Loading