Skip to content

Commit 4c5b3d2

Browse files
author
Mariusz
committed
CommServer.DA.Server - create installation package - working on decoupling ProtocolHub.Communication and ProtocolHub.Monitor dependence on ProtocolHub.MonitorInterface
- release new nuget packages for ProtocolHub.Communication, ProtocolHub.Monitor, ProtocolHub.MonitorInterface. - fixed problem with exception thrown after clicking cancel on the entry dialog box. Issue #: 4862
1 parent 9fac781 commit 4c5b3d2

21 files changed

Lines changed: 278 additions & 234 deletions

‎ProtocolHub.Communication/ProtocolHub.Communication.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<IsWebBootstrapper>true</IsWebBootstrapper>
4343
<UseApplicationTrust>false</UseApplicationTrust>
4444
<BootstrapperEnabled>true</BootstrapperEnabled>
45-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
45+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
4646
<TargetFrameworkProfile />
4747
</PropertyGroup>
4848
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -115,6 +115,10 @@
115115
<HintPath>..\packages\CAS.CommServer.ProtocolHub.ItemDescriber.5.01.06\lib\net451\CAS.CommServer.ProtocolHub.ItemDescriber.dll</HintPath>
116116
<Private>True</Private>
117117
</Reference>
118+
<Reference Include="CAS.CommServer.ProtocolHub.MonitorInterface, Version=4.1.0.31758, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
119+
<HintPath>..\packages\CAS.CommServer.ProtocolHub.MonitorInterface.4.01.00\lib\net461\CAS.CommServer.ProtocolHub.MonitorInterface.dll</HintPath>
120+
<Private>True</Private>
121+
</Reference>
118122
<Reference Include="CAS.RealTime, Version=5.0.6.23644, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
119123
<HintPath>..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.dll</HintPath>
120124
<Private>True</Private>
@@ -149,10 +153,6 @@
149153
<Reference Include="System.Xml">
150154
<Name>System.XML</Name>
151155
</Reference>
152-
<ProjectReference Include="..\ProtocolHub.MonitorInterface\ProtocolHub.MonitorInterface.csproj">
153-
<Project>{CE7BA276-5ACF-44FE-B24A-F91F6A0B0436}</Project>
154-
<Name>ProtocolHub.MonitorInterface</Name>
155-
</ProjectReference>
156156
</ItemGroup>
157157
<ItemGroup>
158158
<None Include="cas.snk" />

‎ProtocolHub.Communication/ProtocolHub.Communication.nuspec‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@
2929
<dependency id="CAS.CommServer.OPCClassic.SDK.Core" version="2.01.1062" />
3030
<dependency id="CAS.CommServer.ProtocolHub.ItemDescriber" version="5.01.06" />
3131
<dependency id="CAS.RealTime" version="5.0.6" />
32+
<dependency id="CAS.CommServer.ProtocolHub.MonitorInterface" version="4.01.00" />
3233
</dependencies>
3334
</metadata>
3435
<files>
35-
<file src="bin\Release\CAS.CommServer.ProtocolHub.Communication.dll" target="lib\net451\CAS.CommServer.ProtocolHub.Communication.dll" />
36-
<file src="bin\Release\CAS.CommServer.ProtocolHub.Communication.xml" target="lib\net451\CAS.CommServer.ProtocolHub.Communication.xml" />
37-
<file src="bin\Release\CAS.CommServer.ProtocolHub.MonitorInterface.dll" target="lib\net451\CAS.CommServer.ProtocolHub.MonitorInterface.dll" />
38-
<file src="bin\Release\CAS.CommServer.ProtocolHub.MonitorInterface.xml" target="lib\net451\CAS.CommServer.ProtocolHub.MonitorInterface.xml" />
36+
<file src="bin\Release\CAS.CommServer.ProtocolHub.Communication.dll" target="lib\net461\CAS.CommServer.ProtocolHub.Communication.dll" />
37+
<file src="bin\Release\CAS.CommServer.ProtocolHub.Communication.xml" target="lib\net461\CAS.CommServer.ProtocolHub.Communication.xml" />
3938
</files>
4039
</package>
4140

‎ProtocolHub.Communication/ProtocolHub.Communication.tt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@
3131
<dependency id="CAS.CommServer.OPCClassic.SDK.Core" version="2.01.1062" />
3232
<dependency id="CAS.CommServer.ProtocolHub.ItemDescriber" version="5.01.06" />
3333
<dependency id="CAS.RealTime" version="5.0.6" />
34+
<dependency id="CAS.CommServer.ProtocolHub.MonitorInterface" version="4.01.00" />
3435
</dependencies>
3536
</metadata>
3637
<files>
37-
<file src="bin\Release\CAS.CommServer.ProtocolHub.Communication.dll" target="lib\net451\CAS.CommServer.ProtocolHub.Communication.dll" />
38-
<file src="bin\Release\CAS.CommServer.ProtocolHub.Communication.xml" target="lib\net451\CAS.CommServer.ProtocolHub.Communication.xml" />
39-
<file src="bin\Release\CAS.CommServer.ProtocolHub.MonitorInterface.dll" target="lib\net451\CAS.CommServer.ProtocolHub.MonitorInterface.dll" />
40-
<file src="bin\Release\CAS.CommServer.ProtocolHub.MonitorInterface.xml" target="lib\net451\CAS.CommServer.ProtocolHub.MonitorInterface.xml" />
38+
<file src="bin\Release\CAS.CommServer.ProtocolHub.Communication.dll" target="lib\net461\CAS.CommServer.ProtocolHub.Communication.dll" />
39+
<file src="bin\Release\CAS.CommServer.ProtocolHub.Communication.xml" target="lib\net461\CAS.CommServer.ProtocolHub.Communication.xml" />
4140
</files>
4241
</package>
4342

