Remove NuGet.proj

build/scripts/build.ps1

@@ -349,13 +349,7 @@ function Build-InsertionItems() {
 }
 
 function Build-NuGetPackages() {
-    $buildArgs = ""
-    if (-not $official) {
-        $buildArgs = '/p:SkipReleaseVersion=true /p:SkipPreReleaseVersion=true'
-    }
-
-    Ensure-NuGet | Out-Null
-    Run-MSBuild "src\NuGet\NuGet.proj" $buildArgs
+    Exec-Block { & "..\..\src\NuGet\build-nugets.ps1" -release:$release -packPerBuildPreRelease:$official -packPreRelease:$true -packRelease:$official }
 }
 
 function Build-DeployToSymStore() {

src/NuGet/NuGet.proj

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\build\Targets\Settings.props" />
-
-  <Target Name="Build">
-    <!-- NuGetPerBuildPreReleaseVersion -->
-    <Exec Command="$(OutputPath)Exes\csi\net46\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutputPath) $(NuGetPerBuildPreReleaseVersion) $(OutputPath)NuGet\PerBuildPreRelease &quot;$(CommitHashDisplay)&quot;" Condition="'$(SkipBuildPreReleaseVersion)' != 'true'" />
-
-    <!-- NuGetPreReleaseVersion -->
-    <Exec Command="$(OutputPath)Exes\csi\net46\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutputPath) $(NuGetPreReleaseVersion) $(OutputPath)NuGet\PreRelease &quot;$(CommitHashDisplay)&quot;" Condition="'$(SkipPreReleaseVersion)' != 'true'" />
-
-    <!-- NuGetReleaseVersion -->
-    <Exec Command="$(OutputPath)Exes\csi\net46\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutputPath) $(NuGetReleaseVersion) $(OutputPath)NuGet\Release &quot;$(CommitHashDisplay)&quot;" Condition="'$(SkipReleaseVersion)' != 'true'" />
-  </Target>
-
-  <Target Name="Clean">
-    <RemoveDir Directories="$(OutputPath)NuGet" />
-  </Target>
-
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build">
-  </Target>
-</Project>

src/NuGet/build-nugets.ps1

 [CmdletBinding(PositionalBinding=$false)]
 param (
+    # Configuration
     [switch]$release = $false,
-    [switch]$restore = $true)
+    [switch]$restore = $true,
+
+    # Which packages to create
+    [switch]$packPreRelease = $true,
+    [switch]$packRelease = $false,
+    [switch]$packPerBuildPreRelease = $false)
 
 Set-StrictMode -version 2.0
 $ErrorActionPreference = "Stop"
 
-function Pack-All([string]$nugetOutDir, [string]$packageKind) {
+function Pack-All([string]$packageKind) {
+
+    $packDir = Join-Path $nugetOutDir $packageKind
+    Create-Directory $packDir
+
+    Write-Host "Packing for $packageKind"
+
     foreach ($item in Get-ChildItem *.nuspec) {
         $name = Split-Path -leaf $item
-        Write-Host "Packing $name"
-        Exec-Console $dotnet "pack -nologo --no-build $packProject /p:EmptyDir=$emptyDir /p:NugetPackageKind=$packageKind /p:NuspecFile=$item /p:NuspecBasePath=$configDir -o $nugetOutDir -bl" 
+        Write-Host "`tPacking $name"
+        Exec-Command $dotnet "pack -nologo --no-build $packProject /p:EmptyDir=$emptyDir /p:NugetPackageKind=$packageKind /p:NuspecFile=$item /p:NuspecBasePath=$configDir -o $packDir" | Out-Null
     }
 }
 
@@ -21,8 +33,11 @@ try {
     $dotnet = Ensure-DotnetSdk
     $buildConfiguration = if ($release) { "Release" } else { "Debug" }
     $configDir = Join-Path $binariesDir $buildConfiguration
+    $nugetOutDir = Join-Path $configDir "NuGet"
     $packProject = Join-Path $PSScriptroot NuGetProjectPackUtil.csproj
 
+    Create-Directory $nugetOutDir
+
     if ($restore) { 
         Exec-Command $dotnet "restore $packProject"
     }
@@ -32,7 +47,15 @@ try {
     Create-Directory $emptyDir
     New-Item -Path (Join-Path $emptyDir "_._") -Type File | Out-Null
 
-    Pack-All "e:\temp\nuget" "prerelease"
+    if ($packPreRelease) {
+        Pack-All "PreRelease"
+    }
+    if ($packRelease) { 
+        Pack-All "Release"
+    }
+    if ($packPerBuildPreRelease) {
+        Pack-All "PerBuildPreRelease"
+    }
 
     exit 0
 }