Skip to content

Commit 93e87e0

Browse files
author
Mariusz
committed
CommServer.DA.Server - create installation package - adding ConfigurationEditor to CommServer>Server installation package
- covered license file for testing purpose - made some declaration publicly visible - fixed runtime error - foreach source is modified inside the loop. - increased version number. - added nuget package ProtocolHub.Communication.nuspec - Issue #: 4862
1 parent 72d5ab3 commit 93e87e0

17 files changed

Lines changed: 189 additions & 66 deletions

‎ProtocolHub.CommunicationUnitTests/App.config‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
55
<section name="CAS.CommServer.ProtocolHub.CommunicationUnitTests.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
66
</sectionGroup>
77
</configSections>
@@ -129,4 +129,12 @@
129129
</setting>
130130
</CAS.CommServer.ProtocolHub.CommunicationUnitTests.Properties.Settings>
131131
</userSettings>
132+
<runtime>
133+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
134+
<dependentAssembly>
135+
<assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
136+
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
137+
</dependentAssembly>
138+
</assemblyBinding>
139+
</runtime>
132140
</configuration>

‎ProtocolHub.CommunicationUnitTests/ProtocolHub.CommunicationUnitTests.csproj‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,48 +55,48 @@
5555
<HintPath>..\packages\CAS.CommServer.DAServerConfiguration.5.02.02\lib\net451\CAS.CommServer.DAServerConfiguration.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
58-
<Reference Include="CAS.CommServer.DataProvider.MODBUSCore, Version=3.90.3.33834, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.03-Alpha\lib\net461\CAS.CommServer.DataProvider.MODBUSCore.dll</HintPath>
58+
<Reference Include="CAS.CommServer.DataProvider.MODBUSCore, Version=3.90.4.28283, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommServer.DataProvider.MODBUSCore.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
6262
<Reference Include="CAS.CommServer.OPCClassicSDK.Core, Version=2.1.1062.39746, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
6363
<HintPath>..\packages\CAS.CommServer.OPCClassic.SDK.Core.2.01.1062\lib\net451\CAS.CommServer.OPCClassicSDK.Core.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
66-
<Reference Include="CAS.CommSvrPlugin_DemoSimulator, Version=3.90.3.33834, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.03-Alpha\lib\net461\CAS.CommSvrPlugin_DemoSimulator.dll</HintPath>
66+
<Reference Include="CAS.CommSvrPlugin_DemoSimulator, Version=3.90.4.28284, Culture=neutral, processorArchitecture=MSIL">
67+
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommSvrPlugin_DemoSimulator.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
70-
<Reference Include="CAS.CommSvrPlugin_EC2-3SYM2, Version=3.90.3.33834, Culture=neutral, processorArchitecture=MSIL">
71-
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.03-Alpha\lib\net461\CAS.CommSvrPlugin_EC2-3SYM2.dll</HintPath>
70+
<Reference Include="CAS.CommSvrPlugin_EC2-3SYM2, Version=3.90.4.28284, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommSvrPlugin_EC2-3SYM2.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
74-
<Reference Include="CAS.CommSvrPlugin_ExcelDDE, Version=3.90.3.33834, Culture=neutral, processorArchitecture=MSIL">
75-
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.03-Alpha\lib\net461\CAS.CommSvrPlugin_ExcelDDE.dll</HintPath>
74+
<Reference Include="CAS.CommSvrPlugin_ExcelDDE, Version=3.90.4.28283, Culture=neutral, processorArchitecture=MSIL">
75+
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommSvrPlugin_ExcelDDE.dll</HintPath>
7676
<Private>True</Private>
7777
</Reference>
78-
<Reference Include="CAS.CommSvrPlugin_MBUS, Version=3.90.3.33834, Culture=neutral, processorArchitecture=MSIL">
79-
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.03-Alpha\lib\net461\CAS.CommSvrPlugin_MBUS.dll</HintPath>
78+
<Reference Include="CAS.CommSvrPlugin_MBUS, Version=3.90.4.28284, Culture=neutral, processorArchitecture=MSIL">
79+
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommSvrPlugin_MBUS.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
82-
<Reference Include="CAS.CommSvrPlugin_MODBUSNet, Version=3.90.3.33834, Culture=neutral, processorArchitecture=MSIL">
83-
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.03-Alpha\lib\net461\CAS.CommSvrPlugin_MODBUSNet.dll</HintPath>
82+
<Reference Include="CAS.CommSvrPlugin_MODBUSNet, Version=3.90.4.28284, Culture=neutral, processorArchitecture=MSIL">
83+
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommSvrPlugin_MODBUSNet.dll</HintPath>
8484
<Private>True</Private>
8585
</Reference>
86-
<Reference Include="CAS.CommSvrPlugin_NULLbus, Version=3.90.3.33834, Culture=neutral, processorArchitecture=MSIL">
87-
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.03-Alpha\lib\net461\CAS.CommSvrPlugin_NULLbus.dll</HintPath>
86+
<Reference Include="CAS.CommSvrPlugin_NULLbus, Version=3.90.4.28284, Culture=neutral, processorArchitecture=MSIL">
87+
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommSvrPlugin_NULLbus.dll</HintPath>
8888
<Private>True</Private>
8989
</Reference>
90-
<Reference Include="CAS.CommSvrPlugin_SBUSNET, Version=3.90.3.33834, Culture=neutral, processorArchitecture=MSIL">
91-
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.03-Alpha\lib\net461\CAS.CommSvrPlugin_SBUSNET.dll</HintPath>
90+
<Reference Include="CAS.CommSvrPlugin_SBUSNET, Version=3.90.4.28284, Culture=neutral, processorArchitecture=MSIL">
91+
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommSvrPlugin_SBUSNET.dll</HintPath>
9292
<Private>True</Private>
9393
</Reference>
94-
<Reference Include="CAS.CommSvrPlugin_SBUSRS, Version=3.90.3.33834, Culture=neutral, processorArchitecture=MSIL">
95-
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.03-Alpha\lib\net461\CAS.CommSvrPlugin_SBUSRS.dll</HintPath>
94+
<Reference Include="CAS.CommSvrPlugin_SBUSRS, Version=3.90.4.28285, Culture=neutral, processorArchitecture=MSIL">
95+
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommSvrPlugin_SBUSRS.dll</HintPath>
9696
<Private>True</Private>
9797
</Reference>
98-
<Reference Include="CAS.CommSvrPlugin_TextReader, Version=3.90.3.33834, Culture=neutral, processorArchitecture=MSIL">
99-
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.03-Alpha\lib\net461\CAS.CommSvrPlugin_TextReader.dll</HintPath>
98+
<Reference Include="CAS.CommSvrPlugin_TextReader, Version=3.90.4.28285, Culture=neutral, processorArchitecture=MSIL">
99+
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommSvrPlugin_TextReader.dll</HintPath>
100100
<Private>True</Private>
101101
</Reference>
102102
<Reference Include="CAS.RealTime, Version=5.0.6.23644, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
@@ -199,7 +199,9 @@
199199
<None Include="CAS.License.lic">
200200
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
201201
</None>
202-
<None Include="packages.config" />
202+
<None Include="packages.config">
203+
<SubType>Designer</SubType>
204+
</None>
203205
<None Include="Properties\Settings.settings">
204206
<Generator>SettingsSingleFileGenerator</Generator>
205207
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

