update

DynamoDS · Oct 17, 2023 · f269e08 · f269e08
1 parent d1c8d7e
commit f269e08
Show file tree

Hide file tree

Showing 43 changed files with 9 additions and 2,463 deletions.
diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
@@ -6,11 +6,7 @@
 using Dynamo.UI.Commands;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.ViewModels.Core;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
-#endif
 using Greg.AuthProviders;
 using System.Linq;
 using System.Windows;

diff --git a/src/DynamoCoreWpf/Controls/StartPage.xaml.cs b/src/DynamoCoreWpf/Controls/StartPage.xaml.cs
@@ -14,11 +14,7 @@
 using Dynamo.Utilities;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Properties;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
-#endif
 
 namespace Dynamo.UI.Controls
 {

diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelDelegateCommands.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelDelegateCommands.cs
@@ -1,11 +1,7 @@
 using System;
 using Dynamo.Graph.Nodes.CustomNodes;
 using Dynamo.Wpf.ViewModels;
-#if NETFRAMEWORK
-using Microsoft.Practices.Prism.Commands;
-#else
 using Prism.Commands;
-#endif
 using DelegateCommand = Dynamo.UI.Commands.DelegateCommand;
 
 namespace Dynamo.ViewModels

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/InstalledPackagesViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/InstalledPackagesViewModel.cs
@@ -4,11 +4,7 @@
 using Dynamo.PackageManager;
 using Dynamo.Utilities;
 using Dynamo.Wpf.Properties;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
-#endif
 
 namespace Dynamo.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemViewModel.cs
@@ -4,11 +4,7 @@
 using System.IO;
 using System.Windows;
 using System.Windows.Input;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
-#endif
 
 namespace Dynamo.PackageManager.UI
 {

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
@@ -23,11 +23,7 @@
 using Dynamo.Wpf.Utilities;
 using Greg.AuthProviders;
 using Greg.Responses;
-#if NETFRAMEWORK
-using Microsoft.Practices.Prism.Commands;
-#else
 using Prism.Commands;
-#endif
 
 namespace Dynamo.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
@@ -6,11 +6,7 @@
 using Dynamo.ViewModels;
 using Dynamo.Wpf.ViewModels;
 using Greg.Responses;
-#if NETFRAMEWORK
-using Microsoft.Practices.Prism.Commands;
-#else
 using Prism.Commands;
-#endif
 
 namespace Dynamo.PackageManager.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -23,13 +23,8 @@
 using Lucene.Net.Index;
 using Lucene.Net.QueryParsers.Classic;
 using Lucene.Net.Search;
-#if NETFRAMEWORK
-using Microsoft.Practices.Prism.Commands;
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-#else
 using Prism.Commands;
 using NotificationObject = Dynamo.Core.NotificationObject;
-#endif
 
 namespace Dynamo.PackageManager
 {

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
@@ -1,10 +1,6 @@
 using Dynamo.Controls;
 using Dynamo.ViewModels;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
-#endif
 using System.Collections.ObjectModel;
 
 namespace Dynamo.PackageManager

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs
@@ -12,13 +12,8 @@
 using Dynamo.PackageManager;
 using Dynamo.Wpf.Properties;
 using Dynamo.Wpf.Utilities;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-using Microsoft.Practices.Prism.Commands;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
 using Prism.Commands;
-#endif
 
 namespace Dynamo.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -23,13 +23,8 @@
 using PythonNodeModels;
 using Double = System.Double;
 using String = System.String;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-using Microsoft.Practices.Prism.Commands;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
 using Prism.Commands;
-#endif
 
 namespace Dynamo.PackageManager
 {

diff --git a/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs
@@ -7,11 +7,7 @@
 using Dynamo.Wpf.Properties;
 using Dynamo.UI.Commands;
 using Dynamo.Utilities;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
-#endif
 using Dynamo.Configuration;
 using CoreNodeModels;
 

diff --git a/src/DynamoCoreWpf/ViewModels/Search/BrowserItemViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/BrowserItemViewModel.cs
@@ -11,13 +11,8 @@
 using Dynamo.Search.SearchElements;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Extensions;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-using Microsoft.Practices.Prism.Commands;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
 using Prism.Commands;
-#endif
 
 namespace Dynamo.Wpf.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeSearchElementViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeSearchElementViewModel.cs
@@ -13,11 +13,7 @@
 using Dynamo.Selection;
 using Dynamo.ViewModels;
 using FontAwesome5;
-#if NETFRAMEWORK
-using Microsoft.Practices.Prism.Commands;
-#else
 using Prism.Commands;
-#endif
 
 namespace Dynamo.Wpf.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/Search/SearchCategory.cs b/src/DynamoCoreWpf/ViewModels/Search/SearchCategory.cs
@@ -1,10 +1,6 @@
 using System.Windows.Input;
 using Dynamo.UI.Commands;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
-#endif
 
 namespace Dynamo.Wpf.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/ViewModelBase.cs b/src/DynamoCoreWpf/ViewModels/ViewModelBase.cs
@@ -1,9 +1,5 @@
 using System;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
-#endif
 using Newtonsoft.Json;
 
 namespace Dynamo.ViewModels

diff --git a/src/DynamoCoreWpf/Views/CodeBlocks/CodeBlockMethodInsightWindow.cs b/src/DynamoCoreWpf/Views/CodeBlocks/CodeBlockMethodInsightWindow.cs
@@ -6,11 +6,7 @@
 using Dynamo.Engine.CodeCompletion;
 using ICSharpCode.AvalonEdit.CodeCompletion;
 using ICSharpCode.AvalonEdit.Editing;
-#if NETFRAMEWORK
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
-#else
 using NotificationObject = Dynamo.Core.NotificationObject;
-#endif
 
 namespace Dynamo.UI
 {

diff --git a/src/DynamoUtilities/ObservableHashSet.cs b/src/DynamoUtilities/ObservableHashSet.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Specialized;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/SelectionBase.cs b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/SelectionBase.cs
@@ -2,11 +2,7 @@
 using CoreNodeModels;
 using Dynamo.Controls;
 using Dynamo.Wpf;
-#if NETFRAMEWORK
-using Microsoft.Practices.Prism.Commands;
-#else
 using Prism.Commands;
-#endif
 
 namespace CoreNodeModelsWpf.Nodes
 {

diff --git a/src/Tools/DynamoShapeManager/Utilities.cs b/src/Tools/DynamoShapeManager/Utilities.cs
@@ -593,7 +593,6 @@ public static Version GetVersionFromPath(string asmPath, string searchPattern =
             var ASMFilePath = Directory.GetFiles(asmPath, searchPattern, SearchOption.TopDirectoryOnly).FirstOrDefault();
             if (ASMFilePath != null && File.Exists(ASMFilePath))
             {
-#if NET6_0_OR_GREATER
                 if (!OperatingSystem.IsWindows())
                 {
                     string fileName = Path.GetFileNameWithoutExtension(ASMFilePath);
@@ -609,7 +608,6 @@ public static Version GetVersionFromPath(string asmPath, string searchPattern =
                     }
                     return new Version($"{version}.0.0");
                 }
-#endif
                 var asmVersion = FileVersionInfo.GetVersionInfo(ASMFilePath);
                 var libGversion = new Version(asmVersion.FileMajorPart, asmVersion.FileMinorPart, asmVersion.FileBuildPart);
                 return libGversion;

diff --git a/test/DynamoCoreTests/Configuration/ExecutionSessionTests.cs b/test/DynamoCoreTests/Configuration/ExecutionSessionTests.cs
@@ -21,11 +21,8 @@ protected override void GetLibrariesToPreload(List<string> libraries)
             libraries.Add("FunctionObject.ds");
             base.GetLibrariesToPreload(libraries);
         }
-#if NET6_0_OR_GREATER
+
         [OneTimeSetUp]
-#elif NETFRAMEWORK
-        [TestFixtureSetUp]
-#endif
         public void FixtureSetup()
         {
             ExecutionEvents.GraphPostExecution += ExecutionEvents_GraphPostExecution;
@@ -55,11 +52,7 @@ private void ExecutionEvents_GraphPreExecution(Session.IExecutionSession session
 
         }
 
-#if NET6_0_OR_GREATER
         [OneTimeTearDown]
-#elif NETFRAMEWORK
-        [TestFixtureTearDown]
-#endif
         public void TearDown()
         {
             ExecutionEvents.GraphPostExecution -= ExecutionEvents_GraphPostExecution;

diff --git a/test/DynamoCoreTests/Crypto/DynamoCyptoTests.cs b/test/DynamoCoreTests/Crypto/DynamoCyptoTests.cs
diff --git a/test/DynamoCoreTests/DummyNodeTests.cs b/test/DynamoCoreTests/DummyNodeTests.cs
@@ -115,11 +115,7 @@ public void IfDeserializationThrowsDummyNodeStillCreated()
             Assert.AreEqual(1, CurrentDynamoModel.CurrentWorkspace.Nodes.OfType<DummyNode>().Count());
             var dummyNode = CurrentDynamoModel.CurrentWorkspace.Nodes.OfType<DummyNode>().First();
             //runtime behavior has changed for assembly resolve handlers that throw exceptions.
-#if NET6_0_OR_GREATER
             Assert.AreEqual(2, exceptionCount);
-#elif NETFRAMEWORK
-            Assert.AreEqual(1, exceptionCount);
-#endif
             AppDomain.CurrentDomain.AssemblyResolve -= handler;
         }
 

diff --git a/test/DynamoCoreTests/HomgeneousListTests.cs b/test/DynamoCoreTests/HomgeneousListTests.cs
@@ -26,11 +26,8 @@ protected override void GetLibrariesToPreload(List<string> libraries)
             libraries.Add("FunctionObject.ds");
             base.GetLibrariesToPreload(libraries);
         }
-#if NET6_0_OR_GREATER
+
         [OneTimeSetUp]
-#elif NETFRAMEWORK
-        [TestFixtureSetUp]
-#endif
         public void FixtureSetup()
         {
             ExecutionEvents.GraphPostExecution += ExecutionEvents_GraphPostExecution;
@@ -66,11 +63,7 @@ public void TestMethodResolutionforHeterogeneousListInputs()
                 });
         }
 
-#if NET6_0_OR_GREATER
         [OneTimeTearDown]
-#elif NETFRAMEWORK
-        [TestFixtureTearDown]
-#endif
         public void TearDown()
         {
             ExecutionEvents.GraphPostExecution -= ExecutionEvents_GraphPostExecution;