From df577a709c0a2eeb0d826d431c0faae320b5988a Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpar@microsoft.com>
Date: Thu, 12 Apr 2018 11:08:33 -0700
Subject: [PATCH] Cleaned up errors

---
 build/scripts/build.ps1                       | 21 +++++++++-------
 .../Microsoft.NetFX20.nuget.proj              | 24 -------------------
 .../Microsoft.NetFX20.nuspec                  |  2 +-
 ...til.csproj => NuGetProjectPackUtil.csproj} |  1 +
 4 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 src/Dependencies/Microsoft.NetFX20/Microsoft.NetFX20.nuget.proj
 rename src/NuGet/{NugetProjectPackUtil.csproj => NuGetProjectPackUtil.csproj} (98%)

diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1
index 0cfdc58fc53..77b92a9872d 100644
--- a/build/scripts/build.ps1
+++ b/build/scripts/build.ps1
@@ -336,24 +336,29 @@ function Build-InsertionItems() {
         $insertionDir = Join-Path $configDir "DevDivInsertionFiles"
         $vsToolsDir = Join-Path $insertionDir "VS.Tools.Roslyn"
         $packageOutDir = Join-Path $configDir "DevDivPackages\Roslyn"
+        $packArgs = "/p:NoPackageAnalysis=true"
         Create-Directory $packageOutDir
-        Write-Host "Packing VS.ExternalAPIs.Roslyn.nuspec"
-        Pack-One (Join-Path $insertionDir "VS.ExternalAPIs.Roslyn.nuspec") "PerBuildPreRelease" $packageOutDir -useConsole:$false | Out-Null
-        Write-Host "Packing VS.Tools.Roslyn.nuspec"
-        Pack-One (Join-Path $vsToolsDir "VS.Tools.Roslyn.nuspec") "PerBuildPreRelease" $packageOutDir -basePath $vsToolsDir -useConsole:$false | Out-Null
+        Pack-One (Join-Path $insertionDir "VS.ExternalAPIs.Roslyn.nuspec") "PerBuildPreRelease" $packageOutDir $packArgs 
+        Pack-One (Join-Path $vsToolsDir "VS.Tools.Roslyn.nuspec") "PerBuildPreRelease" $packageOutDir $packArgs -basePath $vsToolsDir 
+
+        $netfx20Dir = Join-Path $repoDir "src\Dependencies\Microsoft.NetFX20"
+        Pack-One (Join-Path $netfx20Dir "Microsoft.NetFX20.nuspec") "PerBuildPreRelease" -packageOutDir (Join-Path $configDir "NuGet\NetFX20") -basePath $netfx20Dir -extraArgs "$packArgs /p:CurrentVersion=4.3.0" 
 
         Run-MSBuild "DevDivVsix\PortableFacades\PortableFacades.vsmanproj" -buildArgs $extraArgs
         Run-MSBuild "DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.vsmanproj" -buildArgs $extraArgs
         Run-MSBuild "DevDivVsix\MicrosoftCodeAnalysisLanguageServices\Microsoft.CodeAnalysis.LanguageServices.vsmanproj" -buildArgs "$extraArgs"
-        Run-MSBuild "..\Dependencies\Microsoft.NetFX20\Microsoft.NetFX20.nuget.proj"
     }
     finally {
         Pop-Location
     }
 }
 
