Fix for Install-PSResource always reinstall issue

LICENSE

@@ -1,6 +1,6 @@
-MIT License
+Copyright (c) Microsoft Corporation.
 
-Copyright (c) 2020 PowerShell Team
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

doBuild.ps1

@@ -36,6 +36,14 @@ function DoBuild
     Write-Verbose -Verbose -Message "Copying help files to '$BuildOutPath'"
     Copy-Item -Path "${HelpPath}/${Culture}" -Dest "$BuildOutPath" -Recurse -Force
 
+    # Copy license
+    Write-Verbose -Verbose -Message "Copying LICENSE file to '$BuildOutPath'"
+    Copy-Item -Path "./LICENSE" -Dest "$BuildOutPath"
+
+    # Copy notice
+    # Write-Verbose -Verbose -Message "Copying ThirdPartyNotices.txt to '$BuildOutPath'"
+    # Copy-Item -Path "./ThirdPartyNotices.txt" -Dest "$BuildOutPath"
+
     #
     # Copy DSC resources
     # TODO: This should not be part of PowerShellGet build/publish and should be moved to its own project
@@ -65,40 +73,21 @@ function DoBuild
             }
 
             # Place build results
-            if ($BuildFramework -eq "netstandard2.0") {
-                $assemblyNames = @(
-                    'PowerShellGet'
-                    'Microsoft.Extensions.Logging.Abstractions'
-                    'MoreLinq'
-                    'NuGet.Commands'
-                    'NuGet.Common'
-                    'NuGet.Configuration'
-                    'NuGet.Frameworks'
-                    'NuGet.Packaging'
-                    'NuGet.ProjectModel'
-                    'NuGet.Protocol'
-                    'NuGet.Repositories'
-                    'NuGet.Versioning'
-                    'Newtonsoft.Json'
-                )
-            } elseif ($BuildFramework -eq 'net472') {
-                $assemblyNames = @(
-                    'PowerShellGet'
-                    'Microsoft.Extensions.Logging.Abstractions'
-                    'MoreLinq'
-                    'NuGet.Commands'
-                    'NuGet.Common'
-                    'NuGet.Configuration'
-                    'NuGet.Frameworks'
-                    'NuGet.Packaging'
-                    'NuGet.ProjectModel'
-                    'NuGet.Protocol'
-                    'NuGet.Repositories'
-                    'NuGet.Versioning'
-                    'Newtonsoft.Json'
-                    'System.Security.Principal.Windows'
-                )
-            }
+            $assemblyNames = @(
+                'PowerShellGet'
+                'Microsoft.Extensions.Logging.Abstractions'
+                'MoreLinq'
+                'NuGet.Commands'
+                'NuGet.Common'
+                'NuGet.Configuration'
+                'NuGet.Frameworks'
+                'NuGet.Packaging'
+                'NuGet.ProjectModel'
+                'NuGet.Protocol'
+                'NuGet.Repositories'
+                'NuGet.Versioning'
+                'Newtonsoft.Json'
+            )
 
             $buildSuccess = $true
             foreach ($fileName in $assemblyNames)

src/PowerShellGet.psd1

