Skip to content

Remove unnecessary .nupkg.metadata from module after installation #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 5, 2021
Merged

Remove unnecessary .nupkg.metadata from module after installation #500

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23cc811
Remove .nupkg.metadata after module installation
alerickson Oct 4, 2021
4bf09e5
Remove unneeded code
alerickson Oct 4, 2021
3c58452
revert line accidentally removed
alerickson Oct 4, 2021
4da5ef1
Remove unnecessary .Lower() from file paths being deleted
alerickson Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/code/InstallHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,20 +362,16 @@ private List<string> InstallPackage(IEnumerable<PSResourceInfo> 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;
Expand Down Expand Up @@ -463,7 +459,7 @@ private List<string> InstallPackage(IEnumerable<PSResourceInfo> pkgsToInstall, s

return pkgsSuccessfullyInstalled;
}

private bool CallAcceptLicense(PSResourceInfo p, string moduleManifest, string tempInstallPath, string newVersion)
{
var requireLicenseAcceptance = false;
Expand Down Expand Up @@ -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");
Expand All @@ -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));
Expand Down