Upgrade Windows.Form #95

- UAOOI.Windows.GUIAbstractions must be defined as the nuget. ModelDesigner.DesignStudio requires reference to it. Now the reference is added directly to the main packages folder - finished modification of ModelDesigner.DesignStudio and ModelDesigner.DesignStudio.UnitTest - UT 👍
mpostol · Feb 11, 2020 · 3f0f32f · 3f0f32f
1 parent 5460035
commit 3f0f32f
Show file tree

Hide file tree

Showing 21 changed files with 243 additions and 333 deletions.
diff --git a/ModelDesigner.DesignStudio.UnitTest/ModelDesigner.DesignStudio.UnitTest.csproj b/ModelDesigner.DesignStudio.UnitTest/ModelDesigner.DesignStudio.UnitTest.csproj
@@ -70,18 +70,6 @@
       <HintPath>..\packages\CAS.CommServer.UA.Stack.Core.1.01.3265\lib\net451\CAS.CommServer.UA.Stack.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="CAS.RealTime, Version=5.0.6.23644, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
-      <HintPath>..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="CAS.RealTime.Core, Version=5.0.6.23643, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
-      <HintPath>..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="CAS.Windows.Forms, Version=6.1.2.24319, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
-      <HintPath>..\packages\CAS.Windows.Forms.6.1.2\lib\net451\CAS.Windows.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
@@ -113,6 +101,9 @@
       <HintPath>..\packages\UAOOI.SemanticData.UANodeSetValidation.2.0.0-Alpha\lib\net461\UAOOI.SemanticDataUANodeSetValidation.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="UAOOI.Windows.Forms, Version=7.0.3.24962, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
+      <HintPath>..\packages\UAOOI.Windows.Forms.7.0.3-Delta\lib\net451\UAOOI.Windows.Forms.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ModelDesigner.Configuration\ModelDesigner.Configuration.csproj">

diff --git a/ModelDesigner.DesignStudio.UnitTest/packages.config b/ModelDesigner.DesignStudio.UnitTest/packages.config
@@ -5,14 +5,13 @@
   <package id="CAS.CommServer.UA.ModelCompiler.Common" version="1.11.335.10" targetFramework="net461" />
   <package id="CAS.CommServer.UA.Stack.Core" version="1.01.3265" targetFramework="net461" />
   <package id="CAS.Licenses.Container" version="2.00.06" targetFramework="net461" />
-  <package id="CAS.RealTime" version="5.0.6" targetFramework="net461" />
   <package id="CAS.UA.Common" version="3.00.05" targetFramework="net461" />
-  <package id="CAS.Windows.Forms" version="6.1.2" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.0" targetFramework="net472" />
   <package id="Moq" version="4.13.1" targetFramework="net472" />
   <package id="MSTest.TestAdapter" version="2.1.0" targetFramework="net472" />
   <package id="MSTest.TestFramework" version="2.1.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
   <package id="UAOOI.SemanticData.UANodeSetValidation" version="2.0.0-Alpha" targetFramework="net461" />
+  <package id="UAOOI.Windows.Forms" version="7.0.3-Delta" targetFramework="net472" />
 </packages>
diff --git a/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.Designer.cs b/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.Designer.cs
diff --git a/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.cs b/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.cs
@@ -4,7 +4,6 @@
 //
 //___________________________________________________________________________________
 
-using CAS.Lib.ControlLibrary;
 using CAS.UA.Model.Designer.IO;
 using CAS.UA.Model.Designer.Properties;
 using CAS.UA.Model.Designer.Solution;
