From 836b5a07244cbae128b8eb8ca33325e479ecd7f5 Mon Sep 17 00:00:00 2001
From: Amber Erickson <americks@microsoft.com>
Date: Thu, 14 Jul 2022 16:17:29 -0700
Subject: [PATCH 1/2] 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
     /// </summary>
     [Cmdlet(VerbsCommon.Find,
         "PSResource",
-        DefaultParameterSetName = ResourceNameParameterSet,
-        SupportsShouldProcess = true)]
+        DefaultParameterSetName = ResourceNameParameterSet)]
     [OutputType(typeof(PSResourceInfo), typeof(PSCommandResourceInfo))]
     public sealed class FindPSResource : PSCmdlet
     {

From d2ff2becc0ef574ac260e2a9cadfc77509612710 Mon Sep 17 00:00:00 2001
From: Amber Erickson <americks@microsoft.com>
Date: Fri, 15 Jul 2022 17:01:23 -0700
Subject: [PATCH 2/2] Add bug fix for incorrect error messaging when not
 trusting repository

---
 src/code/InstallHelper.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs
index 35fea684c..bd1105e46 100644
--- a/src/code/InstallHelper.cs
+++ b/src/code/InstallHelper.cs
@@ -157,6 +157,7 @@ private List<PSResourceInfo> ProcessRepositories(
 
             var findHelper = new FindHelper(_cancellationToken, _cmdletPassedIn);
             List<PSResourceInfo> allPkgsInstalled = new List<PSResourceInfo>();
+            bool sourceTrusted = true;
 
             foreach (var repo in listOfRepositories)
             {
@@ -168,7 +169,6 @@ private List<PSResourceInfo> ProcessRepositories(
 
                 // Source is only trusted if it's set at the repository level to be trusted, -TrustRepository flag is true, -Force flag is true
                 // OR the user issues trust interactively via console.
-                var sourceTrusted = true;
                 if (repo.Trusted == false && !trustRepository && !_force)
                 {
                     _cmdletPassedIn.WriteVerbose("Checking if untrusted repository should be used");
@@ -249,9 +249,9 @@ private List<PSResourceInfo> ProcessRepositories(
             // At this only package names left were those which could not be found in registered repositories
             foreach (string pkgName in _pkgNamesToInstall)
             {
-                var message = String.Format("Package '{0}' with requested version range {1} could not be installed as it was not found in any registered repositories",
-                    pkgName,
-                    _versionRange.ToString());
+                string message = !sourceTrusted ? $"Package '{pkgName}' with requested version range '{_versionRange.ToString()}' could not be found in any trusted repositories" :
+                                                    $"Package '{pkgName}' with requested version range '{_versionRange.ToString()}' could not be installed as it was not found in any registered repositories";
+
                 var ex = new ArgumentException(message);
                 var ResourceNotFoundError = new ErrorRecord(ex, "ResourceNotFoundError", ErrorCategory.ObjectNotFound, null);
                 _cmdletPassedIn.WriteError(ResourceNotFoundError);