Fixes for use of IEnumerable and dependent module re-install issues

src/code/FindPSResource.cs

@@ -217,24 +217,19 @@ private void ProcessResourceNameParameterSet()
                 return;
             }            
 
-            List<PSResourceInfo> foundPackages = new List<PSResourceInfo>();
-
-            foreach (PSResourceInfo package in _findHelper.FindByResourceName(
-                Name,
-                Type,
-                Version,
-                Prerelease,
-                Tag,
-                Repository,
-                Credential,
-                IncludeDependencies))
-            {
-                foundPackages.Add(package);
-            }
+            List<PSResourceInfo> foundPackages = _findHelper.FindByResourceName(
+                name: Name,
+                type: Type,
+                version: Version,
+                prerelease: Prerelease,
+                tag: Tag,
+                repository: Repository,
+                credential: Credential,
+                includeDependencies: IncludeDependencies);
 
             foreach (var uniquePackageVersion in foundPackages.GroupBy(
                 m => new {m.Name, m.Version, m.Repository}).Select(
-                    group => group.First()).ToList())
+                    group => group.First()))
             {
                 WriteObject(uniquePackageVersion);
             }
@@ -292,21 +287,15 @@ private void ProcessCommandOrDscParameterSet(bool isSearchingForCommands)
                 moduleNamesToSearch = new string[] {"*"};
             }
 
-            List<PSResourceInfo> foundPackages = new List<PSResourceInfo>();
-
-            foreach (PSResourceInfo package in _findHelper.FindByResourceName(
+            List<PSResourceInfo> foundPackages = _findHelper.FindByResourceName(
                 name: moduleNamesToSearch,
-                // provide type so Scripts endpoint for PSGallery won't be searched
                 type: isSearchingForCommands? ResourceType.Command : ResourceType.DscResource,
                 version: Version,
                 prerelease: Prerelease,
                 tag: Tag,
                 repository: Repository,
                 credential: Credential,
-                includeDependencies: IncludeDependencies))
-            {
-                foundPackages.Add(package);
-            }
+                includeDependencies: IncludeDependencies);
 
             // if a single package contains multiple commands we are interested in, return a unique entry for each:
             // Command1 , PackageA

src/code/GetHelper.cs

@@ -37,6 +37,44 @@ public GetHelper(PSCmdlet cmdletPassedIn)
 
         #region Public methods
 
+        /// <summary>
+        /// Retrieves package paths from provided search paths for installed packages 
+        /// by name *and* version.
+        /// </summary>
+        public IEnumerable<PSResourceInfo> GetInstalledPackages(
+            IEnumerable<PSResourceInfo> pkgs,
+            List<string> pathsToSearch)
+        {
+            foreach (var pkg in pkgs)
+            {
+                // Filter on specific version.
+                var nugetVersion = new NuGetVersion(pkg.Version);
+                var pkgVersionRange = new VersionRange(
+                    minVersion: nugetVersion,
+                    includeMinVersion: true,
+                    maxVersion: nugetVersion,
+                    includeMaxVersion: true);
+
+                // Search by package name.
+                var foundPkgPaths = FilterPkgPathsByName(
+                    names: new string[] { pkg.Name },
+                    pathsToSearch);
+
+                // Filter by package version.
+                foreach (var pkgPath in FilterPkgPathsByVersion(
+                    versionRange: pkgVersionRange,
+                    dirsToSearch: foundPkgPaths,
+                    selectPrereleaseOnly: false))
+                {
+                    PSResourceInfo returnPkg = OutputPackageObject(pkgPath, _scriptDictionary);
+                    if (returnPkg != null)
+                    {
+                        yield return returnPkg;
+                    }
+                }
+            }
+        }
+
         public IEnumerable<PSResourceInfo> GetPackagesFromPath(
             string[] name,
             VersionRange versionRange,

src/code/GetPSResource.cs

@@ -127,15 +127,15 @@ protected override void ProcessRecord()
                     this));
             }
 
-            // this catches the case where Name wasn't passed in as null or empty,
-            // but after filtering out unsupported wildcard names in BeginProcessing() there are no elements left in Name
+            // This catches the case where Name wasn't passed in as null or empty,
+            // but after filtering out unsupported wildcard names in BeginProcessing() there are no elements left in Name.
             if (namesToSearch.Length == 0)
             {
                  return;
             }
 
+            // SelectPrereleaseOnly is false because we want both stable and prerelease versions all the time..
             GetHelper getHelper = new GetHelper(this);
