Merge branch 'ConnectPro_v1.3' into ConnectPro_v1.4

# Conflicts:
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
This commit is contained in:
Chris Cameron
2020-02-18 13:00:27 -05:00
3 changed files with 6 additions and 1 deletions

View File

@@ -128,6 +128,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Better VC-4 support for IcdConsole
- JSON refactoring for simpler deserialization
## [8.8.1] - 2020-02-18
### Changed
- IcdTimer - fixed issue that prevented OnElapsed event from firing when Length is less than (or close to) Heartbeat Interval
## [8.8.0] - 2020-01-23
### Added
- Added an overload to PriorityQueue for determing the de-duplication behaviour

View File

@@ -3,5 +3,5 @@ using System.Reflection;
[assembly: AssemblyTitle("ICD.Common.Utils")]
[assembly: AssemblyCompany("ICD Systems")]
[assembly: AssemblyProduct("ICD.Common.Utils")]
[assembly: AssemblyCopyright("Copyright © ICD Systems 2019")]
[assembly: AssemblyCopyright("Copyright © ICD Systems 2020")]
[assembly: AssemblyVersion("10.0.0.0")]

View File

@@ -118,6 +118,7 @@ namespace ICD.Common.Utils.Timers
Length = length;
m_Stopwatch.Reset();
m_LastHeartbeatMilliseconds = 0;
m_Stopwatch.Start();
RaiseOnIsRunningChanged();