Upgrade Windows.Form #95

- done for ModelDesigner.Configuration
- changed target framework to 4.7.2
- ModelDesigner.Configuration - removed dependency on RealTime
- Added dependency on UAOOI.Windows.Forms" version="7.0.3-Delta" targetFramework="net472" (replaces id="CAS.Windows.Forms" version="6.1.2" targetFramework="net461")

ModelDesigner.Configuration/ModelDesigner.Configuration.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CAS.CommServer.UA.ModelDesigner.Configuration</RootNamespace>
     <AssemblyName>CAS.CommServer.UA.ModelDesigner.Configuration</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>cas.snk</AssemblyOriginatorKeyFile>
@@ -75,22 +75,10 @@
       <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.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="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -101,6 +89,9 @@
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <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>
     <Compile Include="ConfigurationWrapper.cs" />

ModelDesigner.Configuration/ServerSelector.cs

@@ -9,7 +9,6 @@
 using CAS.CommServer.UA.ModelDesigner.Configuration.UserInterface;
 using CAS.Lib.CodeProtect;
 using CAS.UA.IServerConfiguration;
-using CAS.Windows.Forms.CodeProtectControls;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -19,6 +18,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
+using UAOOI.Windows.Forms.CodeProtectControls;
 
 namespace CAS.CommServer.UA.ModelDesigner.Configuration
 {

ModelDesigner.Configuration/ServerWrapper.cs

@@ -7,7 +7,7 @@
 
 using CAS.CommServer.UA.Common;
 using CAS.CommServer.UA.ModelDesigner.Configuration.UserInterface;
-using CAS.Lib.RTLib.Utils;
+using CAS.Lib.CodeProtect;
 using CAS.UA.IServerConfiguration;
 using System;
 using System.Collections.Generic;

ModelDesigner.Configuration/app.config

@@ -1,23 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<configSections>
 		<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-			<section name="CAS.UA.Model.Designer.Configuration.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+			<section name="CAS.UA.Model.Designer.Configuration.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
 		</sectionGroup>
 	</configSections>
-	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup><userSettings>
+	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup><userSettings>
 		<CAS.UA.Model.Designer.Configuration.Properties.Settings>
 			<setting name="UAServerConfigurationFiltr" serializeAs="String">
 				<value>Configuration (* .{0})|*.{0}|(* .xml)|*.xml|All files (*.*)|*.*</value>
 			</setting>
 		</CAS.UA.Model.Designer.Configuration.Properties.Settings>
 	</userSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="CAS.CodeProtect" publicKeyToken="8832ff1a67ea61a3" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.18157" newVersion="7.0.0.18157" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

ModelDesigner.Configuration/packages.config

@@ -3,8 +3,7 @@
   <package id="CAS.CodeProtect" version="7.0.1-Bravo" targetFramework="net461" />
   <package id="CAS.CommServer.OPCClassic.SDK.Core" version="2.01.1062" targetFramework="net461" />
   <package id="CAS.CommServer.UA.Stack.Core" version="1.01.3265" 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.UA.IServerConfiguration" version="1.00.00" targetFramework="net46" />
-  <package id="CAS.Windows.Forms" version="6.1.2" targetFramework="net461" />
+  <package id="UAOOI.Windows.Forms" version="7.0.3-Delta" targetFramework="net472" />
 </packages>

ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CAS.UA.Model.Designer</RootNamespace>
     <AssemblyName>CAS.UA.ModelDesigner</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>CAS.UA.Model.Designer.Program</StartupObject>
     <IsWebBootstrapper>true</IsWebBootstrapper>
@@ -549,7 +549,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="IO\IOClassDiagram.cd" />
-    <None Include="Model_TemporaryKey.pfx" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

ModelDesigner.DesignStudio/ReleaseNotes.md

@@ -6,7 +6,7 @@
 * Description:   OPC UA Information Model Design Studio.
 * Product:       [Object Oriented Internet](https://github.com/mpostol/OPC-UA-OOI)
 * Version:       4.1.0
-* Release Date:  17.12.2019
+* Release Date:  2/8/2020
 
 The main changes and new functionality are listed below: