Skip to content

Commit e840f3b

Browse files
authored
Updated default wix version from 5.0.0 to 5.0.2 (#1136)
* Updated to wix 5.0.2 * Changed 2 values that I missed
1 parent 14458a8 commit e840f3b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/wix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3131

3232
- name: Install wix toolset
33-
run: dotnet tool install --global wix --version 5.0.0 --verbosity quiet
33+
run: dotnet tool install --global wix --version 5.0.2 --verbosity quiet
3434

3535
- name: Fetch latest Windows version from Adoptium API
3636
run: |

wix/Build.OpenJDK_generic.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ REM PRODUCT_CATEGORY=jre|jdk (only one at a time)
1313
REM SKIP_MSI_VALIDATION=true (Add -sval option to light.exe to skip MSI/MSM validation and skip smoke.exe )
1414
REM UPGRADE_CODE_SEED=thisIsAPrivateSecretSeed ( optional ) for upgradable MSI (If none, new PRODUCT_UPGRADE_CODE is generate for each run)
1515
REM OUTPUT_BASE_FILENAME=customFileName (optional) for setting file names that are not based on the default naming convention
16-
REM WIX_VERSION=5.0.0 (optional) for setting the version of Wix Toolset to use
16+
REM WIX_VERSION=5.0.2 (optional) for setting the version of Wix Toolset to use
1717

1818
SETLOCAL ENABLEEXTENSIONS
1919
SET ERR=0
@@ -38,7 +38,7 @@ IF NOT DEFINED PRODUCT_HELP_LINK SET PRODUCT_HELP_LINK=https://github.com/adopti
3838
IF NOT DEFINED PRODUCT_SUPPORT_LINK SET PRODUCT_SUPPORT_LINK=https://adoptium.net/support
3939
IF NOT DEFINED PRODUCT_UPDATE_INFO_LINK SET PRODUCT_UPDATE_INFO_LINK=https://adoptium.net/temurin/releases
4040
IF NOT DEFINED WIX_HEAT_PATH SET WIX_HEAT_PATH=.\Resources\heat_dir\heat.exe
41-
IF NOT DEFINED WIX_VERSION SET WIX_VERSION=5.0.0
41+
IF NOT DEFINED WIX_VERSION SET WIX_VERSION=5.0.2
4242

4343
powershell -ExecutionPolicy Bypass -File "%~dp0\helpers\Validate-Input.ps1" ^
4444
-toValidate '%ARCH%' ^

wix/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ call powershell.exe ./CreateSourceFolder.AdoptOpenJDK.ps1 ^
2525
-openjdk_filename_regex "^OpenJDK(?<major>\d*)" ^
2626
-platform_regex "(?<platform>x86-32|x64|aarch64)" ^
2727
-jvm_regex "(?<jvm>hotspot|openj9|dragonwell)" ^
28-
-wix_version "5.0.0"
28+
-wix_version "5.0.2"
2929
```
3030

3131
3. Export the following environment variables:
@@ -42,7 +42,7 @@ call powershell.exe ./CreateSourceFolder.AdoptOpenJDK.ps1 ^
4242
SET ARCH=x64|x86-32|x86|arm64 or all "x64 x86-32 arm64"
4343
SET JVM=hotspot|openj9|dragonwell or both JVM=hotspot openj9
4444
SET PRODUCT_CATEGORY=jre|jdk (only one at a time)
45-
SET WIX_VERSION=5.0.0 (make sure this is the same version that is installed on the build machine)
45+
SET WIX_VERSION=5.0.2 (make sure this is the same version that is installed on the build machine)
4646
```
4747

4848
To customize branding information you can export the following environment variables to override the default values. The default values are listed below:

wix/SourceDir/CreateSourceFolder.AdoptOpenJDK.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ param (
4545
[Parameter(Mandatory = $false)]
4646
[string]$jvm = "",
4747
[Parameter(Mandatory = $false)]
48-
[string]$wix_version = "5.0.0"
48+
[string]$wix_version = "5.0.2"
4949
)
5050

5151
Get-ChildItem -Path .\ -Filter *.zip -File -Name | ForEach-Object {

0 commit comments

Comments
 (0)