merge master to release-next. output the period used when running the update check

This commit is contained in:
dovholuknf
2020-11-22 11:36:33 -05:00
4 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -22,7 +22,7 @@
<ROW Property="CTRLS" Value="2"/>
<ROW Property="Manufacturer" Value="NetFoundry, Inc."/>
<ROW Property="MsiLogging" MultiBuildValue="AnyCPU_Release:vp"/>
<ROW Property="ProductCode" Value="1033:{F07384FA-E340-475D-A111-4A69AD417D9E} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{A30121E0-8614-4F3D-86FC-9B025D1E557B} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Ziti Desktop Edge"/>
<ROW Property="ProductVersion" Value="1.5.6" Type="32"/>
-1
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="UpdateUrl" value="https://api.github.com/repos/openziti/desktop-edge-win/releases/latest"/>
<!--
Format for UpdateTimer is "hours:minutes:seconds" - none of the values can exceed the normal range of each tuple.
For example this is invalid: "0:60:0" because 60 is > 59. To represent every hour you would use "1:0:0"
+1 -1
View File
@@ -99,7 +99,7 @@ namespace ZitiUpdateService {
_updateTimer.Interval = upInt.TotalMilliseconds;
_updateTimer.Enabled = true;
_updateTimer.Start();
Logger.Info("Version Checker is running");
Logger.Info("Version Checker is running every {0} minutes", upInt.TotalMinutes);
string assemblyVersionStr = Assembly.GetExecutingAssembly().GetName().Version.ToString(); //fetch from ziti?
+1 -1
View File
@@ -1 +1 @@
1.5.6
1.5.7