Merge branch 'master' into NodeClusterVisual

DynamoDS · Mar 3, 2025 · 5fb4d4b · 5fb4d4b
2 parents f719688 + d541a79
commit 5fb4d4b
Show file tree

Hide file tree

Showing 89 changed files with 646 additions and 37 deletions.
diff --git a/src/DocumentationBrowserViewExtension/Properties/AssemblyInfo.cs b/src/DocumentationBrowserViewExtension/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -11,4 +11,6 @@
 [assembly: Guid("5e76aab3-6302-473e-9655-081b53fb1419")]
 
 // Visible to DynamoCoreWpfTests dll for unit testing
-[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf3Tests")]
diff --git a/src/Dynamo.All.sln b/src/Dynamo.All.sln
@@ -205,7 +205,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoPythonTests", "..\tes
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoMLDataPipeline", "DynamoMLDataPipeline\DynamoMLDataPipeline.csproj", "{5DF79F45-5F2C-41C1-BACC-890AE514CDA8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestCodeBlockNodeSecurityIssue", "..\test\Engine\TestCodeBlockNodeSecurityIssue\TestCodeBlockNodeSecurityIssue.csproj", "{0E822F71-154F-4442-BBD6-382181A7415C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCodeBlockNodeSecurityIssue", "..\test\Engine\TestCodeBlockNodeSecurityIssue\TestCodeBlockNodeSecurityIssue.csproj", "{0E822F71-154F-4442-BBD6-382181A7415C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoCoreWpf2Tests", "..\test\DynamoCoreWpf2Tests\DynamoCoreWpf2Tests.csproj", "{544C9F68-A23A-43AD-9442-06B4C79AB286}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoCoreWpf3Tests", "..\test\DynamoCoreWpf3Tests\DynamoCoreWpf3Tests.csproj", "{AC60AA1B-5F76-4AA4-8A87-866B3E3F7069}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -536,6 +540,14 @@ Global
 		{0E822F71-154F-4442-BBD6-382181A7415C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0E822F71-154F-4442-BBD6-382181A7415C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0E822F71-154F-4442-BBD6-382181A7415C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{544C9F68-A23A-43AD-9442-06B4C79AB286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{544C9F68-A23A-43AD-9442-06B4C79AB286}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{544C9F68-A23A-43AD-9442-06B4C79AB286}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{544C9F68-A23A-43AD-9442-06B4C79AB286}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC60AA1B-5F76-4AA4-8A87-866B3E3F7069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC60AA1B-5F76-4AA4-8A87-866B3E3F7069}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC60AA1B-5F76-4AA4-8A87-866B3E3F7069}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC60AA1B-5F76-4AA4-8A87-866B3E3F7069}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -616,6 +628,8 @@ Global
 		{C4964946-B367-44EE-9ED2-451FF2A83D32} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57}
 		{773988FE-EDF6-45CB-A63F-482955EB3553} = {4CA0BC62-DCB3-456B-80D6-348247640BAB}
 		{0E822F71-154F-4442-BBD6-382181A7415C} = {91C57567-DDF1-409A-880B-3A290A486AAC}
+		{544C9F68-A23A-43AD-9442-06B4C79AB286} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57}
+		{AC60AA1B-5F76-4AA4-8A87-866B3E3F7069} = {5B9B5B6B-0BA7-4606-B8E5-70C958346D57}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {89CB19C6-BF0A-4E6A-BFDA-79D143EAB59D}

diff --git a/src/DynamoCore/Properties/AssemblyInfo.cs b/src/DynamoCore/Properties/AssemblyInfo.cs
@@ -10,6 +10,8 @@
 [assembly: InternalsVisibleTo("DynamoCoreWpf")]
 [assembly: InternalsVisibleTo("DynamoCoreTests")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf3Tests")]
 [assembly: InternalsVisibleTo("DynamoRevitDS")]
 [assembly: InternalsVisibleTo("DynamoMSOfficeTests")]
 [assembly: InternalsVisibleTo("CoreNodeModels")]

diff --git a/src/DynamoCoreWpf/Properties/AssemblyInfo.cs b/src/DynamoCoreWpf/Properties/AssemblyInfo.cs
@@ -27,6 +27,8 @@
 
 [assembly: InternalsVisibleTo("DynamoCoreTests")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf3Tests")]
 [assembly: InternalsVisibleTo("DynamoMSOfficeTests")]
 [assembly: InternalsVisibleTo("PackageManagerSearchElementViewModelTests")]
 [assembly: InternalsVisibleTo("CoreNodeModelsWpf")]

diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -3032,7 +3032,7 @@ This package will be unloaded after the next Dynamo restart.</value>
     <value>Publish a Package</value>
   </data>
   <data name="PackageManagerPublishOnlineFinishedMessage" xml:space="preserve">
-    <value>Virus scan in progress. Your package will be searchable in approximately 15 minutes.</value>
+    <value>Virus scan in progress. Your package will be searchable in a few minutes.</value>
   </data>
   <data name="PackageManagerInstalledPackagesTab" xml:space="preserve">
     <value>Installed Packages</value>

diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -1303,7 +1303,7 @@ Don't worry, you'll have the option to save your work.</value>
     <value>Publish a Package</value>
   </data>
   <data name="PackageManagerPublishOnlineFinishedMessage" xml:space="preserve">
-    <value>Virus scan in progress. Your package will be searchable in approximately 15 minutes.</value>
+    <value>Virus scan in progress. Your package will be searchable in a few minutes.</value>
   </data>
   <data name="PackageManagerInstalledPackagesTab" xml:space="preserve">
     <value>Installed Packages</value>

diff --git a/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs
@@ -2004,6 +2004,7 @@ private void RaisePropertyChangedOnDownStreamNodes()
                 if (current != null)
                 {
                     current.RaisePropertyChanged("IsFrozen");
+                    current.HandleColorOverlayChange();
                 }
             }
         }

diff --git a/src/DynamoManipulation/Properties/AssemblyInfo.cs b/src/DynamoManipulation/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -11,4 +11,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("7d1c274e-66f1-412b-abf1-c8f98b7cf364")]
 
