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

Merge branch 'release-next' of github.com:openziti/desktop-edge-win into release-next

Browse Source
This commit is contained in:
dovholuknf
2020-11-21 22:24:08 -05:00
parent 7e2c3c635f c3e8a2877f
commit b820a018f5
4 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.2.0")]
[assembly: AssemblyFileVersion("1.5.2.0")]
[assembly: AssemblyVersion("1.5.3.0")]
[assembly: AssemblyFileVersion("1.5.3.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:{147EA8AF-DB5F-4F28-904B-B09E8F3320F6} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{0007C563-75C1-4304-B51A-85B817042469} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Ziti Desktop Edge"/>
<ROW Property="ProductVersion" Value="1.5.2" Type="32"/>
<ROW Property="ProductVersion" Value="1.5.3" 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.2.0")]
[assembly: AssemblyFileVersion("1.5.2.0")]
[assembly: AssemblyVersion("1.5.3.0")]
[assembly: AssemblyFileVersion("1.5.3.0")]
service/ziti-tunnel/version.go
+4 -4
View File
@@ -20,9 +20,9 @@
package main
const (
Version = "1.5.2"
Revision = "097f6b699ad5"
Branch = "master"
Version = "1.5.3"
Revision = "9d568ba605ce"
Branch = "release-next"
BuildUser = ""
BuildDate = "2020-11-21 18:48:28"
BuildDate = "2020-11-22 02:32:13"
)