diff options
| author | Val Menn <vmenn@microsoft.com> | 2015-04-13 16:35:46 -0700 |
|---|---|---|
| committer | Val Menn <vmenn@microsoft.com> | 2015-04-20 12:57:24 -0700 |
| commit | 3b2185624cebf4f3a6ab9a4ce0038468aa572c35 (patch) | |
| tree | 40be49b238378030c1bd09435938b913a4277211 | |
| parent | ba3b6d4ac52a7e3adc8193c0c3c7aab648cdfa2b (diff) | |
| download | coreclr-3b2185624cebf4f3a6ab9a4ce0038468aa572c35.tar.gz coreclr-3b2185624cebf4f3a6ab9a4ce0038468aa572c35.tar.bz2 coreclr-3b2185624cebf4f3a6ab9a4ce0038468aa572c35.zip | |
Xplat build changes
Move the path of the global packages.config into a separate property.
This allows xplat MSBuild to detect the path and adjust for non-Win
systems.
Addtionally, trim backslash as it escapes quotes on Linux
| -rw-r--r-- | dir.props | 1 | ||||
| -rw-r--r-- | dir.targets | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -20,6 +20,7 @@ <SourceDir>$(__SourceDir)\</SourceDir> <SourceDir Condition="'$(__SourceDir)'==''">$(ProjectDir)\src\</SourceDir> + <PackagesGlobalConfig>$(SourceDir).nuget\packages.config</PackagesGlobalConfig> <PackagesDir>$(__PackagesDir)\</PackagesDir> <PackagesDir Condition="'$(__PackagesDir)'==''">$(ProjectDir)\packages\</PackagesDir> diff --git a/dir.targets b/dir.targets index 5467107941..043e84f13d 100644 --- a/dir.targets +++ b/dir.targets @@ -36,7 +36,7 @@ <!-- Restore build tools --> <Exec StandardOutputImportance="Low" - Command=""$(NuGetToolPath)" install " $(SourceDir).nuget\packages.config " -o " $(ToolsDir) " $(NuGetConfigCommandLine)" /> + Command=""$(NuGetToolPath)" install "$(PackagesGlobalConfig)" -o "$(ToolsDir.Trim('\'))" $(NuGetConfigCommandLine)" /> <Touch Files="$(BuildToolsInstallSemaphore)" AlwaysCreate="true" /> </Target> |