Merge pull request #205 from mpostol/UANodeSetValidation5.1.0

Working on removing dependency on the CodeProtect

ModelDesigner.Configuration.UnitTests/ModelDesigner.Configuration.UnitTests.csproj

@@ -71,29 +71,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CAS.CodeProtect, Version=7.0.0.18157, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
-      <HintPath>..\packages\CAS.CodeProtect.7.0.1-Bravo\lib\net451\CAS.CodeProtect.dll</HintPath>
-    </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>
-    </Reference>
-    <Reference Include="CAS.CommServer.OPCClassicSDK.Core, Version=2.1.1062.39746, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
-      <HintPath>..\packages\CAS.CommServer.OPCClassic.SDK.Core.2.01.1062\lib\net451\CAS.CommServer.OPCClassicSDK.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="CAS.CommServer.UA.Stack.Core, Version=1.1.3265.40471, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
-      <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>
-    </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>
-    </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>
-    </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
     </Reference>

ModelDesigner.Configuration.UnitTests/ServerSelectorUnitTest.cs

@@ -22,15 +22,18 @@ public class ServerSelectorUnitTest
     [ClassInitialize]
     public static void ConfigTest(TestContext context)
     {
-      Console.WriteLine(Directory.GetCurrentDirectory());
+      console.Add(Directory.GetCurrentDirectory());
       if (Directory.Exists(m_ExamplePath))
         Directory.Delete(m_ExamplePath, true);
-      ContainerResources.ExampleSolutionInstallation(m_ExamplePath, (x, y) => Console.WriteLine(x));
+      ContainerResources.ExampleSolutionInstallation(m_ExamplePath, (x, y) => console.Add(x));
     }
 
