From edbf7eab4ac66a6618b3cd7906ed9d6a3bd60f3b Mon Sep 17 00:00:00 2001 From: Aparajit Pratap Date: Tue, 2 Apr 2024 10:41:04 -0400 Subject: [PATCH 1/2] recategorize paneling nodes in library --- .../web/library/layoutSpecs.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/LibraryViewExtensionWebView2/web/library/layoutSpecs.json b/src/LibraryViewExtensionWebView2/web/library/layoutSpecs.json index 7546b52846c..86ec8187ea5 100644 --- a/src/LibraryViewExtensionWebView2/web/library/layoutSpecs.json +++ b/src/LibraryViewExtensionWebView2/web/library/layoutSpecs.json @@ -1472,9 +1472,18 @@ }, { "path": "ProtoGeometry.Autodesk.DesignScript.Geometry.Mesh" - }, + } + ], + "childElements": [] + }, + { + "text": "PanelSurface", + "iconUrl": "", + "elementType": "group", + "include": [ { - "path": "ProtoGeometry.Autodesk.DesignScript.Geometry.Panel" + "path": "ProtoGeometry.Autodesk.DesignScript.Geometry.PanelSurface", + "inclusive": false } ], "childElements": [] From 5e43acc16e12f5a8d204d8b6eb86bab06b4b0999 Mon Sep 17 00:00:00 2001 From: Aparajit Pratap Date: Tue, 2 Apr 2024 12:17:01 -0400 Subject: [PATCH 2/2] update libg nuget pkg --- src/DynamoCore/DynamoCore.csproj | 2 +- src/DynamoCoreWpf/DynamoCoreWpf.csproj | 14 +++++++------- .../Views/CodeBlocks/CodeBlockEditorUtils.cs | 7 ++++--- src/DynamoManipulation/DynamoManipulation.csproj | 4 ++-- src/Libraries/Analysis/Analysis.csproj | 4 ++-- src/Libraries/CoreNodes/CoreNodes.csproj | 2 +- src/Libraries/GeometryColor/GeometryColor.csproj | 4 ++-- src/Libraries/GeometryUI/GeometryUI.csproj | 6 +++--- src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj | 4 ++-- src/Libraries/Tesellation/Tessellation.csproj | 4 ++-- .../NodeDocumentationMarkdownGenerator.csproj | 4 ++-- test/Libraries/AnalysisTests/AnalysisTests.csproj | 4 ++-- .../DynamoPythonTests/DynamoPythonTests.csproj | 4 ++-- .../GeometryColorTests/GeometryColorTests.csproj | 4 ++-- test/Libraries/TestServices/TestServices.csproj | 2 +- test/Libraries/WorkflowTests/WorkflowTests.csproj | 4 ++-- 16 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 45b02b3ffa2..45766b289b6 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index ce62180357e..6846642f3a5 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -167,16 +167,16 @@ - + - - - - - + + + + + none @@ -1836,4 +1836,4 @@ - \ No newline at end of file + diff --git a/src/DynamoCoreWpf/Views/CodeBlocks/CodeBlockEditorUtils.cs b/src/DynamoCoreWpf/Views/CodeBlocks/CodeBlockEditorUtils.cs index 133489a90f9..7df8ccd9dca 100644 --- a/src/DynamoCoreWpf/Views/CodeBlocks/CodeBlockEditorUtils.cs +++ b/src/DynamoCoreWpf/Views/CodeBlocks/CodeBlockEditorUtils.cs @@ -130,11 +130,12 @@ private static SolidColorBrush CreateFrozenBrush(Color color) public static void CreateHighlightingRules(ICSharpCode.AvalonEdit.TextEditor editor, EngineController controller) { - var stream = typeof(CodeHighlightingRuleFactory).Assembly.GetManifestResourceStream( - "Dynamo.Wpf.UI.Resources." + Configurations.HighlightingFile); + using var stream = typeof(CodeHighlightingRuleFactory).Assembly.GetManifestResourceStream( + "Dynamo.Wpf.UI.Resources." + Configurations.HighlightingFile); // Hyperlink color - editor.TextArea.TextView.LinkTextForegroundBrush = new SolidColorBrush(Color.FromArgb(255, 106, 192, 231)); + editor.TextArea.TextView.LinkTextForegroundBrush = + new SolidColorBrush(Color.FromArgb(255, 106, 192, 231)); editor.SyntaxHighlighting = HighlightingLoader.Load( new XmlTextReader(stream), HighlightingManager.Instance); diff --git a/src/DynamoManipulation/DynamoManipulation.csproj b/src/DynamoManipulation/DynamoManipulation.csproj index 8abbecd33d5..d6e1165ca69 100644 --- a/src/DynamoManipulation/DynamoManipulation.csproj +++ b/src/DynamoManipulation/DynamoManipulation.csproj @@ -40,7 +40,7 @@ - + @@ -70,4 +70,4 @@ - \ No newline at end of file + diff --git a/src/Libraries/Analysis/Analysis.csproj b/src/Libraries/Analysis/Analysis.csproj index 214261b734a..ca080ec0e7c 100644 --- a/src/Libraries/Analysis/Analysis.csproj +++ b/src/Libraries/Analysis/Analysis.csproj @@ -18,7 +18,7 @@ - + {7858fa8c-475f-4b8e-b468-1f8200778cf8} DynamoCore @@ -65,4 +65,4 @@ - \ No newline at end of file + diff --git a/src/Libraries/CoreNodes/CoreNodes.csproj b/src/Libraries/CoreNodes/CoreNodes.csproj index f870bbc29df..247fc76645c 100644 --- a/src/Libraries/CoreNodes/CoreNodes.csproj +++ b/src/Libraries/CoreNodes/CoreNodes.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Libraries/GeometryColor/GeometryColor.csproj b/src/Libraries/GeometryColor/GeometryColor.csproj index 306f0350f9d..ff40b40902e 100644 --- a/src/Libraries/GeometryColor/GeometryColor.csproj +++ b/src/Libraries/GeometryColor/GeometryColor.csproj @@ -14,7 +14,7 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + @@ -72,4 +72,4 @@ - \ No newline at end of file + diff --git a/src/Libraries/GeometryUI/GeometryUI.csproj b/src/Libraries/GeometryUI/GeometryUI.csproj index 9ac6892378c..e8644753663 100644 --- a/src/Libraries/GeometryUI/GeometryUI.csproj +++ b/src/Libraries/GeometryUI/GeometryUI.csproj @@ -1,4 +1,4 @@ - + @@ -17,7 +17,7 @@ - + @@ -74,4 +74,4 @@ - \ No newline at end of file + diff --git a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj index 09d8943b41e..b57b7e6bdda 100644 --- a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj +++ b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj @@ -21,7 +21,7 @@ - + @@ -97,4 +97,4 @@ - \ No newline at end of file + diff --git a/src/Libraries/Tesellation/Tessellation.csproj b/src/Libraries/Tesellation/Tessellation.csproj index 6fc3a8b41d2..2a8566beb39 100644 --- a/src/Libraries/Tesellation/Tessellation.csproj +++ b/src/Libraries/Tesellation/Tessellation.csproj @@ -14,7 +14,7 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj index 476a6aed9ea..dcf3ce076e0 100644 --- a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj +++ b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj @@ -13,7 +13,7 @@ - + @@ -67,4 +67,4 @@ Resources.en-US.Designer.cs - \ No newline at end of file + diff --git a/test/Libraries/AnalysisTests/AnalysisTests.csproj b/test/Libraries/AnalysisTests/AnalysisTests.csproj index 951c8fd4ed5..b8eef001854 100644 --- a/test/Libraries/AnalysisTests/AnalysisTests.csproj +++ b/test/Libraries/AnalysisTests/AnalysisTests.csproj @@ -10,7 +10,7 @@ AnalysisTests - + @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj b/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj index e6d99951b04..3ca622f31b0 100644 --- a/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj +++ b/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj @@ -18,7 +18,7 @@ - + @@ -89,4 +89,4 @@ - \ No newline at end of file + diff --git a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj index 3852675d0d7..80d59e9f292 100644 --- a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj +++ b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj @@ -10,7 +10,7 @@ DisplayTests - + @@ -49,4 +49,4 @@ - \ No newline at end of file + diff --git a/test/Libraries/TestServices/TestServices.csproj b/test/Libraries/TestServices/TestServices.csproj index e4ecacb180d..b29ab536037 100644 --- a/test/Libraries/TestServices/TestServices.csproj +++ b/test/Libraries/TestServices/TestServices.csproj @@ -10,7 +10,7 @@ TestServices - + diff --git a/test/Libraries/WorkflowTests/WorkflowTests.csproj b/test/Libraries/WorkflowTests/WorkflowTests.csproj index b1c337c3251..cd732581ccc 100644 --- a/test/Libraries/WorkflowTests/WorkflowTests.csproj +++ b/test/Libraries/WorkflowTests/WorkflowTests.csproj @@ -14,7 +14,7 @@ - + @@ -57,4 +57,4 @@ - \ No newline at end of file +