diff options
| author | Joel Hendrix <jhendrix@microsoft.com> | 2015-06-24 19:05:58 +0300 |
|---|---|---|
| committer | stephentoub <stoub@microsoft.com> | 2015-06-24 19:56:06 +0300 |
| commit | fed4ff09d5644b3de57c928a9f04265c4e8c1544 (patch) | |
| tree | 6ca11720b87c62ae043dba70494bcf836f5111af /dir.targets | |
| parent | df34a4417b58968064d7c32e8844d24cb6a39f9c (diff) | |
Build source path for dnu restore
Since dnu doesn't support config files we must use the --source argument instead; this way we can specify an internal cache when building from razzle.
This adds a new item group, DnuSourceList, which contains all of the nuget package sources dnu should query when restoring packages. For razzle builds we add our internal cache on \\cpvsbuild.
I removed all but the build tools feed from nuget.config as we no longer rely on it for package store (just for build tools).
Merged from CS#1493227.
[tfs-changeset: 1493233]
Diffstat (limited to 'dir.targets')
| -rw-r--r-- | dir.targets | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/dir.targets b/dir.targets index 7477c7c78b..f99d427a6e 100644 --- a/dir.targets +++ b/dir.targets @@ -87,14 +87,6 @@ <!-- 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" /> - <Copy Condition="Exists('$(NuGetConfigFile)')" SourceFiles="$(NuGetConfigFile)" DestinationFolder="$(IntermediateOutputRootPath)" SkipUnchangedFiles="true" /> - <!-- Add DNU and Roslyn tool execute rights --> <Exec Condition="'$(OsEnvironment)'=='Unix'" Command="chmod a+x "$(DnxPackageDir)/bin/dnu"" /> |