@@ -3,7 +3,7 @@
 
 @{
     RootModule        = './netstandard2.0/PowerShellGet.dll'
-    ModuleVersion     = '3.0.11'
+    ModuleVersion     = '3.0.12'
     GUID              = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
     Author            = 'Microsoft Corporation'
     CompanyName       = 'Microsoft Corporation'

src/code/FindHelper.cs

@@ -1,23 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Microsoft.PowerShell.PowerShellGet.UtilClasses;
+using MoreLinq.Extensions;
+using NuGet.Common;
+using NuGet.Configuration;
+using NuGet.Protocol;
+using NuGet.Protocol.Core.Types;
+using NuGet.Versioning;
 using System;
 using System.Collections.Generic;
 using System.Data;
-using Dbg = System.Diagnostics.Debug;
 using System.Linq;
 using System.Management.Automation;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
-using MoreLinq.Extensions;
-using Microsoft.PowerShell.PowerShellGet.UtilClasses;
-using static Microsoft.PowerShell.PowerShellGet.UtilClasses.PSResourceInfo;
-using NuGet.Common;
-using NuGet.Configuration;
-using NuGet.Protocol;
-using NuGet.Protocol.Core.Types;
-using NuGet.Versioning;
+
+using Dbg = System.Diagnostics.Debug;
 
 namespace Microsoft.PowerShell.PowerShellGet.Cmdlets
 {
@@ -26,6 +26,8 @@ namespace Microsoft.PowerShell.PowerShellGet.Cmdlets
     /// </summary>
     internal class FindHelper
     {
+        #region Members
+
         private CancellationToken _cancellationToken;
         private readonly PSCmdlet _cmdletPassedIn;
         private List<string> _pkgsLeftToFind;
@@ -50,12 +52,22 @@ internal class FindHelper
         private const int SearchAsyncMaxReturned = 5990;
         private const int GalleryMax = 12000;
 
+        #endregion
+
+        #region Constructor
+
+        private FindHelper() { }
+
         public FindHelper(CancellationToken cancellationToken, PSCmdlet cmdletPassedIn)
         {
             _cancellationToken = cancellationToken;
             _cmdletPassedIn = cmdletPassedIn;
         }
 
+        #endregion
+
+        #region Public methods
+
         public IEnumerable<PSResourceInfo> FindByResourceName(
             string[] name,
             ResourceType type,
@@ -175,7 +187,11 @@ public IEnumerable<PSResourceInfo> FindByResourceName(
             }
         }
 
-        public IEnumerable<PSResourceInfo> SearchFromRepository(
+        #endregion
+
+        #region Private methods
+
+        private IEnumerable<PSResourceInfo> SearchFromRepository(
             string repositoryName,
             Uri repositoryUrl)
         {
@@ -255,7 +271,7 @@ public IEnumerable<PSResourceInfo> SearchFromRepository(
             }
         }
 
-        public IEnumerable<PSResourceInfo> SearchAcrossNamesInRepository(
+        private IEnumerable<PSResourceInfo> SearchAcrossNamesInRepository(
             string repositoryName,
             PackageSearchResource pkgSearchResource,
             PackageMetadataResource pkgMetadataResource,
@@ -637,5 +653,6 @@ SourceCacheContext sourceCacheContext
                 }
             }
         }
+        #endregion
     }
-}
+}

src/code/GetHelper.cs

@@ -1,16 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+
+using Microsoft.PowerShell.PowerShellGet.UtilClasses;
+using NuGet.Versioning;
 using System;
 using System.Collections.Generic;
-using Dbg = System.Diagnostics.Debug;
 using System.IO;
-using System.Linq;
 using System.Management.Automation;
-using System.Threading;
-using MoreLinq.Extensions;
-using Microsoft.PowerShell.PowerShellGet.UtilClasses;
+
+using Dbg = System.Diagnostics.Debug;
 using static Microsoft.PowerShell.PowerShellGet.UtilClasses.PSResourceInfo;
-using NuGet.Versioning;
 
 namespace Microsoft.PowerShell.PowerShellGet.Cmdlets
 {
@@ -38,7 +37,7 @@ public GetHelper(PSCmdlet cmdletPassedIn)
 
         #region Public methods
 
-        public IEnumerable<PSResourceInfo> FilterPkgPaths(
+        public IEnumerable<PSResourceInfo> GetPackagesFromPath(
             string[] name,
             VersionRange versionRange,
             List<string> pathsToSearch)

src/code/GetInstalledPSResource.cs

@@ -1,13 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Microsoft.PowerShell.PowerShellGet.UtilClasses;
+using NuGet.Versioning;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Management.Automation;
-using System.Threading;
-using Microsoft.PowerShell.PowerShellGet.UtilClasses;
-using NuGet.Versioning;
 
 namespace Microsoft.PowerShell.PowerShellGet.Cmdlets
 {
@@ -130,7 +128,7 @@ protected override void ProcessRecord()
             }
 
             GetHelper getHelper = new GetHelper(this);
-            foreach (PSResourceInfo pkg in getHelper.FilterPkgPaths(namesToSearch, _versionRange, _pathsToSearch))
+            foreach (PSResourceInfo pkg in getHelper.GetPackagesFromPath(namesToSearch, _versionRange, _pathsToSearch))
             {
                 WriteObject(pkg);
             }