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

Add vstest patch to address System.Private.Uri prebuilts #16215

Merged
merged 1 commit into from
Apr 24, 2023
Merged

Add vstest patch to address System.Private.Uri prebuilts #16215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...ourceBuild/patches/vstest/0002-Addressing-System.Private.Uri-source-build-prebuilt-.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: Michael Simons <msimons@microsoft.com>
Date: Mon, 24 Apr 2023 13:46:10 +0000
Subject: [PATCH] Addressing System.Private.Uri source-build prebuilt in
testhost

Backport: https://github.com/microsoft/vstest/pull/4414
---
src/testhost.arm64/testhost.arm64.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/testhost.arm64/testhost.arm64.csproj b/src/testhost.arm64/testhost.arm64.csproj
index 606f41c88..f062eae78 100644
--- a/src/testhost.arm64/testhost.arm64.csproj
+++ b/src/testhost.arm64/testhost.arm64.csproj
@@ -37,7 +37,7 @@
</ProjectReference>

<!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
- <PackageReference Include="System.Private.Uri" Version="$(SystemUriVersion)" />
+ <PackageReference Include="System.Private.Uri" Version="$(SystemUriVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $(TargetFramework.StartsWith('net4')) " />
<!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
</ItemGroup>