@@ -14,6 +13,7 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
+using UAOOI.Windows.Forms;
 
 namespace CAS.UA.Model.Designer.Controls.NodeObserver
 {

diff --git a/ModelDesigner.DesignStudio/Controls/NodeObserver/PropertyGridObserver.Designer.cs b/ModelDesigner.DesignStudio/Controls/NodeObserver/PropertyGridObserver.Designer.cs
diff --git a/ModelDesigner.DesignStudio/Main.Designer.cs b/ModelDesigner.DesignStudio/Main.Designer.cs
diff --git a/ModelDesigner.DesignStudio/Main.cs b/ModelDesigner.DesignStudio/Main.cs
@@ -4,13 +4,12 @@
 //
 //___________________________________________________________________________________
 
-using CAS.Lib.ControlLibrary;
 using CAS.UA.Model.Designer.Properties;
 using CAS.UA.Model.Designer.Wrappers;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
+using UAOOI.Windows.Forms;
 
 namespace CAS.UA.Model.Designer
 {

diff --git a/ModelDesigner.DesignStudio/MainForm.Designer.cs b/ModelDesigner.DesignStudio/MainForm.Designer.cs
diff --git a/ModelDesigner.DesignStudio/MainForm.cs b/ModelDesigner.DesignStudio/MainForm.cs
@@ -4,22 +4,22 @@
 //
 //___________________________________________________________________________________
 
-using CAS.Lib.ControlLibrary;
-using CAS.Lib.ControlLibrary.ControlExtenders;
 using CAS.UA.Model.Designer.Controls;
 using CAS.UA.Model.Designer.ExportingTools;
 using CAS.UA.Model.Designer.IO;
 using CAS.UA.Model.Designer.Properties;
 using CAS.UA.Model.Designer.StateMachineEditor;
 using CAS.UA.Model.Designer.Wrappers;
-using CAS.Windows.Forms.CodeProtectControls;
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Drawing;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
+using UAOOI.Windows.Forms;
+using UAOOI.Windows.Forms.CodeProtectControls;
+using UAOOI.Windows.Forms.ControlExtenders;
 
 namespace CAS.UA.Model.Designer
 {
@@ -352,6 +352,7 @@ private void goToToolStripMenuItem_DropDownOpening(object sender, EventArgs e)
       }
     }
     #endregion
+
     private void HelpAboutUaModelDesignerToolStripMenuItem_Click(object sender, EventArgs e)
     {
       using (AboutForm dial = new AboutForm

diff --git a/ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj b/ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj
@@ -100,27 +100,21 @@
     </Reference>
     <Reference Include="CAS.CommServer.DA.Client.Operations, Version=2.0.18.39654, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.CommServer.DA.Client.2.00.18\lib\net451\CAS.CommServer.DA.Client.Operations.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="CAS.CommServer.DA.Client.Services, Version=2.0.18.39653, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.CommServer.DA.Client.2.00.18\lib\net451\CAS.CommServer.DA.Client.Services.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="CAS.CommServer.DA.Viewer.AddressSpace, Version=3.11.17.41002, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.CommServer.DA.Viewer.3.11.17\lib\net451\CAS.CommServer.DA.Viewer.AddressSpace.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="CAS.CommServer.DA.Viewer.FormControls, Version=3.11.17.41003, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.CommServer.DA.Viewer.3.11.17\lib\net451\CAS.CommServer.DA.Viewer.FormControls.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="CAS.CommServer.DAClientConfiguration, Version=5.1.6.25005, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.CommServer.DAClientConfiguration.5.01.06\lib\net451\CAS.CommServer.DAClientConfiguration.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="CAS.CommServer.DeviceSimulator, Version=5.1.6.25004, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.CommServer.DeviceSimulator.5.01.06\lib\net451\CAS.CommServer.DeviceSimulator.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="CAS.CommServer.OPCClassicSDK.COMWrapper, Version=2.1.1063.26814, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.CommServer.OPCClassic.SDK.COMWrapper.2.01.1063\lib\net451\CAS.CommServer.OPCClassicSDK.COMWrapper.dll</HintPath>
@@ -152,19 +146,16 @@
     </Reference>
     <Reference Include="CAS.RealTime, Version=5.0.6.23644, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="CAS.RealTime.Core, Version=5.0.6.23643, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.Core.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="CAS.UA.IServerConfiguration, Version=1.0.0.32204, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.UA.IServerConfiguration.1.00.00\lib\net35\CAS.UA.IServerConfiguration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CAS.Windows.Forms, Version=6.1.2.24319, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
       <HintPath>..\packages\CAS.Windows.Forms.6.1.2\lib\net451\CAS.Windows.Forms.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -195,6 +186,12 @@
       <HintPath>..\packages\UAOOI.SemanticData.UANodeSetValidation.2.0.0-Alpha\lib\net461\UAOOI.SemanticDataUANodeSetValidation.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="UAOOI.Windows.Forms, Version=7.0.3.24962, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
+      <HintPath>..\packages\UAOOI.Windows.Forms.7.0.3-Delta\lib\net451\UAOOI.Windows.Forms.dll</HintPath>
+    </Reference>
+    <Reference Include="UAOOI.Windows.GUIAbstractions">
+      <HintPath>..\packages\UAOOI.Windows.Forms.7.0.3-Delta\lib\netstandard2.0\UAOOI.Windows.GUIAbstractions.dll</HintPath>
+    </Reference>
     <Reference Include="WindowsBase">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
@@ -517,10 +514,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="Controls\Controls.cd" />
-    <None Include="DemoConfiguration.oses" />
     <Content Include="exe\CAS.CommServer.UA.ModelCompiler.Command.exe.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="DemoConfiguration.oses" />
     <None Include="Properties\app.manifest" />
     <None Include="Solution\UAModelDesignerSolution.GoXSD.cmd" />
     <None Include="Solution\UAModelDesignerSolution.GoCS.cmd" />

diff --git a/ModelDesigner.DesignStudio/StartUpSplashScreen.cs b/ModelDesigner.DesignStudio/StartUpSplashScreen.cs
@@ -1,20 +1,12 @@
-//<summary>
-//  Title   : Start Up Splash Screen
-//  System  : Microsoft Visual C# .NET 2008
-//  $LastChangedDate$
-//  $Rev$
-//  $LastChangedBy$
-//  $URL$
-//  $Id$
+//___________________________________________________________________________________
 //
-//  Copyright (C)2010, CAS LODZ POLAND.
-//  TEL: +48 (42) 686 25 47
-//  mailto://[email protected]
-//  http://www.cas.eu
-//</summary>
+//  Copyright (C) 2020, Mariusz Postol LODZ POLAND.
+//
+//  To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI
+//___________________________________________________________________________________
 
 using CAS.UA.Model.Designer.Properties;
-using CAS.Windows.Forms.CodeProtectControls;
+using UAOOI.Windows.Forms.CodeProtectControls;
 
 namespace CAS.UA.Model.Designer
 {