Skip to content

Commit

Permalink
chore: cleanup and release
Browse files Browse the repository at this point in the history
The appveyor script needed the chocolatey package for opcclassiccorecomponents and grayboxsimulator to be updated.
Updated assembly versions for tag.
Last merge didn't agree with Style Cop.
Got rid of unused Moq library
  • Loading branch information
jmbeach committed Oct 17, 2016
1 parent 50f79ff commit 7220df8
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 36 deletions.
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ notifications:

test_script:
- ps: >-
choco install opcclassiccorecomponents -version 106.0.201 -y
choco install opcclassiccorecomponents -version 106.0.201.0 -y
choco install grayboxsimulator -version 1.8.0 -y
choco install grayboxsimulator -version 1.8.0.0 -y
packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user "-target:"".\packages\NUnit.ConsoleRunner.3.4.1\tools\nunit3-console.exe""" "-targetargs:""tests\bin\$env:CONFIGURATION\tests.dll"" --x86" -output:opencoverCoverage.xml
Expand Down
6 changes: 3 additions & 3 deletions h-opc-cli/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("0.7.0")]
[assembly: AssemblyVersion("0.7.0")]
[assembly: AssemblyFileVersion("0.7.0")]
// [assembly: AssemblyVersion("0.8.1")]
[assembly: AssemblyVersion("0.8.1")]
[assembly: AssemblyFileVersion("0.8.1")]
6 changes: 3 additions & 3 deletions h-opc/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("0.7.0")]
[assembly: AssemblyVersion("0.7.0")]
[assembly: AssemblyFileVersion("0.7.0")]
// [assembly: AssemblyVersion("0.8.1")]
[assembly: AssemblyVersion("0.8.1")]
[assembly: AssemblyFileVersion("0.8.1")]
1 change: 0 additions & 1 deletion h-opc/Ua/UaClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,6 @@ private Session InitializeSession(Uri url)
else
throw new OpcException(string.Format("Failed to validate certificate with error code {0}: {1}", eventArgs.Error.Code, eventArgs.Error.AdditionalInfo), eventArgs.Error.StatusCode);
};

// Build the application configuration
var appInstance = new ApplicationInstance
{
Expand Down
22 changes: 11 additions & 11 deletions h-opc/Ua/UaClientOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,23 @@ public class UaClientOptions

/// <summary>
/// The maximum number of notifications per publish request.
/// The client’s responsibility is to send PublishRequests to the server,
/// in order to enable the server to send PublishResponses back.
/// The PublishResponses are used to deliver the notifications: but if there
/// The client’s responsibility is to send PublishRequests to the server,
/// in order to enable the server to send PublishResponses back.
/// The PublishResponses are used to deliver the notifications: but if there
/// are no PublishRequests, the server cannot send a notification to the client.
/// The server will also verify that the client is alive by checking that
/// new PublishRequests are received – LifeTimeCount defines the number of
/// PublishingIntervals to wait for a new PublishRequest, before realizing
/// that the client is no longer active.The Subscription is then removed from
/// The server will also verify that the client is alive by checking that
/// new PublishRequests are received – LifeTimeCount defines the number of
/// PublishingIntervals to wait for a new PublishRequest, before realizing
/// that the client is no longer active.The Subscription is then removed from
/// the server.
/// </summary>
public uint SubscriptionLifetimeCount { get; set; }

/// <summary>
/// If there is no data to send after the next PublishingInterval,
/// the server will skip it. But KeepAlive defines how many intervals may be skipped,
/// before an empty notification is sent anyway: to give the client a hint that
/// the subscription is still alive in the server and that there just has not been
/// If there is no data to send after the next PublishingInterval,
/// the server will skip it. But KeepAlive defines how many intervals may be skipped,
/// before an empty notification is sent anyway: to give the client a hint that
/// the subscription is still alive in the server and that there just has not been
/// any data arriving to the client.
/// </summary>
public uint SubscriptionKeepAliveCount { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "h-opc",
"version": "0.7.0",
"version": "0.8.1",
"devDependencies": {
"grunt": "^0.4.5",
"grunt-concurrent": "^1.0.0",
Expand Down
1 change: 0 additions & 1 deletion tests/DaTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Hylasoft.Opc.Da;
using NUnit.Framework;
using OpcDa = Opc.Da;
using Moq;
using System.Threading.Tasks;

namespace Hylasoft.Opc.Tests
Expand Down
6 changes: 3 additions & 3 deletions tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("0.7.0")]
[assembly: AssemblyVersion("0.7.0")]
[assembly: AssemblyFileVersion("0.7.0")]
// [assembly: AssemblyVersion("0.8.1")]
[assembly: AssemblyVersion("0.8.1")]
[assembly: AssemblyFileVersion("0.8.1")]
4 changes: 1 addition & 3 deletions tests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
<packages>
<package id="BuildTools.StyleCop" version="4.7.49.0" targetFramework="net45" />
<package id="BuildTools.StyleCopPlus" version="4.7.49.4" targetFramework="net45" />
<package id="Castle.Core" version="3.3.3" targetFramework="net45" />
<package id="coveralls.net" version="0.6.0" targetFramework="net45" />
<package id="Hylasoft.Behavior" version="0.1.3" targetFramework="net45" />
<package id="Moq" version="4.5.16" targetFramework="net45" />
<package id="NUnit" version="3.4.1" targetFramework="net45" />
<package id="NUnit.Runners" version="3.4.1" targetFramework="net45" />
<package id="NUnit.ConsoleRunner" version="3.4.1" targetFramework="net45" />
<package id="NUnit.Runners" version="3.4.1" targetFramework="net45" />
<package id="OpenCover" version="4.6.519" targetFramework="net45" />
<package id="ReportGenerator" version="2.4.5.0" targetFramework="net45" />
</packages>
9 changes: 1 addition & 8 deletions tests/tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<StyleCopOverrideSettingsFile>Settings.StyleCop</StyleCopOverrideSettingsFile>
<BuildToolsStyleCopVersion>4.7.44.0</BuildToolsStyleCopVersion>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>cf39ef6a</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -46,17 +47,9 @@
<ProjectConfigFileName>App.config</ProjectConfigFileName>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="h-behavior">
<HintPath>..\packages\Hylasoft.Behavior.0.1.3\lib\h-behavior.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.5.16.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.5.16\lib\net45\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
Expand Down

0 comments on commit 7220df8

Please sign in to comment.