From a9e428c299cc4a306bf05edfb4f8c2be13ef4170 Mon Sep 17 00:00:00 2001
From: adipiciu <13155063+adipiciu@users.noreply.github.com>
Date: Sat, 16 Mar 2024 20:50:41 +0200
Subject: [PATCH] Update Main.wxs.template

Removed the JavaSoftCurrentVersion component condition.

Temurin 8 JavaSoftCurrentVersion key is not removed at uninstall, because the condition is never satisfied. For Temurin 11, 17, etc, the condition doesn't make any sense because it's comparing with version "1.8", but Temurin 8 has totally different keys.

Signed-off-by: adipiciu <13155063+adipiciu@users.noreply.github.com>
---
 wix/Main.wxs.template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wix/Main.wxs.template b/wix/Main.wxs.template
index 8a92056f9..3c78f94ad 100644
--- a/wix/Main.wxs.template
+++ b/wix/Main.wxs.template
@@ -133,7 +133,6 @@
         <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\{vendor}.jarfile\shell\open\command" Type="string" Value="&quot;[INSTALLDIR]bin\javaw.exe&quot; -jar &quot;%1&quot; %*" KeyPath="no" />
       </Component>
       <Component Id="SetOracleJavaSoftKeysCurrentVersion" Guid="*">
-          <Condition><![CDATA[NOT JAVASOFT_CURRENTVERSION OR JAVASOFT_CURRENTVERSION <> "1.8" AND JAVASOFT_CURRENTVERSION < $(var.ProductMajorVersion)]]></Condition>
           <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\$(var.OracleJavasoftBaseKey)" Name="CurrentVersion" Type="string" Value="$(var.OracleVersionKey)" KeyPath="yes" />
       </Component>
       <Component Id="SetOracleJavaSoftKeys" Guid="*">