forked from dotnet/source-build
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Include patch to remove import of restore/harvestPackages.targets in runtime libraries build to fix issue with portable build
- Loading branch information
Showing
1 changed file
with
27 additions
and
0 deletions.
There are no files selected for viewing
27 changes: 27 additions & 0 deletions
27
patches/runtime/0027-Remove-libraries-packages.proj-harvesting.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From e45904a0ce2e16d1fe49341af1dd4ab84ce729f5 Mon Sep 17 00:00:00 2001 | ||
From: Davis Goodin <dagood@microsoft.com> | ||
Date: Mon, 2 Nov 2020 11:54:57 -0600 | ||
Subject: [PATCH] Remove libraries-packages.proj harvesting | ||
|
||
Remove some prebuilts by removing package harvesting. Package harvesting | ||
is not compatible with the concept of a prebuiltless source-build. | ||
--- | ||
src/libraries/libraries-packages.proj | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj | ||
index f2eef864898..5e156775bcc 100644 | ||
--- a/src/libraries/libraries-packages.proj | ||
+++ b/src/libraries/libraries-packages.proj | ||
@@ -24,7 +24,7 @@ | ||
<Import Project="$(PkgDir)baseline\baseline.props" /> | ||
|
||
<!-- Calculate PackageDownload items for restore. --> | ||
- <Import Project="$(RepositoryEngineeringDir)restore\harvestPackages.targets" Condition="'$(MSBuildRestoreSessionId)' != ''" /> | ||
+ <Import Project="$(RepositoryEngineeringDir)restore\harvestPackages.targets" Condition="'$(MSBuildRestoreSessionId)' != '' and '$(DotNetBuildFromSource)' != 'true'" /> | ||
|
||
<!-- | ||
Updates the package index to mark all packages we are building that can go stable as stable. | ||
-- | ||
2.25.2 | ||
|