Merge pull request #8982 from davkean/update-nuget

Update NuGet to 3.4.0.645 and remove ZIP usage on WIndows

NuGet.Config

@@ -2,6 +2,13 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 
 <configuration>
+  <packageRestore>
+    <!-- Currently, the repository's version of NuGet.exe and Visual Studio's version
+         fight over the format of project.lock.json because the one in the respository
+         is newer. To prevent that, turn off package restore. -->
+    
+    <add key="automatic" value="false" />
+  </packageRestore>
   <solution>
     <add key="disableSourceControlIntegration" value="true" />
   </solution>

build/scripts/restore.ps1

-param ([uri]$nugetZipUrl = $(throw "Need an URL to the NuGet zip") )
-
-$destination = ${env:UserProfile}
-# extract archive file name from download url path
-$nugetZipFilename = ($nugetZipUrl.Segments | select -Last 1)
-# download to temp under archive file name if not done already
-$outFilePath = "${env:TEMP}\$nugetZipFilename"
-if (-not(Test-Path $outFilePath)) {
-    write-host "Downloading $nugetZipUrl -> $outFilePath"
-    (New-Object System.Net.WebClient).DownloadFile($nugetZipUrl, $outFilePath)
-}
-
-# It's possible for restore to run in parallel on the test machines.  As such
-# we need to restore only new files to handle simultaneous restore scenarios.
-write-host "Extracting"
-Add-Type -assembly "System.IO.Compression.Filesystem"
-$archive = [IO.Compression.ZipFile]::OpenRead($outFilePath)
-foreach ($entry in $archive.Entries) {
-    $entryFilePath = join-path $destination $entry.FullName
-    if (test-path $entryFilePath) {
-        continue;
-    }
-
-    # If it's a directory then create it now.  Calling ExtractToFile will
-    # throw on a directory.  There is no way I can find to ask a
-    # ZipArchiveEntry if it is a directory hence we just check for a file
-    # extension
-    [string]$ext = [IO.Path]::GetExtension($entryFilePath)
-    if ($ext -eq "") {
-        $null = mkdir $entryFilePath -errorAction SilentlyContinue
-        continue;
-    }
-
-    $entryDirectory = split-path -parent $entryFilePath
-    if (-not (test-path $entryDirectory)) {
-        $null = mkdir $entryDirectory -errorAction SilentlyContinue
-    }
-
-    try {
-        write-host "Restoring $entryFilePath"
-        [IO.Compression.ZipFileExtensions]::ExtractToFile($entry, $entryFilePath) 
-    } catch {
-        write-host "Unable to restore $($entry.FullName) $Error"
-    }
-}
-
-$archive.Dispose()

cibuild.cmd

@@ -2,11 +2,8 @@
 
 REM Parse Arguments.
 
-set NugetZipUrlRoot=https://dotnetci.blob.core.windows.net/roslyn
-set NugetZipUrl=%NuGetZipUrlRoot%/nuget.54.zip
 set RoslynRoot=%~dp0
 set BuildConfiguration=Debug
-set BuildRestore=false
 
 REM Because override the C#/VB toolset to build against our LKG package, it is important
 REM that we do not reuse MSBuild nodes from other jobs/builds on the machine. Otherwise, 
@@ -21,7 +18,6 @@ if /I "%1" == "/release" set BuildConfiguration=Release&&shift&& goto :ParseArgu
 if /I "%1" == "/test32" set Test64=false&&shift&& goto :ParseArguments
 if /I "%1" == "/test64" set Test64=true&&shift&& goto :ParseArguments
 if /I "%1" == "/testDeterminism" set TestDeterminism=true&&shift&& goto :ParseArguments
-if /I "%1" == "/restore" set BuildRestore=true&&shift&& goto :ParseArguments
 call :Usage && exit /b 1
 :DoneParsing
 
@@ -30,11 +26,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd
 powershell -noprofile -executionPolicy RemoteSigned -file "%RoslynRoot%\build\scripts\check-branch.ps1" || goto :BuildFailed
 
 REM Restore the NuGet packages 
-if "%BuildRestore%" == "true" (
-    call "%RoslynRoot%\Restore.cmd" || goto :BuildFailed
-) else (
-    powershell -noprofile -executionPolicy RemoteSigned -file "%RoslynRoot%\build\scripts\restore.ps1" "%NugetZipUrl%" || goto :BuildFailed
-)
+call "%RoslynRoot%\Restore.cmd" || goto :BuildFailed
 
 REM Ensure the binaries directory exists because msbuild can fail when part of the path to LogFile isn't present.
 set bindir=%RoslynRoot%Binaries
