Remove coreclr patches from source-build repo
authorWes Haggard <Wes.Haggard@microsoft.com>
Tue, 24 Oct 2017 23:21:08 +0000 (16:21 -0700)
committerWes Haggard <Wes.Haggard@microsoft.com>
Mon, 30 Oct 2017 20:05:17 +0000 (13:05 -0700)
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

index aaa0285..cf1eb96 100644 (file)
--- 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>