Merge branch 'master' into DYN-7701-test

TuneUp/TuneUpWindowViewModel.cs

@@ -550,6 +550,7 @@ private void CreateGroupNodesForCollection(ObservableCollection<ProfiledNodeView
         {
             int executionCounter = 1;
             var processedNodes = new HashSet<ProfiledNodeViewModel>();
+            var nodesToAdd = new HashSet<ProfiledNodeViewModel>();
 
             var sortedNodes = collection.OrderBy(n => n.ExecutionOrderNumber).ToList();
 
@@ -582,7 +583,8 @@ private void CreateGroupNodesForCollection(ObservableCollection<ProfiledNodeView
                     var pGroup = new ProfiledNodeViewModel(pNode)
                     {
                         GroupExecutionOrderNumber = executionCounter++,
-                        GroupExecutionMilliseconds = groupExecTime
+                        GroupExecutionMilliseconds = groupExecTime,
+                        GroupModel = CurrentWorkspace.Annotations.First(n => n.GUID.Equals(pNode.GroupGUID))
                     };
                     collection.Add(pGroup);
 
@@ -601,6 +603,14 @@ private void CreateGroupNodesForCollection(ObservableCollection<ProfiledNodeView
                     }
                 }
             }
+
+            GetCollectionViewSource(collection).Dispatcher.Invoke(() =>
+            {
+                foreach (var node in nodesToAdd)
+                {
+                    collection.Add(node);
+                }
+            });
         }
 
         internal void OnNodeExecutionBegin(NodeModel nm)

TuneUp/manifests/pkg.json

@@ -1,22 +1,24 @@
 {
-  "license": "",
+  "license": "MIT",
   "file_hash": null,
   "name": "TuneUp",
   "version": "1.0.13",
   "description": "On Dynamo 2.5–2.19 (.NET 4.8), use TuneUp versions up to 1.0.7.\r\nOn Dynamo 3.0+ (.NET 8), use TuneUp versions 1.0.8 and later.\r\n\r\nTuneUp is a view extension for analyzing the performance of Dynamo graphs. TuneUp allows you to see overall graph execution time, per-node execution time, execution time of groups, and other helpful information. With TuneUp, you can rerun all nodes, including ones that are normally skipped for optimization/caching during repeated runs of a graph. This enables you to compare the actual execution times between multiple runs. Read more here: https://dynamobim.org/tuneup-extension-explore-your-node-and-graph-execution-times/. \r\n\r\nKnown issues:\r\n1. TuneUp does not work in a custom node workspace.\r\n2. TuneUp does not work in a custom node workspace.",
   "group": "",
   "keywords": [
-    "profiler",
-    "tuneup"
+      "profiler",
+      "tuneup"
   ],
   "dependencies": [],
   "host_dependencies": [],
   "contents": "",
-  "engine_version": "2.5.0",
+  "engine_version": "3.0.0.7186",
   "engine": "dynamo",
   "engine_metadata": "",
   "site_url": "https://dynamobim.org/",
   "repository_url": "https://github.com/DynamoDS/TuneUp",
   "contains_binaries": true,
-  "node_libraries": []
-}
+  "node_libraries": [],
+  "copyright_holder": "DynamoTeam",
+  "copyright_year": "2024"
+}