More clean up

Author: alerickson

src/code/FindHelper.cs

@@ -831,8 +831,6 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R
                         if (_tag.Length == 0)
                         {
                             responses = currentServer.FindName(pkgName, _prerelease, _type, out errRecord);
-                            _cmdletPassedIn.WriteDebug($"returned back to SearchByName() 834");
-
                         }
                         else
                         {
@@ -1068,7 +1066,6 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R
             {
                 foreach (PSResourceInfo currentPkg in parentPkgs)
                 {
-                    _cmdletPassedIn.WriteDebug($"Finding dependency packages (SearchByNames) for '{currentPkg.Name}'");
                     foreach (PSResourceInfo pkgDep in FindDependencyPackages(currentServer, currentResponseUtil, currentPkg, repository))
                     {
                         yield return pkgDep;
@@ -1447,6 +1444,6 @@ private PSResourceInfo FindDependencyWithUpperBound(Dependency dep, ServerApiCal
             return depPkg;
         }
 
-    #endregion
+        #endregion
     }
 }

src/code/InstallHelper.cs

@@ -342,13 +342,11 @@ private List<PSResourceInfo> ProcessRepositories(
 
                 repositoryNamesToSearch.Add(repoName);
 
-                _cmdletPassedIn.WriteVerbose("InstallHelper line 345");
                 List<PSResourceInfo> installedPkgs = InstallPackages(_pkgNamesToInstall.ToArray(), currentRepository, currentServer, currentResponseUtil, scope, skipDependencyCheck, findHelper);
                 foreach (PSResourceInfo pkg in installedPkgs)
                 {
                     _pkgNamesToInstall.RemoveAll(x => x.Equals(pkg.Name, StringComparison.InvariantCultureIgnoreCase));
                 }
-                _cmdletPassedIn.WriteVerbose("InstallHelper line 351");
 
                 allPkgsInstalled.AddRange(installedPkgs);
             }
@@ -362,7 +360,6 @@ private List<PSResourceInfo> ProcessRepositories(
                     ErrorCategory.InvalidData,
                     _cmdletPassedIn));
             }
-            _cmdletPassedIn.WriteVerbose("InstallHelper line 365");
 
             return allPkgsInstalled;
         }
@@ -756,16 +753,13 @@ private ConcurrentDictionary<string, Hashtable> BeginPackageInstall(
                     pkgVersion += $"-{pkgToInstall.Prerelease}";
                 }
             }
-            _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - line 748");
 
             // For most repositories/providers the server will use the normalized version, which pkgVersion originally reflects
             // However, for container registries the version must exactly match what was in the artifact manifest and then reflected in PSResourceInfo.Version.ToString()
             if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.ContainerRegistry)
             {
                 pkgVersion = String.IsNullOrEmpty(pkgToInstall.Prerelease) ? pkgToInstall.Version.ToString() : $"{pkgToInstall.Version.ToString()}-{pkgToInstall.Prerelease}";
             }
-
-            _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - line 757");
 
             // Check to see if the pkg is already installed (ie the pkg is installed and the version satisfies the version range provided via param)
             // TODO:  can use cache for this
@@ -791,47 +785,6 @@ private ConcurrentDictionary<string, Hashtable> BeginPackageInstall(
 
 
             ConcurrentDictionary<string, Hashtable> updatedPackagesHash = packagesHash;
-
-            _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - line 784");
-            
-            if (!_savePkg)
-            {
-                _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - line 788");                
-
-            }
-            else
-            {
-                _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - line 793");
-            }
-  
-            if (pkgToInstall == null)
-            {
-                _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - packageToInstall is null 798");
-            }
-            else
-            {
-                _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - packageToInstall is not null 802");
-            }
-
-
-            if (string.IsNullOrEmpty(pkgToInstall.Name))
-            {
-                _cmdletPassedIn.WriteDebug($"BeginPackageInstall() -pkgtoinstall name is null or empty 808");
-            }
-            else
-            {
-                _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - pkgtoinstall is available 812 ");
-            }
-
-
-            if (string.IsNullOrEmpty(pkgVersion))
-            {
-                _cmdletPassedIn.WriteDebug($"BeginPackageInstall() -pkgVersion name is null or empty 818");
-            }
-            else
-            {
-                _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - pkgVersion is available 822 ");
-            }
 
             // -WhatIf processing.
             // if (_savePkg && !_cmdletPassedIn.ShouldProcess($"Package to save: '{pkgToInstall.Name}', version: '{pkgVersion}'"))
@@ -875,12 +828,10 @@ private ConcurrentDictionary<string, Hashtable> BeginPackageInstall(
             // }
             //else
             //{
-                _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - line 821");
-                // Concurrent updates
+                // Concurrent updates, currently only implemented for v2 server repositories
                 // Find all dependencies
-                if (!skipDependencyCheck)
+                if (!skipDependencyCheck && currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.V2)
                 {
-                    _cmdletPassedIn.WriteDebug($"BeginPackageInstall() - line 826");
                     // concurrency updates 
                     List<PSResourceInfo> parentAndDeps = _findHelper.FindDependencyPackages(currentServer, currentResponseUtil, pkgToInstall, repository).ToList();
                     // List returned only includes dependencies, so we'll add the parent pkg to this list to pass on to installation method
@@ -895,15 +846,11 @@ private ConcurrentDictionary<string, Hashtable> BeginPackageInstall(
                     // TODO:  check this version and prerelease combo
                     Stream responseStream = currentServer.InstallPackage(pkgToInstall.Name, pkgToInstall.Version.ToString(), true, out ErrorRecord installNameErrRecord);
 
-                    _cmdletPassedIn.WriteDebug("In BeginInstallPackage 898");
-
                     if (installNameErrRecord != null)
                     {
-                        _cmdletPassedIn.WriteDebug("In BeginInstallPackage 902");
                         errRecord = installNameErrRecord;
                         return packagesHash;
                     }
-                    _cmdletPassedIn.WriteDebug("In BeginInstallPackage 905");
                     bool installedToTempPathSuccessfully = _asNupkg ? TrySaveNupkgToTempPath(responseStream, tempInstallPath, pkgToInstall.Name, pkgToInstall.Version.ToString(), pkgToInstall, packagesHash, out updatedPackagesHash, out errRecord) :
                         TryInstallToTempPath(responseStream, tempInstallPath, pkgToInstall.Name, pkgToInstall.Version.ToString(), pkgToInstall, packagesHash, out updatedPackagesHash, out warning, out errRecord);
                     if (!installedToTempPathSuccessfully)