+
     [TestMethod]
     public void TestEnvironment()
     {
+      foreach (string entry in console)
+        Console.WriteLine(entry);
       Assert.IsTrue(File.Exists(m_PluginFullPath));
       Assert.IsTrue(File.Exists($@"{m_ExamplePath}\DemoConfiguration\DefaultConfig.xml"));
       Assert.IsTrue(File.Exists($@"{m_ExamplePath}\DemoConfiguration\BoilerExample.oses"));
@@ -129,6 +132,7 @@ public void GetPluginRelativePathNamesXTest()
     private static readonly string m_ConfigurationDefaultFileName = Path.Combine((Directory.GetCurrentDirectory()), "CAS.UAServer.Configuration.uasconfig");
     private static readonly string m_ExamplePath = Path.Combine((Directory.GetCurrentDirectory()), "Plugin");
     private static readonly string m_PluginFullPath = Path.Combine(m_ExamplePath, m_PlaginCodeBaseRelativePath);
+    private static List<string> console = new List<string>();
 
     private class OpenFileDialog4UnitTest : IFileDialog
     {

ModelDesigner.Configuration.UnitTests/packages.config

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CAS.CodeProtect" version="7.0.1-Bravo" targetFramework="net472" />
-  <package id="CAS.CommServer.DAClientConfiguration" version="5.01.06" targetFramework="net472" />
-  <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="net472" />
-  <package id="CAS.Windows.Forms" version="6.1.2" targetFramework="net472" />
   <package id="Castle.Core" version="4.4.1" targetFramework="net472" />
   <package id="CommonServiceLocator" version="2.0.6" targetFramework="net472" />
   <package id="Moq" version="4.16.0" targetFramework="net472" />

ModelDesigner.Configuration/ModelDesigner.Configuration.csproj

@@ -80,14 +80,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CAS.CommServer.OPCClassicSDK.Core, Version=2.1.1062.39746, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
-      <HintPath>..\packages\CAS.CommServer.OPCClassic.SDK.Core.2.01.1062\lib\net451\CAS.CommServer.OPCClassicSDK.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="CAS.CommServer.UA.Stack.Core, Version=1.1.3265.40471, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
-      <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="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -98,9 +90,6 @@
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="UAOOI.ASMD.GUIAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
-      <HintPath>..\packages\UAOOI.ASMD.GUIAbstractions.1.0.0-Alpha\lib\netstandard2.0\UAOOI.ASMD.GUIAbstractions.dll</HintPath>
-    </Reference>
     <Reference Include="UAOOI.Configuration.Core, Version=4.0.1.1, Culture=neutral, PublicKeyToken=deede3c2df331bb0, processorArchitecture=MSIL">
       <HintPath>..\packages\UAOOI.Configuration.Core.4.0.1\lib\netstandard2.0\UAOOI.Configuration.Core.dll</HintPath>
     </Reference>

ModelDesigner.Configuration/packages.config

@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <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="UAOOI.ASMD.GUIAbstractions" version="1.0.0-Alpha" targetFramework="net472" />
   <package id="UAOOI.Configuration.Core" version="4.0.1" targetFramework="net472" />
 </packages>

ModelDesigner.ModelsContainer.UnitTests/ResourcesUnitTest.cs

@@ -25,10 +25,10 @@ public void ResourcesTestMethod()
         int _installedFiles = 0;
         Assert.IsFalse(_targetDirectory.Exists, "The test directory already exist before test starting");
         ContainerResources.ExampleSolutionInstallation(m_TestPath, (x, y) => { Console.WriteLine($"{y}: {x}"); _installedFiles++; });
-        Assert.AreEqual<int>(22, _installedFiles);
+        Assert.AreEqual<int>(33, _installedFiles);
         _targetDirectory.Refresh();
         Assert.IsTrue(_targetDirectory.Exists);
-        Assert.AreEqual<int>(5, _targetDirectory.GetFiles().Length, "Expected 2 solutions and plug-in");
+        Assert.AreEqual<int>(16, _targetDirectory.GetFiles().Length, "Expected 2 solutions and plug-in");
         Assert.AreEqual<int>(2, _targetDirectory.GetDirectories().Length, "Expected only 2 solutions folders");
       }
       catch (Exception)

ModelDesigner.ModelsContainer/ModelDesigner.ModelsContainer.csproj

@@ -196,6 +196,9 @@
     <Content Include="EmbeddedExample\ADISampleConfiguration\OpcUaDiModel\Opc.Ua.Di.NodeSet.xml" />
     <Content Include="EmbeddedExample\ADISampleConfiguration\OpcUaDiModel\Opc.Ua.Di.NodeSet2.xml" />
     <Content Include="EmbeddedExample\ADISampleConfiguration\OpcUaDiModel\Opc.Ua.Di.PredefinedNodes.xml" />
+    <EmbeddedResource Include="EmbeddedExample\UAOOI.ASMD.GUIAbstractions.dll" />
+    <EmbeddedResource Include="EmbeddedExample\UAOOI.Configuration.Core.dll" />
+    <EmbeddedResource Include="EmbeddedExample\UAOOI.Windows.Forms.dll" />
     <EmbeddedResource Include="EmbeddedExample\UAOOI.ProcessObserver.Configuration.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
@@ -209,6 +212,14 @@
     <EmbeddedResource Include="EmbeddedExample\CAS.CommServer.UA.ConfigurationEditor.ServerConfiguration.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="EmbeddedExample\CAS.CodeProtect.dll" />
+    <EmbeddedResource Include="EmbeddedExample\CAS.CommServer.DAClientConfiguration.dll" />
+    <EmbeddedResource Include="EmbeddedExample\CAS.CommServer.OPCClassicSDK.Core.dll" />
+    <EmbeddedResource Include="EmbeddedExample\CAS.CommServer.UA.Common.dll" />
+    <EmbeddedResource Include="EmbeddedExample\CAS.CommServer.UA.Stack.Core.dll" />
+    <EmbeddedResource Include="EmbeddedExample\CAS.RealTime.Core.dll" />
+    <EmbeddedResource Include="EmbeddedExample\CAS.RealTime.dll" />
+    <EmbeddedResource Include="EmbeddedExample\CAS.Windows.Forms.dll" />
     <Content Include="EmbeddedExample\DemoConfiguration\BoilersSet\Commsvr.UA.Examples.BoilersSet.NodeSet.xml" />
     <Content Include="EmbeddedExample\DemoConfiguration\BoilersSet\Commsvr.UA.Examples.BoilersSet.NodeSet2.xml">
       <SubType>Designer</SubType>