diff options
| author | Eric St. John <ericstj@microsoft.com> | 2015-04-23 03:15:31 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2015-04-23 03:15:31 +0300 |
| commit | 31f05d1e3e1a601e30f5ac8e3c4ed7825c74e9d1 (patch) | |
| tree | e7d84ee1812264b8f4e003382873be70d12748eb /dir.targets | |
| parent | 58a75b4d0f97bcdd7f307ba9b21612cb20380f6e (diff) | |
DnuRestore from packages folder should use nuget.config
Currently DNU doesn't support -ConfigFile: https://github.com/aspnet/dnx/issues/1693
Our DnuRestoreCommand doesn't force a config file and we rely on the
directory probing for it to find nuget.config. This works for restore from source,
but not restore from PackagesDir as happens for test project restore since PackagesDir
will not be under src. To workaround, copy our nuget.config to packages
[tfs-changeset: 1458493]
Diffstat (limited to 'dir.targets')
| -rw-r--r-- | dir.targets | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/dir.targets b/dir.targets index bdedbeeb0e..ded759fe6f 100644 --- a/dir.targets +++ b/dir.targets @@ -80,6 +80,13 @@ <!-- Restore build tools --> <Exec Command="$(_RestoreBuildToolsCommand)" StandardOutputImportance="Low" /> + <!-- currently DNU doesn't support -ConfigFile: https://github.com/aspnet/dnx/issues/1693 + Our DnuRestoreCommand doesn't force a config file and we rely on the + directory probing for it to find nuget.config. This works for restore from source, + but not restore from PackagesDir as happens for test project restore since PackagesDir + will not be under src. To workaround, copy our nuget.config to packages. --> + <Copy Condition="Exists('$(NuGetConfigFile)')" SourceFiles="$(NuGetConfigFile)" DestinationFolder="$(PackagesDir)" SkipUnchangedFiles="true" /> + <Error Condition="'$(ErrorIfBuildToolsRestoredFromIndividualProject)'=='true'" Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." /> |