From 6774e6a29d7ab20f51073b21c255ff8086ae69b6 Mon Sep 17 00:00:00 2001 From: Fabrice Foray Date: Mon, 4 May 2026 19:42:58 +0200 Subject: [PATCH] [VsIntegration] Correction to run RefreshIncludeFile in the UI Thread --- .../ProjectPackage/Nodes/XSharpProjectNode.cs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/VisualStudio/ProjectPackage/Nodes/XSharpProjectNode.cs b/src/VisualStudio/ProjectPackage/Nodes/XSharpProjectNode.cs index 238aef7b6a..9a24a924a8 100644 --- a/src/VisualStudio/ProjectPackage/Nodes/XSharpProjectNode.cs +++ b/src/VisualStudio/ProjectPackage/Nodes/XSharpProjectNode.cs @@ -1355,7 +1355,7 @@ internal void LoadPackageReferences() public XSharpPackageReferenceContainerNode GetPackageReferenceContainerNode() { var node = FindChild(XSharpPackageReferenceContainerNode.PackageReferencesNodeVirtualName) as XSharpPackageReferenceContainerNode; - if (node == null ) + if (node == null) { var referenceContainerNode = GetReferenceContainer() as HierarchyNode; node = new XSharpPackageReferenceContainerNode(this); @@ -1574,7 +1574,7 @@ private void OnProjectWalkComplete(XProject xProject) } _taskListManager.Refresh(); } - RefreshIncludeFiles(); + ThreadUtilities.runSafe(RefreshIncludeFiles); } @@ -1637,14 +1637,10 @@ private void RefreshIncludeFiles() finally { this.EventTriggeringFlag = oldEvents; - ThreadUtilities.runSafe(() => + if (hasChanged) { - if (hasChanged) - { - this.OnItemsAppended(includeNode); - } - - }); + this.OnItemsAppended(includeNode); + } } } private void OnFileWalkComplete(XFile xfile) @@ -1837,7 +1833,7 @@ void ProcessOptions(ProjectInstance projectInstance, string target) { switch (item.ItemType.ToLower()) { - case "reference" when ! isSdk: + case "reference" when !isSdk: allReferenceAssemblies.AddUnique(item); break; case "referencepath" when isSdk: