File tree Expand file tree Collapse file tree 2 files changed +6
-23
lines changed Expand file tree Collapse file tree 2 files changed +6
-23
lines changed Original file line number Diff line number Diff line change 9
9
pull_request :
10
10
11
11
env :
12
- SIGN_PIPE_VER : " v0.0.18 "
12
+ SIGN_PIPE_VER : " v0.0.19 "
13
13
GORELEASER_VER : " v2.3.2"
14
14
PRODUCT_NAME : " NetBird"
15
15
COPYRIGHT : " NetBird GmbH"
Original file line number Diff line number Diff line change 1
1
<Wix
2
- xmlns=" http://wixtoolset.org/schemas/v4/wxs" >
2
+ xmlns=" http://wixtoolset.org/schemas/v4/wxs"
3
+ xmlns:util=" http://wixtoolset.org/schemas/v4/wxs/util" >
3
4
<Package Name =" NetBird" Version =" $(env.NETBIRD_VERSION)" Manufacturer =" NetBird GmbH" Language =" 1033" UpgradeCode =" 6456ec4e-3ad6-4b9b-a2be-98e81cb21ccf"
4
5
InstallerVersion =" 500" Compressed =" yes" Codepage =" utf-8" >
5
6
7
+
6
8
<MediaTemplate EmbedCab =" yes" />
7
9
8
10
<Feature Id =" NetbirdFeature" Title =" Netbird" Level =" 1" >
46
48
<ComponentRef Id =" NetbirdFiles" />
47
49
</ComponentGroup >
48
50
49
- <Property Id =" cmd" Value =" cmd.exe" />
50
-
51
- <CustomAction Id =" KillDaemon"
52
- ExeCommand =' /c "taskkill /im netbird.exe"'
53
- Execute =" deferred"
54
- Property =" cmd"
55
- Impersonate =" no"
56
- Return =" ignore"
57
- />
51
+ <util : CloseApplication Id =" CloseNetBird" CloseMessage =" no" Target =" netbird.exe" RebootPrompt =" no" />
52
+ <util : CloseApplication Id =" CloseNetBirdUI" CloseMessage =" no" Target =" netbird-ui.exe" RebootPrompt =" no" />
58
53
59
- <CustomAction Id =" KillUI"
60
- ExeCommand =' /c "taskkill /im netbird-ui.exe"'
61
- Execute =" deferred"
62
- Property =" cmd"
63
- Impersonate =" no"
64
- Return =" ignore"
65
- />
66
54
67
- <InstallExecuteSequence >
68
- <!-- For Uninstallation -->
69
- <Custom Action =" KillDaemon" Before =" RemoveFiles" Condition =" Installed" />
70
- <Custom Action =" KillUI" After =" KillDaemon" Condition =" Installed" />
71
- </InstallExecuteSequence >
72
55
73
56
<!-- Icons -->
74
57
<Icon Id =" NetbirdIcon" SourceFile =" .\client\ui\assets\netbird.ico" />
You can’t perform that action at this time.
0 commit comments