summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
authorWes Haggard <Wes.Haggard@microsoft.com>2017-10-24 23:21:08 (GMT)
committerWes Haggard <Wes.Haggard@microsoft.com>2017-10-30 20:05:17 (GMT)
commit2a0e083d8605a860a92a07623b0542df19ae5cb3 (patch)
tree45cd42d5ddee8e84fb2378c16a6145e8379c1d4d /dir.props
parent207710936041a15bed5ebd61255f4562aa02c554 (diff)
downloadcoreclr-2a0e083d8605a860a92a07623b0542df19ae5cb3.zip
coreclr-2a0e083d8605a860a92a07623b0542df19ae5cb3.tar.gz
coreclr-2a0e083d8605a860a92a07623b0542df19ae5cb3.tar.bz2
Remove coreclr patches from source-build repo
Updates the branch to include patches that were applied in source-build: 0001-Respect-NUGET_PACKAGES-if-it-is-set.patch 0002-Unify-CLI-and-BuildTools-Versions.patch 0003-Add-clear-to-NuGet.config.patch 0004-PATCH-Use-clang-3.9-by-default.patch
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props5
1 files changed, 3 insertions, 2 deletions
diff --git a/dir.props b/dir.props
index aaa0285..cf1eb96 100644
--- a/dir.props
+++ b/dir.props
@@ -64,8 +64,9 @@
<!-- This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used to find source code for debugging -->
<GitHubRepositoryName Condition="'$(GitHubRepositoryName)' == ''">coreclr</GitHubRepositoryName>
- <PackagesDir>$(__PackagesDir)\</PackagesDir>
- <PackagesDir Condition="'$(__PackagesDir)'==''">$(ProjectDir)packages\</PackagesDir>
+ <PackagesDir>$(DotNetRestorePackagesPath)</PackagesDir>
+ <PackagesDir Condition="'$(PackagesDir)'=='' and '$(__PackagesDir)'!=''">$(__PackagesDir)\</PackagesDir>
+ <PackagesDir Condition="'$(PackagesDir)'==''">$(ProjectDir)packages\</PackagesDir>
<RootBinDir>$(__RootBinDir)\</RootBinDir>
<RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>