@@ -84,7 +76,6 @@ exit /b 0
 @echo   /release Perform release build.
 @echo   /test32  Run unit tests in the 32-bit runner.  This is the default.
 @echo   /test64  Run units tests in the 64-bit runner.
-@echo   /restore Perform actual nuget restore instead of using zip drops.
 @echo.
 @goto :eof
 

src/Compilers/Core/Portable/project.lock.json

 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETPortable,Version=v4.5,Profile=Profile7": {
       "System.Collections.Immutable/1.1.37": {
+        "type": "package",
         "compile": {
           "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
         },
@@ -12,8 +13,9 @@
         }
       },
       "System.Reflection.Metadata/1.2.0-rc3-23811": {
+        "type": "package",
         "dependencies": {
-          "System.Collections.Immutable": "[1.1.37, )"
+          "System.Collections.Immutable": "1.1.37"
         },
         "compile": {
           "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
@@ -29,20 +31,22 @@
       "sha512": "fTpqwZYBzoklTT+XjTRK8KxvmrGkYHzBiylCcKyQcxiOM8k+QvhNBxRvFHDWzy4OEP5f8/9n+xQ9mEgEXY+muA==",
       "type": "Package",
       "files": [
+        "System.Collections.Immutable.nuspec",
         "[Content_Types].xml",
         "_rels/.rels",
         "lib/dotnet/System.Collections.Immutable.dll",
         "lib/dotnet/System.Collections.Immutable.xml",
         "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
         "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
-        "package/services/metadata/core-properties/a02fdeabe1114a24bba55860b8703852.psmdcp",
-        "System.Collections.Immutable.nuspec"
+        "package/services/metadata/core-properties/a02fdeabe1114a24bba55860b8703852.psmdcp"
       ]
     },
     "System.Reflection.Metadata/1.2.0-rc3-23811": {
       "sha512": "gAOQV1dsGyQfQUuzsCYFLMlI6BhfK1/2aA7JGf6gJphaLgjU4dV4hzjbE0iZXgo61VUuda2LtCBrWWZBw5897Q==",
       "type": "Package",
       "files": [
+        "System.Reflection.Metadata.nuspec",
+        "ThirdPartyNotices.txt",
         "[Content_Types].xml",
         "_rels/.rels",
         "dotnet_library_license.txt",
@@ -50,9 +54,7 @@
         "lib/dotnet5.2/System.Reflection.Metadata.xml",
         "lib/portable-net45+win8/System.Reflection.Metadata.dll",
         "lib/portable-net45+win8/System.Reflection.Metadata.xml",
-        "package/services/metadata/core-properties/9aa921f066b94690988804574c5d2231.psmdcp",
-        "System.Reflection.Metadata.nuspec",
-        "ThirdPartyNotices.txt"
+        "package/services/metadata/core-properties/9aa921f066b94690988804574c5d2231.psmdcp"
       ]
     }
   },