-function Pack-One([string]$nuspecFilePath, [string]$packageKind, [string]$packageOutDir, [string]$extraArgs, [string]$basePath = "", [switch]$useConsole = $true) { 
+function Pack-One([string]$nuspecFilePath, [string]$packageKind, [string]$packageOutDir = "", [string]$extraArgs = "", [string]$basePath = "", [switch]$useConsole = $true) { 
     $nugetDir = Join-Path $repoDir "src\Nuget"
+    if ($packageOutDir -eq "") {
+        $packageOutDir = Join-Path $configDir "NuGet\$packageKind"
+    }
+
     if ($basePath -eq "") { 
         $basePath = $configDir
     }
@@ -361,6 +366,8 @@ function Pack-One([string]$nuspecFilePath, [string]$packageKind, [string]$packag
     if (-not ([IO.Path]::IsPathRooted($nuspecFilePath))) { 
         $nuspecFilePath = Join-Path $nugetDir $nuspecFilePath
     }
+
+    Create-Directory $packageOutDir
     $nuspecFileName = Split-Path -leaf $nuspecFilePath
     $projectFilePath = Join-Path $nugetDir "NuGetProjectPackUtil.csproj"
     $packArgs = "pack -nologo --no-build $projectFilePath $extraArgs /p:NugetPackageKind=$packageKind /p:NuspecFile=$nuspecFilePath /p:NuspecBasePath=$basePath -o $packageOutDir" 
@@ -387,9 +394,7 @@ function Build-NuGetPackages() {
 
     Push-Location (Join-Path $repoDir "src\NuGet")
     try {
-        $nugetOutDir = Join-Path $configDir "NuGet"
         $extraArgs = ""
-        Create-Directory $nugetOutDir
 
         if ($official) {
             $extraArgs += " /p:UseRealCommit=true"
diff --git a/src/Dependencies/Microsoft.NetFX20/Microsoft.NetFX20.nuget.proj b/src/Dependencies/Microsoft.NetFX20/Microsoft.NetFX20.nuget.proj
deleted file mode 100644
index 9cff6c542f1..00000000000
--- a/src/Dependencies/Microsoft.NetFX20/Microsoft.NetFX20.nuget.proj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="Version.targets" />
-  <Import Project="..\..\..\build\Targets\Settings.props" />
-  <ItemGroup Label="Redist">
-    <NuSpec Include="Microsoft.NetFX20.nuspec" />
-  </ItemGroup>
-  <Target Name="Build" Inputs="@(NuSpec)" Outputs="@(NuSpec -> NuGet\$(NuGetVersionType)\%(Identity).$(NuGetVersion).nupkg">
-    <PropertyGroup>
-      <NuGetArguments>-prop currentVersion="$(NuGetVersion)"</NuGetArguments>
-      <NuGetOutDir>$(OutDir)NuGet\$(NuGetVersionType)</NuGetOutDir>
-    </PropertyGroup>
-    <!-- clean our output directory -->
-    <MakeDir Directories="$(NuGetOutDir)" Condition="!Exists('$(NuGetOutDir)')" />
-    <!-- copy any extra content files (like EULAs) that we need to include -->
-    <Copy SourceFiles="@(Content)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
-    <!-- package! -->
-    <Exec Command="..\..\..\Binaries\Tools\NuGet Pack %(NuSpec.Identity) -OutputDirectory $(NuGetOutDir) $(NuGetArguments)" />
-  </Target>
-  <Target Name="Clean">
-    <RemoveDir Directories="$(OutDir)NuGet" />
-  </Target>
-</Project>
diff --git a/src/Dependencies/Microsoft.NetFX20/Microsoft.NetFX20.nuspec b/src/Dependencies/Microsoft.NetFX20/Microsoft.NetFX20.nuspec
index 1410300090f..b5af6645d03 100644
--- a/src/Dependencies/Microsoft.NetFX20/Microsoft.NetFX20.nuspec
+++ b/src/Dependencies/Microsoft.NetFX20/Microsoft.NetFX20.nuspec
@@ -10,7 +10,7 @@ Supported Platforms:
     </description>
     <language>en-US</language>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <version>$currentVersion$</version>
+    <version>$version$</version>
     <authors>Microsoft</authors>
     <licenseUrl>http://go.microsoft.com/fwlink/?LinkId=394369</licenseUrl>
     <projectUrl>http://msdn.com/roslyn</projectUrl>
diff --git a/src/NuGet/NugetProjectPackUtil.csproj b/src/NuGet/NuGetProjectPackUtil.csproj
similarity index 98%
rename from src/NuGet/NugetProjectPackUtil.csproj
rename to src/NuGet/NuGetProjectPackUtil.csproj
index 1f5182f6550..af9164cfb93 100644
--- a/src/NuGet/NugetProjectPackUtil.csproj
+++ b/src/NuGet/NuGetProjectPackUtil.csproj
@@ -32,6 +32,7 @@
     <NuspecProperties>$(NuspecProperties);additionalFilesPath=$(RepoRoot)build/NuGetAdditionalFiles</NuspecProperties>
     <NuspecProperties>$(NuspecProperties);srcDirPath=$(RepoRoot)\src</NuspecProperties>
     <NuspecProperties Condition="'$(EmptyDir)' != ''">$(NuspecProperties);emptyDirPath=$(EmptyDir)</NuspecProperties>
+    <NuspecProperties Condition="'$(CurrentVersion)' != ''">$(NuspecProperties);currentVersion=$(CurrentVersion)</NuspecProperties>
     <NuspecProperties>$(NuspecProperties);commitPathMessage=$(_CommitPathMessage)</NuspecProperties>
     <NuspecProperties>$(NuspecProperties);tags=Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics</NuspecProperties>
 
-- 
GitLab