From e4cb1111ce88cbcea9f33362ad9cffae145fbcc2 Mon Sep 17 00:00:00 2001 From: Amber Erickson Date: Tue, 27 Jul 2021 09:58:02 -0700 Subject: [PATCH 1/3] Remove cancellation token as a param to InstallHelper-- now gets created by InstallHelper class --- src/code/InstallHelper.cs | 7 +++++-- src/code/InstallPSResource.cs | 6 +----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index 1679c06fa..87d624e9d 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -46,11 +46,14 @@ internal class InstallHelper : PSCmdlet bool _asNupkg; bool _includeXML; - public InstallHelper(bool updatePkg, bool savePkg, CancellationToken cancellationToken, PSCmdlet cmdletPassedIn) + public InstallHelper(bool updatePkg, bool savePkg, PSCmdlet cmdletPassedIn) { + // Define the cancellation token. + CancellationTokenSource source = new CancellationTokenSource(); + _cancellationToken = source.Token; + this._updatePkg = updatePkg; this._savePkg = savePkg; - this._cancellationToken = cancellationToken; this._cmdletPassedIn = cmdletPassedIn; } diff --git a/src/code/InstallPSResource.cs b/src/code/InstallPSResource.cs index 62e07785e..e21a1cdf5 100644 --- a/src/code/InstallPSResource.cs +++ b/src/code/InstallPSResource.cs @@ -125,11 +125,7 @@ protected override void BeginProcessing() protected override void ProcessRecord() { - // Define the cancellation token. - CancellationTokenSource source = new CancellationTokenSource(); - CancellationToken cancellationToken = source.Token; - - var installHelper = new InstallHelper(updatePkg: false, savePkg: false, cancellationToken: cancellationToken, cmdletPassedIn: this); + var installHelper = new InstallHelper(updatePkg: false, savePkg: false, cmdletPassedIn: this); switch (ParameterSetName) { From b133d716aeadd92940eb29290ebd80fd0963e95f Mon Sep 17 00:00:00 2001 From: Amber Erickson Date: Tue, 27 Jul 2021 09:59:10 -0700 Subject: [PATCH 2/3] Remove cancellation token from Save-PSResource --- src/code/SavePSResource.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/code/SavePSResource.cs b/src/code/SavePSResource.cs index ef89b431f..a68496dd6 100644 --- a/src/code/SavePSResource.cs +++ b/src/code/SavePSResource.cs @@ -146,11 +146,7 @@ protected override void BeginProcessing() protected override void ProcessRecord() { - // Define the cancellation token. - CancellationTokenSource source = new CancellationTokenSource(); - CancellationToken cancellationToken = source.Token; - - var installHelper = new InstallHelper(updatePkg: false, savePkg: true, cancellationToken: cancellationToken, cmdletPassedIn: this); + var installHelper = new InstallHelper(updatePkg: false, savePkg: true, cmdletPassedIn: this); switch (ParameterSetName) { From 8ea5e5bfac0376309aad0e94c054a8378e8cfc4b Mon Sep 17 00:00:00 2001 From: Amber Erickson Date: Tue, 27 Jul 2021 10:20:03 -0700 Subject: [PATCH 3/3] Remove set validation for Scope param in Install-PSResource --- src/code/InstallPSResource.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/code/InstallPSResource.cs b/src/code/InstallPSResource.cs index e21a1cdf5..51a7a3fc8 100644 --- a/src/code/InstallPSResource.cs +++ b/src/code/InstallPSResource.cs @@ -59,7 +59,6 @@ class InstallPSResource : PSCmdlet /// /// Specifies the scope of installation. /// - [ValidateSet("CurrentUser", "AllUsers")] [Parameter(ParameterSetName = NameParameterSet)] public ScopeType Scope { get; set; }