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

Merge branch 'master' of github.com:openziti/desktop-edge-win

Browse Source
This commit is contained in:
dovholuknf
2020-12-04 23:04:06 -05:00
parent 8b4da6a4c8 f4b6bb3552
commit 031b59b1a9
4 changed files with 8 additions and 8 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.6.3.0")]
[assembly: AssemblyFileVersion("1.6.3.0")]
[assembly: AssemblyVersion("1.6.3.1.0")]
[assembly: AssemblyFileVersion("1.6.3.1.0")]
Installer/ZitiDesktopEdge.aip
+1 -1
View File
@@ -25,7 +25,7 @@
<ROW Property="ProductCode" Value="1033:{A479A8AF-2531-49B4-AD81-FCE8E69BBF35} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Ziti Desktop Edge"/>
<ROW Property="ProductVersion" Value="1.6.3" Type="32"/>
<ROW Property="ProductVersion" Value="1.6.3.1" 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.6.3.0")]
[assembly: AssemblyFileVersion("1.6.3.0")]
[assembly: AssemblyVersion("1.6.3.1.0")]
[assembly: AssemblyFileVersion("1.6.3.1.0")]
service/ziti-tunnel/version.go
+3 -3
View File
@@ -20,9 +20,9 @@
package main
const (
Version = "1.6.3"
Revision = "e61dfb034117"
Version = "1.6.3.1"
Revision = "9a3a87c6caa9"
Branch = "master"
BuildUser = ""
BuildDate = "2020-12-04 04:12:49"
BuildDate = "2020-12-04 22:49:11"
)