Eliminate need for extra package restore step

Per the doc updates to NuProj found here:
883121f807
We don't need to run "nuget restore project.json" on the NuProj directory directly any more. Using a solution-level packages.config file solves it in a simpler way.

Yes, this does mean that each solution has a local copy of the NuProj package after restore completes, but that's not too bad. And at least for this repo, that means that "nuget restore" on the solution always just works. And that's valuable.
This commit is contained in:
Andrew Arnott 2017-01-16 21:08:20 -08:00
Родитель 6ce768906d
Коммит 23d844d2ce
4 изменённых файлов: 5 добавлений и 7 удалений

Просмотреть файл

@ -15,11 +15,6 @@ Push-Location $PSScriptRoot
try {
$toolsPath = "$PSScriptRoot\tools"
# First restore NuProj packages since the solution restore depends on NuProj evaluation succeeding.
gci "$PSScriptRoot\src\project.json" -rec |? { $_.FullName -imatch 'nuget' } |% {
& "$toolsPath\Restore-NuGetPackages.ps1" -Path $_
}
& "$toolsPath\Restore-NuGetPackages.ps1" -Path "$PSScriptRoot\src"
$MicroBuildPackageSource = 'https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json'

Просмотреть файл

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NuProj" version="0.10.48-beta-gea4a31bbc5" developmentDependency="true" />
</packages>

Просмотреть файл

@ -15,7 +15,7 @@
</PropertyGroup>
<PropertyGroup>
<NuSpecTemplate>StreamJsonRpc.nuspec</NuSpecTemplate>
<NuProjPath>$(UserProfile)\.nuget\packages\NuProj\0.10.48-beta-gea4a31bbc5\tools\</NuProjPath>
<NuProjPath>..\..\packages\NuProj.0.10.48-beta-gea4a31bbc5\tools\</NuProjPath>
</PropertyGroup>
<Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
<PropertyGroup Label="Configuration">

Просмотреть файл

@ -15,7 +15,6 @@
"version": "1.5.46",
"suppressParent": "none"
},
"NuProj": "0.10.48-beta-gea4a31bbc5",
"ReadOnlySourceTree": {
"version": "0.1.36-beta",
"suppressParent": "none"