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

merge latest

Browse Source
This commit is contained in:
dovholuknf
2020-12-05 17:10:16 -05:00
parent 8cd316c68e 912c1aeed6
commit 0c24f7ebc7
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Installer/ZitiDesktopEdge.aip
-3
View File
@@ -152,7 +152,6 @@
<ROW Name="SoftwareDetector.dll" SourcePath="&lt;AI_CUSTACTS&gt;SoftwareDetector.dll"/>
<ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>
<ROW Name="lzmaextractor.dll" SourcePath="&lt;AI_CUSTACTS&gt;lzmaextractor.dll"/>
<ROW Name="viewer.exe" SourcePath="&lt;AI_CUSTACTS&gt;viewer.exe"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
<ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
@@ -221,7 +220,6 @@
<ROW Action="AI_RunFinishActions" Type="1" Source="aicustact.dll" Target="RunFinishActions" WithoutSeq="true"/>
<ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
<ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
<ROW Action="LaunchFile" Type="1730" Source="viewer.exe" Target="/DontWait &quot;[APPDIR]\ZitiDesktopEdge.exe&quot;" Options="1"/>
<ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFiles64Folder][Manufacturer]\[ProductName]#AnyCPU_Release:[ProgramFiles64Folder][Manufacturer]\[ProductName]"/>
<ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
<ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
@@ -272,7 +270,6 @@
<ROW Action="AI_AiBackupRollback" Sequence="1501"/>
<ROW Action="AI_AiRestoreDeferredImpersonate" Sequence="6598"/>
<ROW Action="AI_AiRestoreDeferred" Sequence="6599"/>
<ROW Action="LaunchFile" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) )" Sequence="6401"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
<ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
service/ziti-tunnel/version.go
+3 -3
View File
@@ -20,9 +20,9 @@
package main
const (
Version = "1.6.9"
Revision = "4f3f1d16c462"
Version = "1.6.10"
Revision = "a0be9f9382fa"
Branch = "master"
BuildUser = ""
BuildDate = "2020-12-05 19:16:14"
BuildDate = "2020-12-05 21:24:26"
)