src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.lock.json

 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETPortable,Version=v4.5,Profile=Profile7": {
       "Microsoft.DiaSymReader/1.0.7": {
+        "type": "package",
         "compile": {
           "lib/portable-net45+win8/Microsoft.DiaSymReader.dll": {}
         },
@@ -12,6 +13,7 @@
         }
       },
       "System.Collections.Immutable/1.1.37": {
+        "type": "package",
         "compile": {
           "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
         },
@@ -20,8 +22,9 @@
         }
       },
       "System.Reflection.Metadata/1.2.0-rc3-23811": {
+        "type": "package",
         "dependencies": {
-          "System.Collections.Immutable": "[1.1.37, )"
+          "System.Collections.Immutable": "1.1.37"
         },
         "compile": {
           "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
@@ -37,13 +40,13 @@
       "sha512": "4tPrkKu02w87HEvoubBGm7Hqjps69DucsBWQvGezwvDV5RJt+eZqdmdC/jNH1qn6hIem9JpJnLBK0abBzhErOg==",
       "type": "Package",
       "files": [
+        "Microsoft.DiaSymReader.nuspec",
         "[Content_Types].xml",
         "_rels/.rels",
         "lib/net20/Microsoft.DiaSymReader.dll",
         "lib/net20/Microsoft.DiaSymReader.xml",
         "lib/portable-net45+win8/Microsoft.DiaSymReader.dll",
         "lib/portable-net45+win8/Microsoft.DiaSymReader.xml",
-        "Microsoft.DiaSymReader.nuspec",
         "package/services/metadata/core-properties/8754926735b64532b55b0acd21f93808.psmdcp"
       ]
     },
@@ -51,20 +54,22 @@
       "sha512": "fTpqwZYBzoklTT+XjTRK8KxvmrGkYHzBiylCcKyQcxiOM8k+QvhNBxRvFHDWzy4OEP5f8/9n+xQ9mEgEXY+muA==",
       "type": "Package",
       "files": [
+        "System.Collections.Immutable.nuspec",
         "[Content_Types].xml",
         "_rels/.rels",
         "lib/dotnet/System.Collections.Immutable.dll",
         "lib/dotnet/System.Collections.Immutable.xml",
         "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
         "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml",
-        "package/services/metadata/core-properties/a02fdeabe1114a24bba55860b8703852.psmdcp",
-        "System.Collections.Immutable.nuspec"
+        "package/services/metadata/core-properties/a02fdeabe1114a24bba55860b8703852.psmdcp"
       ]
     },
     "System.Reflection.Metadata/1.2.0-rc3-23811": {
       "sha512": "gAOQV1dsGyQfQUuzsCYFLMlI6BhfK1/2aA7JGf6gJphaLgjU4dV4hzjbE0iZXgo61VUuda2LtCBrWWZBw5897Q==",
       "type": "Package",
       "files": [
+        "System.Reflection.Metadata.nuspec",
+        "ThirdPartyNotices.txt",
         "[Content_Types].xml",
         "_rels/.rels",
         "dotnet_library_license.txt",
@@ -72,9 +77,7 @@
         "lib/dotnet5.2/System.Reflection.Metadata.xml",
         "lib/portable-net45+win8/System.Reflection.Metadata.dll",
         "lib/portable-net45+win8/System.Reflection.Metadata.xml",
-        "package/services/metadata/core-properties/9aa921f066b94690988804574c5d2231.psmdcp",
-        "System.Reflection.Metadata.nuspec",
-        "ThirdPartyNotices.txt"
+        "package/services/metadata/core-properties/9aa921f066b94690988804574c5d2231.psmdcp"
       ]
     }
   },

src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/project.lock.json

 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETFramework,Version=v2.0": {
       "Microsoft.NetFX20/1.0.3": {
+        "type": "package",
         "compile": {
           "lib/net20/mscorlib.dll": {}
         },
@@ -18,10 +19,10 @@
       "sha512": "7hPxu4q65ap1yiAuniskpMIJyTwviBIRItCYXozm/6Ikt03Uw3NNQNNzf7mjOEYYi9CG9VIv1KYwBGEa3FWAcg==",
       "type": "Package",
       "files": [
+        "Microsoft.NetFX20.nuspec",
         "[Content_Types].xml",
         "_rels/.rels",
         "lib/net20/mscorlib.dll",
-        "Microsoft.NetFX20.nuspec",
         "package/services/metadata/core-properties/92df590a790045efaea1dc300f16b60b.psmdcp"
       ]
     }

src/InteractiveWindow/Editor/project.lock.json

 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETFramework,Version=v4.6": {}
   },

src/Test/Utilities/Portable/project.json

 {
   "dependencies": {
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
-    "System.Collections.Concurrent": "4.0.10"
+      "xunit": "2.1.0",
+      "Microsoft.NETCore": "5.0.0",
+      "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
+      "System.Xml.XmlDocument": "4.0.0",
+      "System.Console": "4.0.0-beta-23123",
+      "System.Threading.Thread": "4.0.0-beta-23123"
   },
   "frameworks": {
     "dotnet": {

src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.lock.json

 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETFramework,Version=v4.5": {},
     ".NETFramework,Version=v4.5/osx.10.10": {},

src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.lock.json

 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETFramework,Version=v4.5": {},
     ".NETFramework,Version=v4.5/osx.10.10": {},

src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.lock.json

 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETFramework,Version=v4.5": {},
     ".NETFramework,Version=v4.5/osx.10.10": {},

src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.lock.json

 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETFramework,Version=v4.5": {},
     ".NETFramework,Version=v4.5/osx.10.10": {},

src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.lock.json

 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETFramework,Version=v4.5": {},
     ".NETFramework,Version=v4.5/osx.10.10": {},