From 2a0e083d8605a860a92a07623b0542df19ae5cb3 Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Tue, 24 Oct 2017 16:21:08 -0700
Subject: [PATCH] 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
---
 dir.props | 5 +++--
 1 file 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>
-- 
2.7.4