migrate Prism to dotnet6 (DynamoDS#14138)

* update * update * Update License.rtf * Update License.rtf * update --------- Co-authored-by: pinzart <[email protected]>
reddyashish · Jul 10, 2023 · 0f6b62a · 0f6b62a
1 parent 8d29c5a
commit 0f6b62a
Show file tree

Hide file tree

Showing 48 changed files with 539 additions and 564 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -628,6 +628,16 @@ https://github.com/JoshClose/CsvHelper/blob/master/LICENSE.txt
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
+Prism.Core v8.1.97
+The MIT License (MIT)
+https://github.com/PrismLibrary/Prism/blob/master/LICENSE.txt
+
+Copyright (c) Prism Library
+
+All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 MimeMapping v2.0.0
 MIT License
 https://licenses.nuget.org/MIT

diff --git a/doc/distrib/License.rtf b/doc/distrib/License.rtf
diff --git a/extern/legacy_remove_me/bin/Microsoft.Practices.Prism.dll b/extern/legacy_remove_me/bin/Microsoft.Practices.Prism.dll
diff --git a/extern/prism/Microsoft.Practices.Prism.dll b/extern/prism/Microsoft.Practices.Prism.dll
diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj
@@ -13,9 +13,6 @@
     <NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Design" />

diff --git a/src/DynamoCore/Graph/Workspaces/NodesToCodeExtensions.cs b/src/DynamoCore/Graph/Workspaces/NodesToCodeExtensions.cs
@@ -1,4 +1,3 @@
-using Dynamo.Core;
 using Dynamo.Engine;
 using Dynamo.Engine.NodeToCode;
 using Dynamo.Graph.Connectors;

diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
@@ -6,7 +6,7 @@
 using Dynamo.UI.Commands;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.ViewModels.Core;
-using Microsoft.Practices.Prism.ViewModel;
+using Dynamo.Core;
 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,7 +14,7 @@
 using Dynamo.Utilities;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Properties;
-using Microsoft.Practices.Prism.ViewModel;
+using Dynamo.Core;
 
 namespace Dynamo.UI.Controls
 {

diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -158,9 +158,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\extern\Microsoft.Xaml.Behaviors\$(TargetFramework)\Dynamo.Microsoft.Xaml.Behaviors.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Prism.Core" Version="8.1.97" />
 	<PackageReference Include="Extended.Wpf.Toolkit" version="3.0.0">
 	  <GeneratePathProperty>true</GeneratePathProperty>
     <!--Exclude copying the dll because we will handle it in the BinaryCompatibilityOps target -->

diff --git a/src/DynamoCoreWpf/UI/Prompts/PortPropertiesEditPrompt.xaml.cs b/src/DynamoCoreWpf/UI/Prompts/PortPropertiesEditPrompt.xaml.cs
@@ -8,7 +8,6 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Dynamo.Core;
 using Dynamo.Graph.Nodes;
 
 namespace UI.Prompts

diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelDelegateCommands.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelDelegateCommands.cs
@@ -1,7 +1,7 @@
 using System;
 using Dynamo.Graph.Nodes.CustomNodes;
 using Dynamo.Wpf.ViewModels;
-using Microsoft.Practices.Prism.Commands;
+using Prism.Commands;
 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
@@ -1,11 +1,11 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 
 using Dynamo.PackageManager;
 using Dynamo.Utilities;
 using Dynamo.Wpf.Properties;
-using Microsoft.Practices.Prism.ViewModel;
+using Dynamo.Core;
 
 namespace Dynamo.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemViewModel.cs
@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Windows;
 using System.Windows.Input;
-
-using Microsoft.Practices.Prism.ViewModel;
+using Dynamo.Core;
 
 namespace Dynamo.PackageManager.UI
 {

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

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

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -21,8 +21,8 @@
 using Lucene.Net.Documents;
 using Lucene.Net.QueryParsers.Classic;
 using Lucene.Net.Search;
-using Microsoft.Practices.Prism.Commands;
-using Microsoft.Practices.Prism.ViewModel;
+using Dynamo.Core;
+using Prism.Commands;
 
 namespace Dynamo.PackageManager
 {

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
@@ -1,5 +1,5 @@
 using Dynamo.ViewModels;
-using Microsoft.Practices.Prism.ViewModel;
+using Dynamo.Core;
 using System.Collections.ObjectModel;
 
 namespace Dynamo.PackageManager

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -13,8 +13,8 @@
 using Dynamo.PackageManager;
 using Dynamo.Wpf.Properties;
 using Dynamo.Wpf.Utilities;
-using Microsoft.Practices.Prism.Commands;
-using Microsoft.Practices.Prism.ViewModel;
+using Dynamo.Core;
+using Prism.Commands;
 
 namespace Dynamo.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -20,10 +20,10 @@
 using Dynamo.Wpf.Utilities;
 using DynamoUtilities;
 using Greg.Requests;
-using Microsoft.Practices.Prism.Commands;
+using Prism.Commands;
 using PythonNodeModels;
 using Double = System.Double;
-using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
+using NotificationObject = Dynamo.Core.NotificationObject;
 using String = System.String;
 
 namespace Dynamo.PackageManager

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

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

diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeSearchElementViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeSearchElementViewModel.cs
@@ -13,7 +13,7 @@
 using Dynamo.Selection;
 using Dynamo.ViewModels;
 using FontAwesome.WPF;
-using Microsoft.Practices.Prism.Commands;
+using Prism.Commands;
 
 namespace Dynamo.Wpf.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/Search/SearchCategory.cs b/src/DynamoCoreWpf/ViewModels/Search/SearchCategory.cs
@@ -2,7 +2,7 @@
 
 using Dynamo.UI.Commands;
 
-using Microsoft.Practices.Prism.ViewModel;
+using Dynamo.Core;
 
 namespace Dynamo.Wpf.ViewModels
 {

diff --git a/src/DynamoCoreWpf/ViewModels/ViewModelBase.cs b/src/DynamoCoreWpf/ViewModels/ViewModelBase.cs
@@ -1,6 +1,6 @@
-using System;
+using System;
 using Dynamo.Configuration;
-using Microsoft.Practices.Prism.ViewModel;
+using Dynamo.Core;
 using Newtonsoft.Json;
 
 namespace Dynamo.ViewModels

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

diff --git a/src/DynamoSandbox/DynamoSandbox.csproj b/src/DynamoSandbox/DynamoSandbox.csproj
@@ -21,11 +21,6 @@
   <PropertyGroup>
     <ApplicationIcon>logo_square_32x32.ico</ApplicationIcon>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

diff --git a/src/DynamoWPFCLI/DynamoWPFCLI.csproj b/src/DynamoWPFCLI/DynamoWPFCLI.csproj
@@ -13,6 +13,7 @@
     <AssemblyName>DynamoWPFCLI</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="WindowsBase" />
     <Reference Include="Microsoft.Practices.Prism">
       <HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
     </Reference>

diff --git a/src/DynamoWPFCLI/Program.cs b/src/DynamoWPFCLI/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Runtime.Versioning;
 using System.Threading;
 using Dynamo.Applications;
 using Dynamo.Models;
@@ -13,6 +14,9 @@ internal class Program
     {
         private static EventWaitHandle suspendEvent = new AutoResetEvent(false);
 
+#if NET6_0_OR_GREATER
+        [SupportedOSPlatform("Windows")]
+#endif
         [STAThread]
         internal static void Main(string[] args)
         {

diff --git a/src/GraphMetadataViewExtension/GraphMetadataViewExtension.csproj b/src/GraphMetadataViewExtension/GraphMetadataViewExtension.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <ImportGroup Label="PropertySheets">
     <Import Project="$(SolutionDir)Config\CS_SDK.props" />
   </ImportGroup>
@@ -10,9 +10,6 @@
     <AssemblyName>GraphMetadataViewExtension</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-      <HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Xaml" />

diff --git a/src/GraphNodeManagerViewExtension/GraphNodeManagerViewExtension.csproj b/src/GraphNodeManagerViewExtension/GraphNodeManagerViewExtension.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <ImportGroup Label="PropertySheets">
     <Import Project="$(SolutionDir)Config\CS_SDK.props" />
   </ImportGroup>
@@ -11,10 +11,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
+    <PackageReference Include="Prism.Core" Version="8.1.97" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Windows.Forms" />

diff --git a/src/GraphNodeManagerViewExtension/GraphNodeManagerViewModel.cs b/src/GraphNodeManagerViewExtension/GraphNodeManagerViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -15,7 +15,7 @@
 using Dynamo.PackageManager;
 using Dynamo.Utilities;
 using Dynamo.ViewModels;
-using Microsoft.Practices.Prism.Commands;
+using Prism.Commands;
 using DelegateCommand = Dynamo.UI.Commands.DelegateCommand;
 using GridNodeViewModel = Dynamo.GraphNodeManager.ViewModels.GridNodeViewModel;
 using Newtonsoft.Json;

diff --git a/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj b/src/Libraries/CoreNodeModelsWpf/CoreNodeModelsWpf.csproj
@@ -21,10 +21,7 @@
     </ReferenceCopyLocalPaths>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
+    <PackageReference Include="Prism.Core" Version="8.1.97" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />

diff --git a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/SelectionBase.cs b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/SelectionBase.cs
@@ -2,7 +2,7 @@
 using CoreNodeModels;
 using Dynamo.Controls;
 using Dynamo.Wpf;
-using Microsoft.Practices.Prism.Commands;
+using Prism.Commands;
 
 namespace CoreNodeModelsWpf.Nodes
 {
@@ -37,4 +37,4 @@ public void Dispose()
         {
         }
     }
-}
+}
diff --git a/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj b/src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj
@@ -38,10 +38,6 @@
   <ItemGroup>
 	<PackageReference Include="AvalonEdit" Version="4.3.1.9430" />
 	<PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="PresentationCore">
       <Private>False</Private>
     </Reference>

diff --git a/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj b/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj
@@ -24,19 +24,15 @@
   <ItemGroup>
     <PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" CopyMetaData="true" />
     <PackageReference Include="HelixToolkit" Version="2.17.0" CopyPDB="true" />
-	  <PackageReference Include="HelixToolkit.Wpf" Version="2.17.0" CopyPDB="true" />
-	  <PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.17.0" CopyPDB="true" />
-	  <PackageReference Include="SharpDX" Version="4.2.0" CopyPDB="true" />
-	  <PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" CopyPDB="true" />
-	  <PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" CopyPDB="true" />
-	  <PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" CopyPDB="true" />
-	  <PackageReference Include="SharpDX.Direct3D9" Version="4.2.0" CopyPDB="true" />
-	  <PackageReference Include="SharpDX.DXGI" Version="4.2.0" CopyPDB="true" />
-	  <PackageReference Include="SharpDX.Mathematics" Version="4.2.0" CopyPDB="true" />
-	  <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
+	<PackageReference Include="HelixToolkit.Wpf" Version="2.17.0" CopyPDB="true" />
+	<PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.17.0" CopyPDB="true" />
+	<PackageReference Include="SharpDX" Version="4.2.0" CopyPDB="true" />
+	<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" CopyPDB="true" />
+	<PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" CopyPDB="true" />
+	<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" CopyPDB="true" />
+	<PackageReference Include="SharpDX.Direct3D9" Version="4.2.0" CopyPDB="true" />
+	<PackageReference Include="SharpDX.DXGI" Version="4.2.0" CopyPDB="true" />
+	<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" CopyPDB="true" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Drawing" />

diff --git a/src/LibraryViewExtensionWebView2/LibraryViewExtensionWebView2.csproj b/src/LibraryViewExtensionWebView2/LibraryViewExtensionWebView2.csproj
@@ -182,10 +182,6 @@
     <Reference Include="Dynamo.Microsoft.Xaml.Behaviors, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\extern\Microsoft.Xaml.Behaviors\$(TargetFramework)\Dynamo.Microsoft.Xaml.Behaviors.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
     <Reference Include="PresentationFramework" />
 	<Reference Include="PresentationCore" />
     <Reference Include="System" />