Skip to content

Commit 70356a2

Browse files
committed
Try completeing the WIX files and fixing the passed version
1 parent e40979d commit 70356a2

File tree

3 files changed

+27
-3
lines changed

3 files changed

+27
-3
lines changed

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ jobs:
120120
needs: get-version
121121
env:
122122
VERSION: ${{needs.get-version.outputs.version}}
123-
WIX_VERSION: ${{needs.get-version.outputs.version}}
124123
BUILD_INSTALLER: ${{ false }}
125124
steps:
126125
- name: Checkout repository
@@ -149,7 +148,8 @@ jobs:
149148
- name: Create Installer
150149
if: ${{ env.BUILD_INSTALLER }}
151150
run: |
152-
echo "VERSION=${${{ env.VERSION }}#v}" >> $WIX_VERSION
151+
tag="v0.1.0-test.42"
152+
echo "VERSION=${tag#v}" >> $WIX_VERSION
153153
dotnet build -p:Version=$WIX_VERSION -c Release build/windows/installer/Installer.wixproj --output installer
154154
- name: Upload release
155155
uses: svenstaro/upload-release-action@v2

build/windows/installer/InstallDirUi.wxs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2+
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3+
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
34
<!-- Copied from https://github.com/wixtoolset/wix4/blob/6f2511f58f60e63a15357a2fe37f83343dea3090/src/ext/UI/wixlib/WixUI_InstallDir.wxs#L9
45
but with the license dialog disabled.
56
See: https://wixtoolset.org/docs/v3/wixui/wixui_customizations/#changing-the-ui-sequence-of-a-built-in-dialog-set. -->
67
<Fragment>
8+
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
9+
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
10+
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
11+
712
<UI Id="WixUI_CustomInstallDir">
813
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
914
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
@@ -45,6 +50,18 @@
4550
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
4651

4752
<Property Id="ARPNOMODIFY" Value="1" />
53+
54+
<InstallUISequence>
55+
<Show Dialog="FatalError" OnExit="error" />
56+
<Show Dialog="UserExit" OnExit="cancel" />
57+
<Show Dialog="ExitDialog" OnExit="success" />
58+
</InstallUISequence>
59+
60+
<AdminUISequence>
61+
<Show Dialog="FatalError" OnExit="error" />
62+
<Show Dialog="UserExit" OnExit="cancel" />
63+
<Show Dialog="ExitDialog" OnExit="success" />
64+
</AdminUISequence>
4865
</UI>
4966

5067
<UIRef Id="WixUI_Common" />

build/windows/installer/Package.wxs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
<!-- Shows a UI that allows customizing the install location -->
2626
<ui:WixUI Id="WixUI_CustomInstallDir" InstallDirectory="INSTALLFOLDER" />
27+
<UIRef Id="WixUI_Common" />
2728

2829
<Feature Id="Main">
2930
<ComponentGroupRef Id="MainComponent" />
@@ -38,6 +39,12 @@
3839
<File Id="Executable" Source="..\..\..\target\dist\bevy_game.exe" Vital="true" /> <!-- ToDo this should point to your executable -->
3940
</Component>
4041
</ComponentGroup>
42+
43+
<Binary Id="WixUI_Bmp_Banner" SourceFile="!(wix.WixUIDialogBmp)" />
44+
<Binary Id="WixUI_Ico_Info" SourceFile="!(wix.WixUIIcoInfo)" />
45+
<Binary Id="WixUI_Bmp_Up" SourceFile="!(wix.WixUIDialogBmpUp)" />
46+
<Binary Id="WixUI_Bmp_New" SourceFile="!(wix.WixUIDialogBmpNew)" />
47+
<Property Id="ErrorDialog" Value="ErrorDlg" />
4148

4249
<!-- Start menu shortcut -->
4350
<!-- Source: https://wixtoolset.org/docs/v3/howtos/files_and_registry/create_start_menu_shortcut/ -->

0 commit comments

Comments
 (0)