Add bug fix for retrieving pkg name from local repos

Author: alerickson

src/code/InstallHelper.cs

@@ -737,6 +737,8 @@ private Hashtable BeginPackageInstall(
             FindResults responses = null;
             errRecord = null;
 
+            //_cmdletPassedIn.WriteWarning($"~~~~~~~~~~~~~~~~~~ pkgNameToInstall is: '{pkgNameToInstall}'.");
+
             switch (searchVersionType)
             {
                 case VersionType.VersionRange:
@@ -813,6 +815,9 @@ private Hashtable BeginPackageInstall(
             {
                 return packagesHash;
             }
+            
+            // THIS SHOULD BE THE CORRECT PKG NAME
+           // _cmdletPassedIn.WriteWarning($"~~~~~~~~~~~~~~~~~~ pkgToInstall.Name is: '{pkgToInstall.Name}'.");
 
             pkgToInstall.RepositorySourceLocation = repository.Uri.ToString();
             pkgToInstall.AdditionalMetadata.TryGetValue("NormalizedVersion", out string pkgVersion);

src/code/LocalServerApiCalls.cs

@@ -685,7 +685,7 @@ private Hashtable GetMetadataFromNupkg(string packageName, string packagePath, s
                 string psd1FilePath = String.Empty;
                 string ps1FilePath = String.Empty;
                 string nuspecFilePath = String.Empty;
-                Utils.GetMetadataFilesFromPath(tempDiscoveryPath, packageName, out psd1FilePath, out ps1FilePath, out nuspecFilePath);
+                Utils.GetMetadataFilesFromPath(tempDiscoveryPath, packageName, out psd1FilePath, out ps1FilePath, out nuspecFilePath, out string properCasingPkgName);
 
                 List<string> pkgTags = new List<string>();
 
@@ -710,7 +710,7 @@ private Hashtable GetMetadataFromNupkg(string packageName, string packagePath, s
                     pkgMetadata.Add("ProjectUri", projectUri);
                     pkgMetadata.Add("IconUri", iconUri);
                     pkgMetadata.Add("ReleaseNotes", releaseNotes);
-                    pkgMetadata.Add("Id", packageName);
+                    pkgMetadata.Add("Id", properCasingPkgName);
                     pkgMetadata.Add(_fileTypeKey, Utils.MetadataFileType.ModuleManifest);
 
                     pkgTags.AddRange(pkgHashTags);

src/code/Utils.cs

@@ -1172,11 +1172,12 @@ internal static HashSet<string> GetInstalledPackages(List<string> pathsToSearch,
             return pkgsInstalledOnMachine;
         }
 
-        internal static void GetMetadataFilesFromPath(string dirPath, string packageName, out string psd1FilePath, out string ps1FilePath, out string nuspecFilePath)
+        internal static void GetMetadataFilesFromPath(string dirPath, string packageName, out string psd1FilePath, out string ps1FilePath, out string nuspecFilePath, out string properCasingPkgName)
         {
             psd1FilePath = String.Empty;
             ps1FilePath = String.Empty;
             nuspecFilePath = String.Empty;
+            properCasingPkgName = packageName;
 
             var discoveredFiles = Directory.GetFiles(dirPath, "*.*", SearchOption.AllDirectories);
             string pkgNamePattern = $"{packageName}*";
@@ -1187,14 +1188,26 @@ internal static void GetMetadataFilesFromPath(string dirPath, string packageName
                 {
                     if (file.EndsWith("psd1"))
                     {
+                        if (string.Compare($"{packageName}.psd1", file, StringComparison.OrdinalIgnoreCase) == 0)
+                        {
+                            properCasingPkgName = file.Split(new string[] { ".psd1" }, StringSplitOptions.None).First();
+                        }
                         psd1FilePath = file;
                     }
                     else if (file.EndsWith("nuspec"))
                     {
+                        if (string.Compare($"{packageName}.nuspec", file, StringComparison.OrdinalIgnoreCase) == 0)
+                        {
+                            properCasingPkgName = file.Split(new string[] { ".nuspec" }, StringSplitOptions.None).First();
+                        }
                         nuspecFilePath = file;
                     }
                     else if (file.EndsWith("ps1"))
                     {
+                        if (string.Compare($"{packageName}.ps1", file, StringComparison.OrdinalIgnoreCase) == 0)
+                        {
+                            properCasingPkgName = file.Split(new string[] { ".ps1" }, StringSplitOptions.None).First();
+                        }
                         ps1FilePath = file;
                     }
                 }

test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1

@@ -141,30 +141,10 @@ Describe 'Test Install-PSResource for local repositories' -tags 'CI' {
 
     It "Install resource with cmdlet names from a module already installed with -NoClobber (should not clobber)" {
         Install-PSResource -Name $testModuleClobber -Repository $localRepo -TrustRepository -Verbose
-
-        Write-Verbose -Verbose "~~~~~~~~~~~~~~~"
-        Get-ChildItem $localRepo -Recurse
-        Write-Verbose -Verbose "~~~~~~~~~~~~~~~"
-        
         $pkg = Get-InstalledPSResource $testModuleClobber
         $pkg.Name | Should -Be $testModuleClobber
         $pkg.Version | Should -Be "1.0.0"
 
-
-        # Get the first available module named 'clobbertestmodule1' and its exported commands
-        $module = (Get-Module -ListAvailable $testModuleClobber)
-        Write-Verbose -Verbose "Module Name: $($module.Name)"
-        $moduleIdx = $module[0]
-
-        # Iterate through each exported command in the module
-        foreach ($command in $moduleIdx.ExportedCommands.Values) {
-            # Output the command's name and details
-            Write-Verbose -Verbose "Command Name: $($command.Name)"
-            Write-Verbose -Verbose "Command Type: $($command.CommandType)"
-            Write-Verbose -Verbose "----------------------------------"
-        }
-
-
         Install-PSResource -Name $testModuleClobber2 -Repository $localRepo -TrustRepository -NoClobber -ErrorVariable ev -ErrorAction SilentlyContinue -verbose
         $pkg = Get-InstalledPSResource $testModuleClobber2 -ErrorAction SilentlyContinue