diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index 926f13c8f..15998e30e 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -362,20 +362,16 @@ private List InstallPackage(IEnumerable pkgsToInstall, s _cmdletPassedIn.WriteVerbose(string.Format("Successfully able to download package from source to: '{0}'", tempInstallPath)); // Prompt if module requires license acceptance (need to read info license acceptance info from the module manifest) - // pkgIdentity.Version.Version gets the version without metadata or release labels. - - + // pkgIdentity.Version.Version gets the version without metadata or release labels. string newVersion = pkgIdentity.Version.ToNormalizedString(); - // string normalizedVersionNoPrereleaseLabel = newVersion; if (pkgIdentity.Version.IsPrerelease) { - // 2.0.2 + // eg: 2.0.2 normalizedVersionNoPrereleaseLabel = pkgIdentity.Version.ToNormalizedString().Substring(0, pkgIdentity.Version.ToNormalizedString().IndexOf('-')); } - //p.Version = new System.Version(normalizedVersionNoPrereleaseLabel); - + string tempDirNameVersion = isLocalRepo ? tempInstallPath : Path.Combine(tempInstallPath, pkgIdentity.Id.ToLower(), newVersion); var version4digitNoPrerelease = pkgIdentity.Version.Version.ToString(); string moduleManifestVersion = string.Empty; @@ -463,7 +459,7 @@ private List InstallPackage(IEnumerable pkgsToInstall, s return pkgsSuccessfullyInstalled; } - + private bool CallAcceptLicense(PSResourceInfo p, string moduleManifest, string tempInstallPath, string newVersion) { var requireLicenseAcceptance = false; @@ -563,9 +559,10 @@ private void DeleteExtraneousFiles(string tempInstallPath, PackageIdentity pkgId { // Deleting .nupkg SHA file, .nuspec, and .nupkg after unpacking the module var pkgIdString = pkgIdentity.ToString(); - var nupkgSHAToDelete = Path.Combine(dirNameVersion, (pkgIdString + ".nupkg.sha512").ToLower()); - var nuspecToDelete = Path.Combine(dirNameVersion, (pkgIdentity.Id + ".nuspec").ToLower()); - var nupkgToDelete = Path.Combine(dirNameVersion, (pkgIdString + ".nupkg").ToLower()); + var nupkgSHAToDelete = Path.Combine(dirNameVersion, (pkgIdString + ".nupkg.sha512")); + var nuspecToDelete = Path.Combine(dirNameVersion, (pkgIdentity.Id + ".nuspec")); + var nupkgToDelete = Path.Combine(dirNameVersion, (pkgIdString + ".nupkg")); + var nupkgMetadataToDelete = Path.Combine(dirNameVersion, (pkgIdString + ".nupkg.metadata")); var contentTypesToDelete = Path.Combine(dirNameVersion, "[Content_Types].xml"); var relsDirToDelete = Path.Combine(dirNameVersion, "_rels"); var packageDirToDelete = Path.Combine(dirNameVersion, "package"); @@ -586,6 +583,11 @@ private void DeleteExtraneousFiles(string tempInstallPath, PackageIdentity pkgId _cmdletPassedIn.WriteVerbose(string.Format("Deleting '{0}'", nupkgToDelete)); File.Delete(nupkgToDelete); } + if (File.Exists(nupkgMetadataToDelete)) + { + _cmdletPassedIn.WriteVerbose(string.Format("Deleting '{0}'", nupkgMetadataToDelete)); + File.Delete(nupkgMetadataToDelete); + } if (File.Exists(contentTypesToDelete)) { _cmdletPassedIn.WriteVerbose(string.Format("Deleting '{0}'", contentTypesToDelete));