gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-10-13 00:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-next

Browse Source
This commit is contained in:
dovholuknf
2020-11-22 11:04:13 -05:00
parent 2a9c38ec14 253f0921e6
commit f004cfec9e
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DesktopEdge/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -51,5 +51,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.5.0")]
[assembly: AssemblyFileVersion("1.5.5.0")]
[assembly: AssemblyVersion("1.5.6.0")]
[assembly: AssemblyFileVersion("1.5.6.0")]
Installer/ZitiDesktopEdge.aip
+2 -2
View File
@@ -22,10 +22,10 @@
<ROW Property="CTRLS" Value="2"/>
<ROW Property="Manufacturer" Value="NetFoundry, Inc."/>
<ROW Property="MsiLogging" MultiBuildValue="AnyCPU_Release:vp"/>
<ROW Property="ProductCode" Value="1033:{AFF65A96-76DF-4171-B727-43F87AE84C5C} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{F07384FA-E340-475D-A111-4A69AD417D9E} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Ziti Desktop Edge"/>
<ROW Property="ProductVersion" Value="1.5.5" Type="32"/>
<ROW Property="ProductVersion" Value="1.5.6" Type="32"/>
<ROW Property="REBOOT" MultiBuildValue="AnyCPU_Release:Suppress"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
<ROW Property="UpgradeCode" Value="{CB7E173A-663D-4A23-BB22-D1E8D885C2F3}"/>
ZitiUpdateService/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.5.0")]
[assembly: AssemblyFileVersion("1.5.5.0")]
[assembly: AssemblyVersion("1.5.6.0")]
[assembly: AssemblyFileVersion("1.5.6.0")]
ZitiUpdateService/UpdateCheckers.cs
+1 -1
View File
@@ -64,7 +64,7 @@ namespace ZitiUpdateService {
return false;
} else {
Logger.Debug("current version {0} is the same as the latest release {0}", current, published);
return true;
return false;
}
return true;
service/ziti-tunnel/version.go
+3 -3
View File
@@ -20,9 +20,9 @@
package main
const (
Version = "1.5.5"
Revision = "fa1e429f932b"
Version = "1.5.6"
Revision = "af87717097b6"
Branch = "master"
BuildUser = ""
BuildDate = "2020-11-22 05:04:39"
BuildDate = "2020-11-22 15:42:01"
)