Removed more edge cases thats not needed anymore

Author: o-l-a-v

src/code/InstallHelper.cs

@@ -187,7 +187,7 @@ private List<PSResourceInfo> ProcessRepositories(
             if (repository != null && repository.Length != 0)
             {
                 // Write error and disregard repository entries containing wildcards.
-                repository = Utils.ProcessNameWildcards(repository, removeWildcardEntries:false, out string[] errorMsgs, out _);
+                repository = Utils.ProcessNameWildcards(repository, removeWildcardEntries: false, out string[] errorMsgs, out _);
                 foreach (string error in errorMsgs)
                 {
                     _cmdletPassedIn.WriteError(new ErrorRecord(
@@ -231,7 +231,7 @@ private List<PSResourceInfo> ProcessRepositories(
                 if (repositoriesToSearch != null && repositoriesToSearch.Count == 0)
                 {
                     _cmdletPassedIn.ThrowTerminatingError(new ErrorRecord(
-                        new PSArgumentException ("Cannot resolve -Repository name. Run 'Get-PSResourceRepository' to view all registered repositories."),
+                        new PSArgumentException("Cannot resolve -Repository name. Run 'Get-PSResourceRepository' to view all registered repositories."),
                         "RepositoryNameIsNotResolved",
                         ErrorCategory.InvalidArgument,
                         _cmdletPassedIn));
@@ -305,7 +305,8 @@ private List<PSResourceInfo> ProcessRepositories(
                 bool installDepsForRepo = skipDependencyCheck;
 
                 // If no more packages to install, then return
-                if (_pkgNamesToInstall.Count == 0) {
+                if (_pkgNamesToInstall.Count == 0)
+                {
                     return allPkgsInstalled;
                 }
 
@@ -329,14 +330,9 @@ private List<PSResourceInfo> ProcessRepositories(
                 }
 
                 repositoryNamesToSearch.Add(repoName);
-                if ((currentRepository.ApiVersion == PSRepositoryInfo.APIVersion.V3) && (!installDepsForRepo))
-                {
-                    _cmdletPassedIn.WriteWarning("Installing dependencies is not currently supported for V3 server protocol repositories. The package will be installed without installing dependencies.");
-                    installDepsForRepo = true;
-                }
 
-                var installedPkgs = InstallPackages(_pkgNamesToInstall.ToArray(), currentRepository, currentServer, currentResponseUtil, scope, skipDependencyCheck, findHelper);
-                foreach (var pkg in installedPkgs)
+                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));
                 }
@@ -535,8 +531,10 @@ private void MoveFilesIntoInstallPath(
                         File.Delete(Path.Combine(finalModuleVersionDir, pkgInfo.Name + PSScriptFileExt));
                     }
                 }
-                else {
-                    if (_includeXml) {
+                else
+                {
+                    if (_includeXml)
+                    {
                         _cmdletPassedIn.WriteVerbose(string.Format("Moving '{0}' to '{1}'", Path.Combine(dirNameVersion, scriptXML), Path.Combine(installPath, scriptXML)));
                         Utils.MoveFiles(Path.Combine(dirNameVersion, scriptXML), Path.Combine(installPath, scriptXML));
                     }
@@ -614,11 +612,6 @@ private List<PSResourceInfo> InstallPackages(
 
                     if (!skipDependencyCheck)
                     {
-                        if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.V3)
-                        {
-                            _cmdletPassedIn.WriteWarning("Installing dependencies is not currently supported for V3 server protocol repositories. The package will be installed without installing dependencies.");
-                        }
-
                         // Get the dependencies from the installed package.
                         if (parentPkgObj.Dependencies.Length > 0)
                         {
@@ -748,7 +741,7 @@ private Hashtable BeginPackageInstall(
                         return packagesHash;
                     }
 
-                   break;
+                    break;
 
                 case VersionType.SpecificVersion:
                     string nugetVersionString = specificVersion.ToNormalizedString(); // 3.0.17-beta
@@ -802,7 +795,9 @@ private Hashtable BeginPackageInstall(
 
                         break;
                     }
-                } else {
+                }
+                else
+                {
                     pkgToInstall = currentResult.returnedObject;
 
                     break;
@@ -816,11 +811,13 @@ private Hashtable BeginPackageInstall(
 
             pkgToInstall.RepositorySourceLocation = repository.Uri.ToString();
             pkgToInstall.AdditionalMetadata.TryGetValue("NormalizedVersion", out string pkgVersion);
-            if (pkgVersion == null) {
+            if (pkgVersion == null)
+            {
                 // Not all NuGet providers (e.g. Artifactory, possibly others) send NormalizedVersion in NuGet package responses.
                 // If they don't, we need to manually construct the combined version+prerelease from pkgToInstall.Version and the prerelease string.
                 pkgVersion = pkgToInstall.Version.ToString();
-                if (!String.IsNullOrEmpty(pkgToInstall.Prerelease)) {
+                if (!String.IsNullOrEmpty(pkgToInstall.Prerelease))
+                {
                     pkgVersion += $"-{pkgToInstall.Prerelease}";
                 }
             }
@@ -913,11 +910,11 @@ private string CreateInstallationTempPath()
             try
             {
                 var dir = Directory.CreateDirectory(tempInstallPath);  // should check it gets created properly
-                                                                        // To delete file attributes from the existing ones get the current file attributes first and use AND (&) operator
-                                                                        // with a mask (bitwise complement of desired attributes combination).
-                                                                        // TODO: check the attributes and if it's read only then set it
-                                                                        // attribute may be inherited from the parent
-                                                                        // TODO:  are there Linux accommodations we need to consider here?
+                                                                       // To delete file attributes from the existing ones get the current file attributes first and use AND (&) operator
+                                                                       // with a mask (bitwise complement of desired attributes combination).
+                                                                       // TODO: check the attributes and if it's read only then set it
+                                                                       // attribute may be inherited from the parent
+                                                                       // TODO:  are there Linux accommodations we need to consider here?
                 dir.Attributes &= ~FileAttributes.ReadOnly;
             }
             catch (Exception e)
@@ -995,7 +992,8 @@ private bool TryInstallToTempPath(
                 bool isModule = File.Exists(moduleManifest);
                 bool isScript = File.Exists(scriptPath);
 
-                if (!isModule && !isScript) {
+                if (!isModule && !isScript)
+                {
                     scriptPath = "";
                 }
 
@@ -1374,7 +1372,8 @@ private bool CallAcceptLicense(PSResourceInfo p, string moduleManifest, string t
                                 new ArgumentException($"Package '{p.Name}' could not be installed: License.txt not found. License.txt must be provided when user license acceptance is required."),
                                 "LicenseTxtNotFound",
                                 ErrorCategory.ObjectNotFound,
-                                _cmdletPassedIn);;
+                                _cmdletPassedIn);
+                            ;
                             success = false;
 
                             return success;