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

This commit is contained in:
dovholuknf
2020-12-05 10:18:01 -05:00
4 changed files with 11 additions and 11 deletions
+3 -3
View File
@@ -50,6 +50,6 @@ 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.6.3.8")]
[assembly: AssemblyVersion("1.6.3.8")]
[assembly: AssemblyFileVersion("1.6.3.8")]
// [assembly: AssemblyVersion("1.6.5.0")]
[assembly: AssemblyVersion("1.6.5.0")]
[assembly: AssemblyFileVersion("1.6.5.0")]
+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:{A479A8AF-2531-49B4-AD81-FCE8E69BBF35} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{3315A8D5-2146-4A8E-B4AC-B53D0C82161E} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Ziti Desktop Edge"/>
<ROW Property="ProductVersion" Value="1.6.3.8" Type="32"/>
<ROW Property="ProductVersion" Value="1.6.5" 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}"/>
+3 -3
View File
@@ -30,6 +30,6 @@ 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.6.3.8")]
[assembly: AssemblyVersion("1.6.3.8")]
[assembly: AssemblyFileVersion("1.6.3.8")]
// [assembly: AssemblyVersion("1.6.5.0")]
[assembly: AssemblyVersion("1.6.5.0")]
[assembly: AssemblyFileVersion("1.6.5.0")]
+3 -3
View File
@@ -20,9 +20,9 @@
package main
const (
Version = "1.6.3.8"
Revision = "fed5d28c3e98"
Version = "1.6.5"
Revision = "30d4f19bb615"
Branch = "master"
BuildUser = ""
BuildDate = "2020-12-05 06:13:45"
BuildDate = "2020-12-05 13:46:20"
)