From 7f9e85774211f6fd71ccaf8aac37d66ce80f05d6 Mon Sep 17 00:00:00 2001 From: Gautam Sheth Date: Sat, 13 Jun 2026 22:27:14 +0300 Subject: [PATCH] Refactor ClientContext execution flow in list item commands to ensure proper loading and updating of items --- src/Commands/Admin/GetTenantRestrictedSearchMode.cs | 2 +- src/Commands/Base/PnPSharePointCmdlet.cs | 5 +++++ src/Commands/Lists/SetImageListItem.cs | 2 +- src/Commands/Lists/SetListItem.cs | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Commands/Admin/GetTenantRestrictedSearchMode.cs b/src/Commands/Admin/GetTenantRestrictedSearchMode.cs index cddfbd54b6..96bc1e06fe 100644 --- a/src/Commands/Admin/GetTenantRestrictedSearchMode.cs +++ b/src/Commands/Admin/GetTenantRestrictedSearchMode.cs @@ -14,7 +14,7 @@ protected override void ExecuteCmdlet() { var results = Tenant.GetSPORestrictedSearchMode(); AdminContext.ExecuteQueryRetry(); - WriteObject(results, true); + WriteObject(results.Value.ToString()); } catch { diff --git a/src/Commands/Base/PnPSharePointCmdlet.cs b/src/Commands/Base/PnPSharePointCmdlet.cs index 86acfaf7f6..753b3a9980 100644 --- a/src/Commands/Base/PnPSharePointCmdlet.cs +++ b/src/Commands/Base/PnPSharePointCmdlet.cs @@ -167,6 +167,11 @@ protected override void ProcessRecord() protected override void EndProcessing() { + if (ShouldRefreshContextWithPendingRequest && ClientContext?.HasPendingRequest == true) + { + ClientContext.ExecuteQueryRetry(); + } + base.EndProcessing(); } diff --git a/src/Commands/Lists/SetImageListItem.cs b/src/Commands/Lists/SetImageListItem.cs index 2810374219..776ba4f26b 100644 --- a/src/Commands/Lists/SetImageListItem.cs +++ b/src/Commands/Lists/SetImageListItem.cs @@ -138,8 +138,8 @@ protected override void ExecuteCmdlet() ListItemHelper.UpdateListItem(item, UpdateType); - ClientContext.ExecuteQueryRetry(); ClientContext.Load(item); + ClientContext.ExecuteQueryRetry(); WriteObject(item); } } diff --git a/src/Commands/Lists/SetListItem.cs b/src/Commands/Lists/SetListItem.cs index 9a048ba55c..11b6c78237 100644 --- a/src/Commands/Lists/SetListItem.cs +++ b/src/Commands/Lists/SetListItem.cs @@ -242,8 +242,8 @@ private void SetListItemSingle() } } - ClientContext.ExecuteQueryRetry(); ClientContext.Load(item); + ClientContext.ExecuteQueryRetry(); WriteObject(item); } }