From 836b5a07244cbae128b8eb8ca33325e479ecd7f5 Mon Sep 17 00:00:00 2001 From: Amber Erickson Date: Thu, 14 Jul 2022 16:17:29 -0700 Subject: [PATCH 1/3] Remove ShouldProcess in FindPSResource --- src/code/FindPSResource.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/code/FindPSResource.cs b/src/code/FindPSResource.cs index b99b520c5..6d01c9753 100644 --- a/src/code/FindPSResource.cs +++ b/src/code/FindPSResource.cs @@ -20,8 +20,7 @@ namespace Microsoft.PowerShell.PowerShellGet.Cmdlets /// [Cmdlet(VerbsCommon.Find, "PSResource", - DefaultParameterSetName = ResourceNameParameterSet, - SupportsShouldProcess = true)] + DefaultParameterSetName = ResourceNameParameterSet)] [OutputType(typeof(PSResourceInfo), typeof(PSCommandResourceInfo))] public sealed class FindPSResource : PSCmdlet { From 9da4bb8a858a08c13b43aad0a43024ee503a24b4 Mon Sep 17 00:00:00 2001 From: Amber Erickson Date: Sat, 30 Jul 2022 17:02:19 -0700 Subject: [PATCH 2/3] Change .nupkg.metadata path --- src/code/InstallHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index d1b4962bb..dc357486b 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -774,7 +774,7 @@ private void DeleteExtraneousFiles(PackageIdentity pkgIdentity, string dirNameVe 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 nupkgMetadataToDelete = ".nupkg.metadata"; var contentTypesToDelete = Path.Combine(dirNameVersion, "[Content_Types].xml"); var relsDirToDelete = Path.Combine(dirNameVersion, "_rels"); var packageDirToDelete = Path.Combine(dirNameVersion, "package"); From 91cda9105771ad91b17c9c8cd322438f1bb202a1 Mon Sep 17 00:00:00 2001 From: Amber Erickson Date: Sat, 30 Jul 2022 17:08:20 -0700 Subject: [PATCH 3/3] Update path value --- src/code/InstallHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index dc357486b..8d2e9e4db 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -774,7 +774,7 @@ private void DeleteExtraneousFiles(PackageIdentity pkgIdentity, string dirNameVe 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 = ".nupkg.metadata"; + var nupkgMetadataToDelete = Path.Combine(dirNameVersion, ".nupkg.metadata"); var contentTypesToDelete = Path.Combine(dirNameVersion, "[Content_Types].xml"); var relsDirToDelete = Path.Combine(dirNameVersion, "_rels"); var packageDirToDelete = Path.Combine(dirNameVersion, "package");