‎ProtocolHub.CommunicationUnitTests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="CAS.CodeProtect" version="6.1.3" targetFramework="net461" />
44
<package id="CAS.CommServer.CommonBus" version="5.01.07" targetFramework="net461" />
55
<package id="CAS.CommServer.DAServerConfiguration" version="5.02.02" targetFramework="net461" />
6-
<package id="CAS.CommServer.DataProvider.Package" version="3.90.03-Alpha" targetFramework="net461" developmentDependency="true" />
6+
<package id="CAS.CommServer.DataProvider.Package" version="3.90.04" targetFramework="net461" developmentDependency="true" />
77
<package id="CAS.CommServer.OPCClassic.SDK.Core" version="2.01.1062" targetFramework="net461" />
88
<package id="CAS.RealTime" version="5.0.6" targetFramework="net461" />
99
<package id="System.Reactive" version="3.1.1" targetFramework="net461" />

‎ProtocolHub.ConfiguartionEditor/CAS.License.lic‎

24.3 KB
Binary file not shown.

‎ProtocolHub.ConfiguartionEditor/HMI/ConfigTreeView.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ProtocolHub.ConfiguartionEditor/HMI/ConfigTreeView.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ namespace CAS.CommServer.ProtocolHub.ConfigurationEditor.HMI
5454
/// </summary>
5555
[LicenseProvider(typeof(CodeProtectLP))]
5656
[GuidAttribute("577750FC-CF14-406f-B367-41CE15563265")]
57-
internal partial class ConfigTreeView : Form
57+
public partial class ConfigTreeView : Form
5858
{
5959

6060
#region private
@@ -96,7 +96,7 @@ private void UpdateTagNumberInfo()
9696
#endregion
9797

9898
#region Constructor
99-
internal ConfigTreeView(CAS.NetworkConfigLib.ComunicationNet configDataBase, ConfigIOHandler fileread, ConfigIOHandler filesave, ConfigIOHandler fileclear, bool AdvanceMenu)
99+
public ConfigTreeView(CAS.NetworkConfigLib.ComunicationNet configDataBase, ConfigIOHandler fileread, ConfigIOHandler filesave, ConfigIOHandler fileclear, bool AdvanceMenu)
100100
{
101101
License lic = null;
102102
LicenseManager.IsValid(this.GetType(), this, out lic);

‎ProtocolHub.ConfiguartionEditor/HMI/ConfigurationManagement.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
namespace CAS.CommServer.ProtocolHub.ConfigurationEditor.HMI
3434
{
3535

36-
internal delegate void ConfigIOHandler(Form form);
37-
internal static class ConfigurationManagement
36+
public delegate void ConfigIOHandler(Form form);
37+
public static class ConfigurationManagement
3838
{
3939

4040
#region Properties
@@ -56,17 +56,17 @@ static ConfigurationManagement()
5656
#endregion
5757

5858
#region public
59-
internal static ComunicationNet ProtocolHubConfiguration { get; private set; }
60-
internal static void ClearConfig(Form form)
59+
public static ComunicationNet ProtocolHubConfiguration { get; private set; }
60+
public static void ClearConfig(Form form)
6161
{
62-
if (MessageBox.Show(form, "Clear all datagrids???", "Clear", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
62+
if (MessageBox.Show(form, "Clear all data grids???", "Clear", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
6363
ClearProtocolHubConfiguration(form);
6464
}
6565
internal static void SaveDemoProc(Form form)
6666
{
6767
MessageBox.Show(Resources.tx_DemoWriteErr, Resources.tx_licenseCap, MessageBoxButtons.OK, MessageBoxIcon.Hand);
6868
}
69-
internal static void SaveProc(Form form)
69+
public static void SaveProc(Form form)
7070
{
7171
SaveFileDialog saveXMLFileDialog = new SaveFileDialog();
7272
saveXMLFileDialog.OverwritePrompt = true;
@@ -103,7 +103,7 @@ internal static void SaveProc(Form form)
103103
break;
104104
}
105105
}
106-
internal static void ReadConfiguration(Form form)
106+
public static void ReadConfiguration(Form form)
107107
{
108108
OpenFileDialog openFileDialogXMLFile = new OpenFileDialog();
109109
if ((ProtocolHubConfiguration.Channels.GetChanges() != null)

‎ProtocolHub.ConfiguartionEditor/HMI/TreeBuilder.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
using CAS.CommServer.ProtocolHub.ConfigurationEditor.Properties;
1717
using CAS.NetworkConfigLib;
1818
using System;
19+
using System.Collections.Generic;
1920
using System.Windows.Forms;
21+
using System.Linq;
2022

2123
namespace CAS.CommServer.ProtocolHub.ConfigurationEditor.HMI
2224
{
@@ -108,7 +110,9 @@ private static void CreateTreeFromChannels(ComunicationNet configDataBase, TreeV
108110
/// <param name="parentNode"></param>
109111
private static void CreateTreeFromStationAndChannels(ComunicationNet configDataBase, TreeView parentNode)
110112
{
111-
foreach (TreeNode cn in parentNode.Nodes)
113+
List<TreeNode> _nodes = new List<TreeNode>();
114+
_nodes.AddRange(parentNode.Nodes.Cast<TreeNode>());
115+
foreach (TreeNode cn in _nodes)
112116
((IAction)cn.Tag).Dispose();
113117
parentNode.Nodes.Add(Wrappers.CA_TopWrapper.CreateNode(configDataBase));
114118
parentNode.Nodes.Add(Wrappers.SA_TopWrapper.CreateNode(configDataBase));

‎ProtocolHub.ConfiguartionEditor/MainClass.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class MainClass
3131
[STAThread]
3232
static void Main()
3333
{
34-
AssemblyTraceEvent.Tracer.TraceMessage(TraceEventType.Verbose, 32, "Starting application CAS.CommServer.ProtocolHub.ConfiguartionEditor");
34+
AssemblyTraceEvent.Tracer.TraceMessage(TraceEventType.Verbose, 32, "Starting application CAS.CommServer.ProtocolHub.ConfigurationEditor");
3535
string m_CommandLine = Environment.CommandLine;
3636
if (m_CommandLine.ToLower().Contains("installic"))
3737
try

‎ProtocolHub.ConfiguartionEditor/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
[assembly: AssemblyCulture("")]
2828
[assembly: Guid("F919845E-627B-4b17-875A-09471880C266")]
2929
[assembly: ComVisible(false)]
30-
[assembly: AssemblyVersion("4.00.24.*")]
31-
[assembly: AssemblyFileVersion("4.00.24")]
30+
[assembly: AssemblyVersion("4.10.03.*")]
31+
[assembly: AssemblyFileVersion("4.10.03")]
3232
[assembly: CAS.Lib.CodeProtect.AssemblyKey( "2D0C30B3-ED45-4292-8CB3-ADB0E739E03E" )]
3333
[assembly: CAS.Lib.CodeProtect.AssemblyHelper
3434
(

0 commit comments

Comments
 (0)