Skip to content

Commit 25d8d77

Browse files
committed
CommServer.DA.Server - create installation package - working on ProtocolHub.Monitor
- prepared to be used by the server - released new nuget 4.02.02 - generated new version of the CreateTag.cmd Issue #: 4862
1 parent ce263b0 commit 25d8d77

File tree

10 files changed

+36
-17
lines changed

10 files changed

+36
-17
lines changed

ProtocolHub.ConfiguartionEditor/ProtocolHub.ConfiguartionEditor.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@
378378
<AutoGen>True</AutoGen>
379379
<DesignTime>True</DesignTime>
380380
<DependentUpon>ProtocolHub.ConfiguartionEditor.tt</DependentUpon>
381+
<SubType>Designer</SubType>
381382
</None>
382383
</ItemGroup>
383384
<ItemGroup>

ProtocolHub.Monitor/Program.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
1+
//_______________________________________________________________
2+
// Title : CommServerConsole
3+
// System : Microsoft VisualStudio 2015 / C#
4+
// $LastChangedDate$
5+
// $Rev$
6+
// $LastChangedBy$
7+
// $URL$
8+
// $Id$
9+
//
10+
// Copyright (C) 2017, CAS LODZ POLAND.
11+
// TEL: +48 608 61 98 99
12+
// mailto://techsupp@cas.eu
13+
// http://www.cas.eu
14+
//_______________________________________________________________
15+
116
using System;
2-
using System.Text;
317
using System.Windows.Forms;
18+
419
namespace CAS.CommServerConsole
520
{
621
class Program

ProtocolHub.Monitor/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
[assembly: AssemblyCulture("")]
2828
[assembly: ComVisible(false)]
2929
[assembly: Guid( "f185cedf-d0b6-4762-9d27-385764dff679" )]
30-
[assembly: AssemblyVersion("4.02.00.*")]
31-
[assembly: AssemblyFileVersion("4.02.00")]
30+
[assembly: AssemblyVersion("4.02.02.*")]
31+
[assembly: AssemblyFileVersion("4.02.02")]
3232

ProtocolHub.Monitor/Properties/AssemblyInfo.tt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ using System.Runtime.InteropServices;
2929
[assembly: AssemblyCulture("")]
3030
[assembly: ComVisible(false)]
3131
[assembly: Guid( "f185cedf-d0b6-4762-9d27-385764dff679" )]
32-
[assembly: AssemblyVersion("<#= CASCommServerProtocolHubVersion #>.*")]
33-
[assembly: AssemblyFileVersion("<#= CASCommServerProtocolHubVersion #>")]
32+
[assembly: AssemblyVersion("<#= CASCommServerProtocolHubMonitorVersion #>.*")]
33+
[assembly: AssemblyFileVersion("<#= CASCommServerProtocolHubMonitorVersion #>")]
3434

3535
<#@ include file = "..\..\..\PR39-CommonResources\T4Definitions\CAS.OPC.t4" #>
3636
<#+

ProtocolHub.Monitor/ProtocolHub.Monitor.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<AssemblyKeyContainerName>
1212
</AssemblyKeyContainerName>
1313
<AssemblyName>CAS.CommServer.ProtocolHub.Monitor</AssemblyName>
14-
<AssemblyOriginatorKeyFile>
15-
</AssemblyOriginatorKeyFile>
14+
<AssemblyOriginatorKeyFile>cas.snk</AssemblyOriginatorKeyFile>
1615
<DefaultClientScript>JScript</DefaultClientScript>
1716
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
1817
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -94,6 +93,9 @@
9493
<ErrorReport>prompt</ErrorReport>
9594
<Prefer32Bit>false</Prefer32Bit>
9695
</PropertyGroup>
96+
<PropertyGroup>
97+
<SignAssembly>true</SignAssembly>
98+
</PropertyGroup>
9799
<ItemGroup>
98100
<Reference Include="CAS.CodeProtect, Version=6.1.3.22636, Culture=neutral, PublicKeyToken=8832ff1a67ea61a3, processorArchitecture=MSIL">
99101
<HintPath>..\packages\CAS.CodeProtect.6.1.3\lib\net451\CAS.CodeProtect.dll</HintPath>
@@ -204,6 +206,7 @@
204206
<DependentUpon>SplashScreen.cs</DependentUpon>
205207
<SubType>Designer</SubType>
206208
</EmbeddedResource>
209+
<None Include="cas.snk" />
207210
<None Include="ProtocolHub.Monitor.nuspec">
208211
<AutoGen>True</AutoGen>
209212
<DesignTime>True</DesignTime>

ProtocolHub.Monitor/ProtocolHub.Monitor.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>CAS.CommServer.ProtocolHub.Monitor</id>
5-
<version>4.02.00</version>
5+
<version>4.02.02</version>
66
<title>CommServer ProtocolHub Monitor</title>
77
<authors>CAS</authors>
88
<owners>commsvr.com</owners>

ProtocolHub.Monitor/SRC/Main.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ private void InitInterfacePage()
323323
}
324324
#endregion
325325
#region Creator
326-
internal MainForm()
326+
public MainForm()
327327
{
328328
InitializeComponent();
329329
if (!DisplayQuestionAboutConfiguration())

ProtocolHub.Monitor/cas.snk

596 Bytes
Binary file not shown.

ProtocolHub.Scripts/CreateTag.cmd

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

2-
rem// $LastChangedDate: $
3-
rem// $Rev: $
4-
rem// $LastChangedBy: $
5-
rem// $URL: $
6-
rem// $Id: $
2+
rem// $LastChangedDate$
3+
rem// $Rev$
4+
rem// $LastChangedBy$
5+
rem// $URL$
6+
rem// $Id$
77

88

9-
svn mkdir svn://svnserver.hq.cas.com.pl/VS/tags/CommServer.ProtocolHub.rel_4_02_00 -m "created new svn://svnserver.hq.cas.com.pl/VS/tags/CommServer.ProtocolHub.rel_4_02_00"
10-
svn copy svn://svnserver.hq.cas.com.pl/VS/trunk/CommServer.ProtocolHub/ svn://svnserver.hq.cas.com.pl/VS/tags/CommServer.ProtocolHub.rel_4_02_00 -m "created copy svn://svnserver.hq.cas.com.pl/VS/tags/CommServer.ProtocolHub.rel_4_02_00"
9+
svn mkdir svn://svnserver.hq.cas.com.pl/VS/tags/CommServer.ProtocolHub.rel_4_10_04 -m "created new svn://svnserver.hq.cas.com.pl/VS/tags/CommServer.ProtocolHub.rel_4_10_04"
10+
svn copy svn://svnserver.hq.cas.com.pl/VS/trunk/CommServer.ProtocolHub/ svn://svnserver.hq.cas.com.pl/VS/tags/CommServer.ProtocolHub.rel_4_10_04 -m "created copy svn://svnserver.hq.cas.com.pl/VS/tags/CommServer.ProtocolHub.rel_4_10_04"
1111

1212
pause ....
1313

ProtocolHub.Scripts/CreateTag.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ rem// $URL: $
88
rem// $Id: $
99

1010
<#
11-
string _rel = CASCommServerProtocolHubVersion.Replace(".", "_"); // _version must be replaced by the correct version variable depending on the project.
11+
string _rel = CASCommServerProtocolHubTagVersion.Replace(".", "_"); // _version must be replaced by the correct version variable depending on the project.
1212
string _repositoryUrl = @"svn://svnserver.hq.cas.com.pl/VS/";
1313
string _solutionPath = @"/CommServer.ProtocolHub";
1414
string _trunkPath = $@"{_repositoryUrl}trunk{_solutionPath}/";

0 commit comments

Comments
 (0)