-            // selectPrereleaseOnly is false because we want both stable and prerelease versions all the time.
             foreach (PSResourceInfo pkg in getHelper.GetPackagesFromPath(
                 name: namesToSearch,
                 versionRange: _versionRange,

src/code/InstallHelper.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.PowerShell.Commands;
 using Microsoft.PowerShell.PowerShellGet.UtilClasses;
 using MoreLinq.Extensions;
 using NuGet.Common;
@@ -15,7 +14,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -192,20 +190,19 @@ private List<PSResourceInfo> ProcessRepositories(
                 var isLocalRepo = repo.Uri.AbsoluteUri.StartsWith(Uri.UriSchemeFile + Uri.SchemeDelimiter, StringComparison.OrdinalIgnoreCase);
 
                 // Finds parent packages and dependencies
-                IEnumerable<PSResourceInfo> pkgsFromRepoToInstall = findHelper.FindByResourceName(
+                List<PSResourceInfo> pkgsFromRepoToInstall = findHelper.FindByResourceName(
                     name: _pkgNamesToInstall.ToArray(),
                     type: ResourceType.None,
-                    version: _versionRange != null ? _versionRange.OriginalString : null,
+                    version: _versionRange?.OriginalString,
                     prerelease: _prerelease,
                     tag: null,
                     repository: new string[] { repoName },
                     credential: credential,
                     includeDependencies: !skipDependencyCheck);
 
-                if (!pkgsFromRepoToInstall.Any())
+                if (pkgsFromRepoToInstall.Count == 0)
                 {
                     _cmdletPassedIn.WriteVerbose(string.Format("None of the specified resources were found in the '{0}' repository.", repoName));
-                    // Check in the next repository
                     continue;
                 }
 
@@ -225,7 +222,7 @@ private List<PSResourceInfo> ProcessRepositories(
                     pkgsFromRepoToInstall = FilterByInstalledPkgs(pkgsFromRepoToInstall);
                 }
 
-                if (!pkgsFromRepoToInstall.Any())
+                if (pkgsFromRepoToInstall.Count is 0)
                 {
                     continue;
                 }
@@ -261,72 +258,75 @@ private List<PSResourceInfo> ProcessRepositories(
         }
 
         // Check if any of the pkg versions are already installed, if they are we'll remove them from the list of packages to install
-        private IEnumerable<PSResourceInfo> FilterByInstalledPkgs(IEnumerable<PSResourceInfo> packages)
+        private List<PSResourceInfo> FilterByInstalledPkgs(List<PSResourceInfo> packages)
         {
-            // Create list of installation paths to search.
-            List<string> _pathsToSearch = new List<string>();
-            // _pathsToInstallPkg will only contain the paths specified within the -Scope param (if applicable)
-            // _pathsToSearch will contain all resource package subdirectories within _pathsToInstallPkg path locations
+            // Package install paths.
+            // _pathsToInstallPkg will only contain the paths specified within the -Scope param (if applicable).
+            // _pathsToSearch will contain all resource package subdirectories within _pathsToInstallPkg path locations.
             // e.g.:
             // ./InstallPackagePath1/PackageA
             // ./InstallPackagePath1/PackageB
             // ./InstallPackagePath2/PackageC
             // ./InstallPackagePath3/PackageD
-            foreach (var path in _pathsToInstallPkg)
-            {
-                _pathsToSearch.AddRange(Utils.GetSubDirectories(path));
-            }
 
-            var filteredPackages = new Dictionary<string, PSResourceInfo>();
-            foreach (var pkg in packages)
+            // Get currently installed packages.
+            var getHelper = new GetHelper(_cmdletPassedIn);
+            var installedPackageNames = new HashSet<string>(StringComparer.CurrentCultureIgnoreCase);
+            foreach (var installedPkg in getHelper.GetInstalledPackages(
+                pkgs: packages,
+                pathsToSearch: _pathsToSearch))
             {
-                filteredPackages.Add(pkg.Name, pkg);
+                installedPackageNames.Add(installedPkg.Name);
             }
 
-            GetHelper getHelper = new GetHelper(_cmdletPassedIn);
-            // Get currently installed packages.
-            // selectPrereleaseOnly is false because even if Prerelease is true we want to include both stable and prerelease, never select prerelease only.
-            IEnumerable<PSResourceInfo> pkgsAlreadyInstalled = getHelper.GetPackagesFromPath(
-                name: filteredPackages.Keys.ToArray(),
-                versionRange: _versionRange,
-                pathsToSearch: _pathsToSearch,
-                selectPrereleaseOnly: false);
-            if (!pkgsAlreadyInstalled.Any())
+            if (installedPackageNames.Count is 0)
             {
                 return packages;
             }
 
-            // Remove from list package versions that are already installed.
-            foreach (PSResourceInfo pkg in pkgsAlreadyInstalled)
+            // Return only packages that are not already installed.
+            var filteredPackages = new List<PSResourceInfo>();
+            foreach (var pkg in packages)
             {
-                _cmdletPassedIn.WriteWarning(
-                    string.Format("Resource '{0}' with version '{1}' is already installed.  If you would like to reinstall, please run the cmdlet again with the -Reinstall parameter",
-                    pkg.Name,
-                    pkg.Version));
+                if (!installedPackageNames.Contains(pkg.Name))
+                {
+                    // Add packages that still need to be installed.
+                    filteredPackages.Add(pkg);
+                }
+                else
+                {
+                    // Remove from tracking list of packages to install.
+                    _cmdletPassedIn.WriteWarning(
+                        string.Format("Resource '{0}' with version '{1}' is already installed.  If you would like to reinstall, please run the cmdlet again with the -Reinstall parameter",
+                        pkg.Name,
+                        pkg.Version));
 
-                filteredPackages.Remove(pkg.Name);
-                _pkgNamesToInstall.RemoveAll(x => x.Equals(pkg.Name, StringComparison.InvariantCultureIgnoreCase));
+                    _pkgNamesToInstall.RemoveAll(x => x.Equals(pkg.Name, StringComparison.InvariantCultureIgnoreCase));
+                }
             }
 
-            return filteredPackages.Values.ToArray();
+            return filteredPackages;
         }
 
+        /// <summary>
+        /// Install provided list of packages, which include Dependent packages if requested.
+        /// </summary>
         private List<PSResourceInfo> InstallPackage(
-            IEnumerable<PSResourceInfo> pkgsToInstall, // those found to be required to be installed (includes Dependency packages as well)
+            List<PSResourceInfo> pkgsToInstall,
             string repoName,
             string repoUri,
             PSCredentialInfo repoCredentialInfo,
             PSCredential credential,
             bool isLocalRepo)
         {
             List<PSResourceInfo> pkgsSuccessfullyInstalled = new List<PSResourceInfo>();
-            int totalPkgs = pkgsToInstall.Count();
+            int totalPkgs = pkgsToInstall.Count;
 
             // Counters for tracking current package out of total
-            int totalInstalledPkgCount = 0;
+            int currentInstalledPkgCount = 0;
             foreach (PSResourceInfo pkg in pkgsToInstall)
             {
-                totalInstalledPkgCount++;
+                currentInstalledPkgCount++;
                 var tempInstallPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
                 try
                 {
@@ -344,7 +344,7 @@ private List<PSResourceInfo> InstallPackage(
                     if (!_quiet)
                     {
                         int activityId = 0;
-                        int percentComplete = ((totalInstalledPkgCount * 100) / totalPkgs);
+                        int percentComplete = ((currentInstalledPkgCount * 100) / totalPkgs);
                         string activity = string.Format("Installing {0}...", pkg.Name);
                         string statusDescription = string.Format("{0}% Complete", percentComplete);
                         _cmdletPassedIn.WriteProgress(

src/code/PublishPSResource.cs

@@ -236,7 +236,6 @@ protected override void EndProcessing()
                 try
                 {
                     Utils.ValidateModuleManifest(resourceFilePath, out errorMsgs);
-
                 }
                 finally {
                     if (errorMsgs.Length > 0)
@@ -885,9 +884,17 @@ private bool CheckDependenciesExist(Hashtable dependencies, string repositoryNam
                 FindHelper findHelper = new FindHelper(_cancellationToken, this);
                 bool depPrerelease = depVersion.Contains("-");
 
-                var repository = new[] { repositoryName };
-                var dependencyFound = findHelper.FindByResourceName(depName, ResourceType.Module, depVersion, depPrerelease, null, repository, Credential, false);
-                if (dependencyFound == null || !dependencyFound.Any())
+                var foundDependencies = findHelper.FindByResourceName(
+                    name: depName,
+                    type: ResourceType.Module,
+                    version: depVersion,
+                    prerelease: depPrerelease,
+                    tag: null,
+                    repository: new[] { repositoryName },
+                    credential: Credential,
+                    includeDependencies: false);
+
+                if (foundDependencies.Count is 0)
                 {
                     var message = String.Format("Dependency '{0}' was not found in repository '{1}'.  Make sure the dependency is published to the repository before publishing this module.", dependency, repositoryName);
                     var ex = new ArgumentException(message);
@@ -897,6 +904,7 @@ private bool CheckDependenciesExist(Hashtable dependencies, string repositoryNam
                     return false;
                 }
             }
+
             return true;
         }
 

test/FindPSResource.Tests.ps1

@@ -122,7 +122,7 @@ Describe 'Test Find-PSResource for Module' {
     ) {
         param($Version, $Description)
 
-        $res = Find-PSResource -Name $testModuleName -Version $Version -Repository $PSGalleryName
+        $res = Find-PSResource -Name $testModuleName -Version $Version -Repository $PSGalleryName 2>$null
         $res | Should -BeNullOrEmpty
     }
 

test/UpdatePSResource.Tests.ps1

@@ -123,7 +123,7 @@ Describe 'Test Update-PSResource' {
         param($Version, $Description)
 
         Install-PSResource -Name $testModuleName -Version "1.0.0.0" -Repository $PSGalleryName -TrustRepository
-        Update-PSResource -Name $testModuleName -Version $Version -Repository $PSGalleryName -TrustRepository
+        Update-PSResource -Name $testModuleName -Version $Version -Repository $PSGalleryName -TrustRepository 2>$null
 
         $res = Get-PSResource -Name $testModuleName
         $isPkgUpdated = $false