Merge pull request #8 from Microsoft/dev/andarno/SimplifyRestore

Simplify package restore, and use latest NuProj

init.ps1

@@ -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'

src/.nuget/packages.config

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

src/StreamJsonRpc.NuGet/StreamJsonRpc.NuGet.nuproj

@@ -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.11.14-beta\tools\</NuProjPath>
   </PropertyGroup>
   <Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
   <PropertyGroup Label="Configuration">

src/StreamJsonRpc.NuGet/project.json

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