FixBuild: Revert the changes to get Pester from NuGet cache (PowerShell#6282)

daxian-dbw · kalgiz · commit 346969ed5529 · 2018-03-01T14:48:48.000-08:00
Attempt to fix the macOS build. In PowerShell#6263, I tried flushing the cache and it worked in the PR. However, after merging the PR, it turns out the master CI build failed again with the same Pester package restore error. So I'm reverting the change that got Pester from NuGet cache.
diff --git a/build.psm1 b/build.psm1
@@ -671,7 +671,7 @@ function Restore-PSPester
         [ValidateNotNullOrEmpty()]
         [string] $Destination = ([IO.Path]::Combine((Split-Path (Get-PSOptions -DefaultToNew).Output), "Modules"))
     )
-    Copy-PSGalleryModules -Destination $Destination -ModuleNames Pester
+    Save-Module -Name Pester -Path $Destination -Repository PSGallery
 }
 
 function Compress-TestContent {
@@ -2303,15 +2303,9 @@ function Copy-PSGalleryModules
     [CmdletBinding()]
     param(
         [Parameter(Mandatory=$true)]
-        [string]$Destination,
-
-        [Parameter()]
-        [ValidateNotNullOrEmpty()]
-        [string[]]$ModuleNames
+        [string]$Destination
     )
 
-    $ModulesOnlyForCI = @("Pester")
-
     if (!$Destination.EndsWith("Modules")) {
         throw "Installing to an unexpected location"
     }
@@ -2329,15 +2323,6 @@ function Copy-PSGalleryModules
     foreach ($m in $psGalleryProj.Project.ItemGroup.PackageReference) {
         $name = $m.Include
         $version = $m.Version
-
-        if ($null -ne $ModuleNames) {
-            # When '-ModuleNames' is specified, then we only copy those specified modules
-            if ($name -notin $ModuleNames) { continue }
-        } else {
-            # When '-ModuleNames' is NOT specified, copy all modules except the CI-only ones
-            if ($name -in $ModulesOnlyForCI) { continue }
-        }
-
         log "Name='$Name', Version='$version', Destination='$Destination'"
 
         # Remove the build revision from the src (nuget drops it).
@@ -2361,18 +2346,7 @@ function Copy-PSGalleryModules
         Remove-Item -Force -ErrorAction Ignore -Recurse "$Destination/$name"
         New-Item -Path $dest -ItemType Directory -Force -ErrorAction Stop > $null
         $dontCopy = '*.nupkg', '*.nupkg.sha512', '*.nuspec', 'System.Runtime.InteropServices.RuntimeInformation.dll'
-
-        switch ($name)
-        {
-            "Pester" {
-                $toolsDir = Join-Path -Path $src -ChildPath "tools"
-                Copy-Item -Path $toolsDir/* -Destination $dest -Recurse -Force
-            }
-
-            default {
-                Copy-Item -Exclude $dontCopy -Recurse $src/* $dest
-            }
-        }
+        Copy-Item -Exclude $dontCopy -Recurse $src/* $dest
     }
 }
 
diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
@@ -6,7 +6,6 @@
     <PackageReference Include="PackageManagement" Version="1.1.7.0" />
     <PackageReference Include="PowerShellGet" Version="1.6.0" />
     <PackageReference Include="Microsoft.PowerShell.Archive" Version="1.1.0.0" />
-    <PackageReference Include="Pester" Version="4.3.1" />
   </ItemGroup>
 
 </Project>
