From e46c9ca568fd2124dbf29ac57233441524c8bd7b Mon Sep 17 00:00:00 2001 From: jmjaffe37 Date: Tue, 4 Mar 2025 17:18:59 -0800 Subject: [PATCH 1/2] Updated to wix 5.0.2 --- .github/workflows/wix.yml | 2 +- wix/Build.OpenJDK_generic.cmd | 4 ++-- wix/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wix.yml b/.github/workflows/wix.yml index 7ed4d0288..1de1cfacb 100644 --- a/.github/workflows/wix.yml +++ b/.github/workflows/wix.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Install wix toolset - run: dotnet tool install --global wix --version 5.0.0 --verbosity quiet + run: dotnet tool install --global wix --version 5.0.2 --verbosity quiet - name: Fetch latest Windows version from Adoptium API run: | diff --git a/wix/Build.OpenJDK_generic.cmd b/wix/Build.OpenJDK_generic.cmd index a89253f39..e862ab582 100644 --- a/wix/Build.OpenJDK_generic.cmd +++ b/wix/Build.OpenJDK_generic.cmd @@ -13,7 +13,7 @@ REM PRODUCT_CATEGORY=jre|jdk (only one at a time) REM SKIP_MSI_VALIDATION=true (Add -sval option to light.exe to skip MSI/MSM validation and skip smoke.exe ) REM UPGRADE_CODE_SEED=thisIsAPrivateSecretSeed ( optional ) for upgradable MSI (If none, new PRODUCT_UPGRADE_CODE is generate for each run) REM OUTPUT_BASE_FILENAME=customFileName (optional) for setting file names that are not based on the default naming convention -REM WIX_VERSION=5.0.0 (optional) for setting the version of Wix Toolset to use +REM WIX_VERSION=5.0.2 (optional) for setting the version of Wix Toolset to use SETLOCAL ENABLEEXTENSIONS SET ERR=0 @@ -38,7 +38,7 @@ IF NOT DEFINED PRODUCT_HELP_LINK SET PRODUCT_HELP_LINK=https://github.com/adopti IF NOT DEFINED PRODUCT_SUPPORT_LINK SET PRODUCT_SUPPORT_LINK=https://adoptium.net/support IF NOT DEFINED PRODUCT_UPDATE_INFO_LINK SET PRODUCT_UPDATE_INFO_LINK=https://adoptium.net/temurin/releases IF NOT DEFINED WIX_HEAT_PATH SET WIX_HEAT_PATH=.\Resources\heat_dir\heat.exe -IF NOT DEFINED WIX_VERSION SET WIX_VERSION=5.0.0 +IF NOT DEFINED WIX_VERSION SET WIX_VERSION=5.0.2 powershell -ExecutionPolicy Bypass -File "%~dp0\helpers\Validate-Input.ps1" ^ -toValidate '%ARCH%' ^ diff --git a/wix/README.md b/wix/README.md index e52487f1f..2bb1e8fe3 100644 --- a/wix/README.md +++ b/wix/README.md @@ -42,7 +42,7 @@ call powershell.exe ./CreateSourceFolder.AdoptOpenJDK.ps1 ^ SET ARCH=x64|x86-32|x86|arm64 or all "x64 x86-32 arm64" SET JVM=hotspot|openj9|dragonwell or both JVM=hotspot openj9 SET PRODUCT_CATEGORY=jre|jdk (only one at a time) - SET WIX_VERSION=5.0.0 (make sure this is the same version that is installed on the build machine) + SET WIX_VERSION=5.0.2 (make sure this is the same version that is installed on the build machine) ``` To customize branding information you can export the following environment variables to override the default values. The default values are listed below: From 73e3778bc534a8bc7f9fcd408acd7a6cd238f917 Mon Sep 17 00:00:00 2001 From: jmjaffe37 Date: Wed, 5 Mar 2025 09:19:01 -0800 Subject: [PATCH 2/2] Changed 2 values that I missed --- wix/README.md | 2 +- wix/SourceDir/CreateSourceFolder.AdoptOpenJDK.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wix/README.md b/wix/README.md index 2bb1e8fe3..e08396e70 100644 --- a/wix/README.md +++ b/wix/README.md @@ -25,7 +25,7 @@ call powershell.exe ./CreateSourceFolder.AdoptOpenJDK.ps1 ^ -openjdk_filename_regex "^OpenJDK(?\d*)" ^ -platform_regex "(?x86-32|x64|aarch64)" ^ -jvm_regex "(?hotspot|openj9|dragonwell)" ^ - -wix_version "5.0.0" + -wix_version "5.0.2" ``` 3. Export the following environment variables: diff --git a/wix/SourceDir/CreateSourceFolder.AdoptOpenJDK.ps1 b/wix/SourceDir/CreateSourceFolder.AdoptOpenJDK.ps1 index 30e30dba3..23d29e4fb 100644 --- a/wix/SourceDir/CreateSourceFolder.AdoptOpenJDK.ps1 +++ b/wix/SourceDir/CreateSourceFolder.AdoptOpenJDK.ps1 @@ -45,7 +45,7 @@ param ( [Parameter(Mandatory = $false)] [string]$jvm = "", [Parameter(Mandatory = $false)] - [string]$wix_version = "5.0.0" + [string]$wix_version = "5.0.2" ) Get-ChildItem -Path .\ -Filter *.zip -File -Name | ForEach-Object {