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 pull request #292 from openziti/release-1.6.28

Browse Source 
set ziti-monitor to automatic - delayed start
This commit is contained in:
dovholuknf
2021-01-12 14:06:48 -05:00
committed by GitHub
parent 1898f85da7 b0db027883
commit 1db18eb543
6 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DesktopEdge/Properties/AssemblyInfo.cs
+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.27.0")]
[assembly: AssemblyVersion("1.6.27.0")]
[assembly: AssemblyFileVersion("1.6.27.0")]
// [assembly: AssemblyVersion("1.6.28.0")]
[assembly: AssemblyVersion("1.6.28.0")]
[assembly: AssemblyFileVersion("1.6.28.0")]
Installer/ZitiDesktopEdge.aip
+5 -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:{62D17020-97CD-4EFB-B732-1B50B20D86CB} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{E7E502E6-7CA7-4DF5-8C75-973586320096} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Ziti Desktop Edge"/>
<ROW Property="ProductVersion" Value="1.6.27" Type="32"/>
<ROW Property="ProductVersion" Value="1.6.28" 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}"/>
@@ -299,6 +299,9 @@
<ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
<ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiServConfigComponent">
<ROW MsiServiceConfig="ServiceName" Name="ziti-monitor" Event="1" ConfigType="3" Argument="1" Component_="ZitiUpdateService.exe"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiServConfigFailureActionsComponent">
<ROW MsiServiceConfigFailureActions="ServiceName" Name="ziti" Event="5" ResetPeriod="7" Actions="1[~]1[~]1" DelayActions="1[~]1[~]1" Component_="zititunnel.exe"/>
<ROW MsiServiceConfigFailureActions="ServiceName_1" Name="ziti-monitor" Event="5" ResetPeriod="7" Actions="1[~]1[~]1" DelayActions="1[~]1[~]1" Component_="ZitiUpdateService.exe"/>
ZitiUpdateService/Properties/AssemblyInfo.cs
+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.27.0")]
[assembly: AssemblyVersion("1.6.27.0")]
[assembly: AssemblyFileVersion("1.6.27.0")]
// [assembly: AssemblyVersion("1.6.28.0")]
[assembly: AssemblyVersion("1.6.28.0")]
[assembly: AssemblyFileVersion("1.6.28.0")]
release-notes.md
+14
View File
@@ -1,3 +1,17 @@
# Release 1.6.28
## What's New
* ziti-monitor service set to "Automatic (Delayed Start)". Some users have noticed the monitor service does not start
## Other changes:
* none
## Bugs fixed:
* none
## Dependency Updates
* none
# Release 1.6.27 (also: 1.6.25, 1.6.26)
## What's New
service/ziti-tunnel/version.go
+4 -4
View File
@@ -20,9 +20,9 @@
package main
const (
Version = "1.6.27"
Revision = "7f417a7c6b81"
Branch = "master"
Version = "1.6.28"
Revision = "848677341846"
Branch = "release-1.6.28"
BuildUser = ""
BuildDate = "2021-01-11 15:11:33"
BuildDate = "2021-01-12 18:58:32"
)
version
+1 -1
View File
@@ -1 +1 @@
1.6.27
1.6.28