diff options
| -rw-r--r-- | dir.props | 8 | ||||
| -rw-r--r-- | dir.targets | 4 | ||||
| -rw-r--r-- | src/.nuget/packages.config | 1 | ||||
| -rw-r--r-- | src/NuGet.Config | 1 |
4 files changed, 12 insertions, 2 deletions
@@ -3,6 +3,7 @@ <!-- Build Tools Version --> <PropertyGroup> <BuildToolsVersion>1.0.25-prerelease-00030</BuildToolsVersion> + <DnxVersion>1.0.0-beta5-11482</DnxVersion> </PropertyGroup> <!-- Common repo directories --> @@ -34,6 +35,13 @@ <NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand> </PropertyGroup> + <PropertyGroup> + <DnuToolPath Condition="'$(DnuToolPath)' == ''">$(PackagesDir)dnx-clr-win-x86.$(DnxVersion)\bin\dnu.cmd</DnuToolPath> + + <DnuRestoreCommand>"$(DnuToolPath)"</DnuRestoreCommand> + <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> + <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\'))"</DnuRestoreCommand> + </PropertyGroup> <!-- Projects that have no OS-specific implementations just use Debug and Release for $(Configuration). Projects that do have OS-specific implementations use OS_Debug and OS_Release, for all OS's we support even diff --git a/dir.targets b/dir.targets index 6e3e4d4600..bdedbeeb0e 100644 --- a/dir.targets +++ b/dir.targets @@ -65,7 +65,7 @@ <Target Name="_RestoreBuildTools" Inputs="$(MSBuildThisFileDirectory)dir.props;$(SourceDir).nuget\packages.config" - Outputs="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath)"> + Outputs="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath);$(DnuToolPath)"> <Message Importance="High" Text="Restoring build tools..." /> <!-- Download latest nuget.exe --> @@ -89,7 +89,7 @@ these files otherwise we continually run this target over and over for every project until these files are cleaned (if the are ever cleaned). --> - <Touch Files="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath)" /> + <Touch Files="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath);$(DnuToolPath)" /> </Target> <!-- Provide default empty targets for BuildAndTest and Test which can be hooked onto or overridden as necessary --> diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config index b2305248e6..c6b5382848 100644 --- a/src/.nuget/packages.config +++ b/src/.nuget/packages.config @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00030" /> + <package id="dnx-clr-win-x86" version="1.0.0-beta5-11482" /> </packages> diff --git a/src/NuGet.Config b/src/NuGet.Config index 10dfac8fbb..b956329f8f 100644 --- a/src/NuGet.Config +++ b/src/NuGet.Config @@ -8,6 +8,7 @@ <add key="myget.org dotnet-corefx" value="https://www.myget.org/F/dotnet-corefx/" /> <add key="myget.org dotnet-corefxtestdata" value="https://www.myget.org/F/dotnet-corefxtestdata/" /> <add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/" /> + <add key="myget.org aspnetvnext" value="https://www.myget.org/F/aspnetvnext/" /> <add key="nuget.org" value="https://www.nuget.org/api/v2/" /> </packageSources> <activePackageSource> |