‎ProtocolHub.Communication/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
<package id="CAS.CommServer.DeviceSimulator" version="5.01.06" targetFramework="net451" />
77
<package id="CAS.CommServer.OPCClassic.SDK.Core" version="2.01.1062" targetFramework="net451" />
88
<package id="CAS.CommServer.ProtocolHub.ItemDescriber" version="5.01.06" targetFramework="net451" />
9+
<package id="CAS.CommServer.ProtocolHub.MonitorInterface" version="4.01.00" targetFramework="net461" />
910
<package id="CAS.RealTime" version="5.0.6" targetFramework="net451" />
1011
</packages>

‎ProtocolHub.CommunicationUnitTests/ProtocolHub.CommunicationUnitTests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
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.CommServer.ProtocolHub.MonitorInterface, Version=4.1.0.31758, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
67+
<HintPath>..\packages\CAS.CommServer.ProtocolHub.MonitorInterface.4.01.00\lib\net461\CAS.CommServer.ProtocolHub.MonitorInterface.dll</HintPath>
68+
<Private>True</Private>
69+
</Reference>
6670
<Reference Include="CAS.CommSvrPlugin_DemoSimulator, Version=3.90.4.28284, Culture=neutral, processorArchitecture=MSIL">
6771
<HintPath>..\packages\CAS.CommServer.DataProvider.Package.3.90.04\lib\net461\CAS.CommSvrPlugin_DemoSimulator.dll</HintPath>
6872
<Private>True</Private>
@@ -184,10 +188,6 @@
184188
<Compile Include="TestSegmentStateMachine.cs" />
185189
</ItemGroup>
186190
<ItemGroup>
187-
<ProjectReference Include="..\ProtocolHub.MonitorInterface\ProtocolHub.MonitorInterface.csproj">
188-
<Project>{CE7BA276-5ACF-44FE-B24A-F91F6A0B0436}</Project>
189-
<Name>ProtocolHub.MonitorInterface</Name>
190-
</ProjectReference>
191191
<ProjectReference Include="..\ProtocolHub.Communication\ProtocolHub.Communication.csproj">
192192
<Project>{E1351D09-7241-44C3-A292-8D46E322A61D}</Project>
193193
<Name>ProtocolHub.Communication</Name>

‎ProtocolHub.CommunicationUnitTests/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<package id="CAS.CommServer.DAServerConfiguration" version="5.02.02" targetFramework="net461" />
66
<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" />
8+
<package id="CAS.CommServer.ProtocolHub.MonitorInterface" version="4.01.00" targetFramework="net461" />
89
<package id="CAS.RealTime" version="5.0.6" targetFramework="net461" />
910
<package id="System.Reactive" version="3.1.1" targetFramework="net461" />
1011
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net461" />

‎ProtocolHub.ConfiguartionEditor/Properties/AssemblyInfo.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//_______________________________________________________________
2-
// Title : Assembly info for: CAS.CommServer.ProtocolHub.ConfiguartionEditor
2+
// Title : Assembly info for: CAS.CommServer.ProtocolHub.ConfigurationEditor
33
// System : Microsoft VisualStudio 2015 / C#
4-
// $LastChangedDate: $
5-
// $Rev: $
6-
// $LastChangedBy: $
7-
// $URL: $
8-
// $Id: $
4+
// $LastChangedDate$
5+
// $Rev$
6+
// $LastChangedBy$
7+
// $URL$
8+
// $Id$
99
//
1010
// Copyright (c) 2017 CAS LODZ POLAND
1111
// +48 (42) 686 25 47
@@ -17,7 +17,7 @@
1717
using System.Resources;
1818
using System.Runtime.InteropServices;
1919

20-
[assembly: AssemblyTitle("CAS.CommServer.ProtocolHub.ConfiguartionEditor")]
20+
[assembly: AssemblyTitle("CAS.CommServer.ProtocolHub.ConfigurationEditor")]
2121
[assembly: AssemblyDescription("CommServer ProtocolHub Configuration Editor Tool")]
2222
[assembly: AssemblyConfiguration("")]
2323
[assembly: AssemblyCompany("CAS")]

‎ProtocolHub.ConfiguartionEditor/Properties/AssemblyInfo.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ using System.Runtime.InteropServices;
4444

4545
<#@ include file = "..\..\..\PR39-CommonResources\T4Definitions\CAS.OPC.t4" #>
4646
<#+
47-
string m_AssemblyTitle = "CAS.CommServer.ProtocolHub.ConfiguartionEditor";
47+
string m_AssemblyTitle = "CAS.CommServer.ProtocolHub.ConfigurationEditor";
4848
#>

‎ProtocolHub.GraphGUI/ProtocolHub.GraphGUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<UpgradeBackupLocation>
2424
</UpgradeBackupLocation>
2525
<OldToolsVersion>3.5</OldToolsVersion>
26-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
26+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
2727
<TargetFrameworkProfile />
2828
<PublishUrl>publish\</PublishUrl>
2929
<Install>true</Install>

‎ProtocolHub.GraphGUI/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
</setting>
1919
</SchemaGenerator.Properties.Settings>
2020
</userSettings>
21-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>
21+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

0 commit comments

Comments
 (0)