Merge branch 'artifactoryV2Bug' of https://github.com/alerickson/PSRe…

…sourceGet into v2AdoBug
PowerShell · Oct 4, 2023 · 54c36cd · 54c36cd
2 parents f84558b + 78fe79f
commit 54c36cd
Show file tree

Hide file tree

Showing 10 changed files with 371 additions and 296 deletions.
diff --git a/src/Microsoft.PowerShell.PSResourceGet.psm1 b/src/Microsoft.PowerShell.PSResourceGet.psm1
@@ -43,6 +43,7 @@ function Import-PSGetRepository {
                             Trusted = $_.Trusted
                             PassThru = $true
                             Force = $Force
+                            ApiVersion = 'v2'
                         }
                         Register-PSResourceRepository @registerPSResourceRepositorySplat
                     }

diff --git a/src/code/IServerAPICalls.cs b/src/code/IServerAPICalls.cs
@@ -83,16 +83,7 @@ public interface IServerAPICalls
     /// Name: no wildcard support.
     /// Examples: Install "PowerShellGet"
     /// </summary>
-    Stream InstallName(string packageName, string packageVersion, bool includePrerelease, out ErrorRecord errRecord);
-
-    /// <summary>
-    /// Installs package with specific name and version.
-    /// Name: no wildcard support.
-    /// Version: no wildcard support.
-    /// Examples: Install "PowerShellGet" -Version "3.0.0.0"
-    ///           Install "PowerShellGet" -Version "3.0.0-beta16"
-    /// </summary>    
-    Stream InstallVersion(string packageName, string version, out ErrorRecord errRecord);
+    Stream InstallPackage(string packageName, string packageVersion, bool includePrerelease, out ErrorRecord errRecord);
 
     #endregion
 }
diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs
@@ -549,7 +549,7 @@ private List<PSResourceInfo> InstallPackages(
                     // and value as a Hashtable of specific package info:
                     //     packageName, { version = "", isScript = "", isModule = "", pkg = "", etc. }
                     // Install parent package to the temp directory.
-                    Hashtable packagesHash = InstallPackage(
+                    Hashtable packagesHash = BeginPackageInstall(
                                                         searchVersionType: _versionType,
                                                         specificVersion: _nugetVersion,
                                                         versionRange: _versionRange,
@@ -617,7 +617,7 @@ private List<PSResourceInfo> InstallPackages(
                                     }
                                 }
 
-                                packagesHash = InstallPackage(
+                                packagesHash = BeginPackageInstall(
                                             searchVersionType: VersionType.SpecificVersion,
                                             specificVersion: depVersion,
                                             versionRange: null,
@@ -683,7 +683,7 @@ private List<PSResourceInfo> InstallPackages(
         /// <summary>
         /// Installs a single package to the temporary path.
         /// </summary>
-        private Hashtable InstallPackage(
+        private Hashtable BeginPackageInstall(
             VersionType searchVersionType,
             NuGetVersion specificVersion,
             VersionRange versionRange,
@@ -839,25 +839,11 @@ private Hashtable InstallPackage(
             {
                 // Download the package.
                 string pkgName = pkgToInstall.Name;
-                Stream responseStream;
-
-                if (searchVersionType == VersionType.NoVersion && !_prerelease)
+                Stream responseStream = currentServer.InstallPackage(pkgName, pkgVersion, _prerelease, out ErrorRecord installNameErrRecord);
+                if (installNameErrRecord != null)
                 {
-                    responseStream = currentServer.InstallName(pkgName, pkgVersion, _prerelease, out ErrorRecord installNameErrRecord);
-                    if (installNameErrRecord != null)
-                    {
-                        errRecord = installNameErrRecord;
-                        return packagesHash;
-                    }
-                }
-                else
-                {
-                    responseStream = currentServer.InstallVersion(pkgName, pkgVersion, out ErrorRecord installVersionErrRecord);
-                    if (installVersionErrRecord != null)
-                    {
-                        errRecord = installVersionErrRecord;
-                        return packagesHash;
-                    }
+                    errRecord = installNameErrRecord;
+                    return packagesHash;
                 }
 
                 bool installedToTempPathSuccessfully = _asNupkg ? TrySaveNupkgToTempPath(responseStream, tempInstallPath, pkgName, pkgVersion, pkgToInstall, packagesHash, out updatedPackagesHash, out errRecord) :