-[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
diff --git a/src/DynamoPackages/Properties/AssemblyInfo.cs b/src/DynamoPackages/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -16,4 +16,6 @@
 [assembly: InternalsVisibleTo("DynamoPackagesUI")]
 [assembly: InternalsVisibleTo("DynamoPackagesWPF")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf3Tests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
diff --git a/src/DynamoPackagesWPF/Properties/AssemblyInfo.cs b/src/DynamoPackagesWPF/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -10,4 +10,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("47d2166c-5261-4093-9660-e72b7035e666")]
 
-[assembly: InternalsVisibleTo("DynamoCoreWpfTests")] 
+[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
diff --git a/src/DynamoUtilities/Properties/AssemblyInfo.cs b/src/DynamoUtilities/Properties/AssemblyInfo.cs
@@ -15,6 +15,8 @@
 [assembly: InternalsVisibleTo("DynamoCoreWpf")]
 [assembly: InternalsVisibleTo("DynamoCoreTests")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf3Tests")]
 [assembly: InternalsVisibleTo("DynamoMSOfficeTests")]
 [assembly: InternalsVisibleTo("WpfVisualizationTests")]
 [assembly: InternalsVisibleTo("DocumentationBrowserViewExtension")]

diff --git a/src/GraphMetadataViewExtension/Properties/AssemblyInfo.cs b/src/GraphMetadataViewExtension/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -11,4 +11,5 @@
 [assembly: Guid("a42563f1-2b8b-4c4d-bfad-2ca981524e00")]
 
 // Visible to DynamoCoreWpfTests dll for unit testing
-[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
diff --git a/src/GraphNodeManagerViewExtension/Properties/AssemblyInfo.cs b/src/GraphNodeManagerViewExtension/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -11,4 +11,5 @@
 [assembly: Guid("1e92cdb0-644c-4eaa-8ab8-efdd193a0484")]
 
 // Visible to DynamoCoreWpfTests dll for unit testing
-[assembly: InternalsVisibleTo("DynamoCoreWpfTests")] 
+[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
diff --git a/src/Libraries/CoreNodeModelsWpf/Properties/AssemblyInfo.cs b/src/Libraries/CoreNodeModelsWpf/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -9,4 +9,5 @@
 [assembly: AssemblyCulture("")]
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("8a24e7a0-5c03-4fe3-bfce-7c4c6858c19a")]
-[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf3Tests")]
diff --git a/src/Libraries/DynamoUnits/Properties/AssemblyInfo.cs b/src/Libraries/DynamoUnits/Properties/AssemblyInfo.cs
@@ -12,4 +12,6 @@
 [assembly: Guid("2a29d5d1-ece3-4802-a758-562fec421051")]
 [assembly:InternalsVisibleTo("DynamoCoreTests")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf3Tests")]
 [assembly: InternalsVisibleTo("UnitsNodeModels")]
diff --git a/src/Libraries/PythonNodeModelsWpf/Properties/AssemblyInfo.cs b/src/Libraries/PythonNodeModelsWpf/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -13,4 +13,6 @@
 
 [assembly:InternalsVisibleTo("DynamoPythonTests")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
-[assembly: InternalsVisibleTo("IronPythonTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf3Tests")]
+[assembly: InternalsVisibleTo("IronPythonTests")]
diff --git a/src/Libraries/Watch3DNodeModelsWpf/Properties/AssemblyInfo.cs b/src/Libraries/Watch3DNodeModelsWpf/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -11,3 +11,5 @@
 [assembly: Guid("b48c0f05-8716-44d6-9c5e-20ed731a6f0d")]
 [assembly: InternalsVisibleTo("DynamoCoreTests")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
+
diff --git a/src/NodeAutoCompleteViewExtension/Properties/AssemblyInfo.cs b/src/NodeAutoCompleteViewExtension/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -11,4 +11,5 @@
 [assembly: Guid("5e76aab3-6302-473e-9655-081b53fb1419")]
 
 // Visible to DynamoCoreWpfTests dll for unit testing
-[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
diff --git a/src/NodeServices/Properties/AssemblyInfo.cs b/src/NodeServices/Properties/AssemblyInfo.cs
@@ -31,10 +31,11 @@
 [assembly: InternalsVisibleTo("DynamoPythonTests")]
 [assembly: InternalsVisibleTo("IronPythonTests")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf3Tests")]
 [assembly: InternalsVisibleTo("DynamoPackages")]
 [assembly: InternalsVisibleTo("DynamoSandbox")]
 [assembly: InternalsVisibleTo("PackageDetailsViewExtension")]
-[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
 [assembly: InternalsVisibleTo("DSCoreNodes")]
 [assembly: InternalsVisibleTo("FFITarget")]
 [assembly: InternalsVisibleTo("DynamoPlayer.Extension")]

diff --git a/src/Notifications/Properties/AssemblyInfo.cs b/src/Notifications/Properties/AssemblyInfo.cs
@@ -10,4 +10,5 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("0acedbf9-81ab-45ee-b5e5-0d036bce0a31")]
-[assembly:InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly:InternalsVisibleTo("DynamoCoreWpf2Tests")]
diff --git a/src/PackageDetailsViewExtension/Properties/AssemblyInfo.cs b/src/PackageDetailsViewExtension/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -10,4 +10,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("12fb4da4-7e9c-4c2e-91cd-1d0b523a9535")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
diff --git a/src/WorkspaceDependencyViewExtension/Properties/AssemblyInfo.cs b/src/WorkspaceDependencyViewExtension/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -11,4 +11,5 @@
 [assembly: Guid("5e76aab3-6302-473e-9655-081b53fb1419")]
 
 // Visible to DynamoCoreWpfTests dll for unit testing
-[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf2Tests")]
diff --git a/test/DynamoCoreTests/Logging/AnalyticsServiceTest.cs b/test/DynamoCoreTests/Logging/AnalyticsServiceTest.cs
@@ -17,6 +17,7 @@ public void DisableAnalytics()
         {
             var versions = new List<Version>(){
 
+                    new Version(231, 0,0),
                     new Version(230, 0,0),
             };
 
@@ -73,6 +74,7 @@ public void DisableAnalyticsViaNoNetWorkMode()
         {
             var versions = new List<Version>(){
 
+                    new Version(231, 0,0),
                     new Version(230, 0,0),
             };
-Original file line number
+Diff line change
@@ Expand Up / @@ -2004,6 +2004,7 @@ private void RaisePropertyChangedOnDownStreamNodes() @@
                     if (current != null)
                     {
                         current.RaisePropertyChanged("IsFrozen");
+                        current.HandleColorOverlayChange();
                     }
                 }
             }
@@ Expand Down @@