From 29e5b6d8a61dc2722a426a77cda1b2d6eabff11f Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 21 Feb 2023 20:27:55 -0500
Subject: Add "4X" variants for the "45" properties

(to help avoid confusion and funny looks).
---
 src/ext/NetFx/wixlib/NetFx4.X.wxs       | 176 ++++++++++++++++++++++++++++++++
 src/ext/NetFx/wixlib/NetFx452.wxs       |  44 --------
 src/ext/NetFx/wixlib/NetFxExtension.wxs |   2 +-
 3 files changed, 177 insertions(+), 45 deletions(-)
 create mode 100644 src/ext/NetFx/wixlib/NetFx4.X.wxs

diff --git a/src/ext/NetFx/wixlib/NetFx4.X.wxs b/src/ext/NetFx/wixlib/NetFx4.X.wxs
new file mode 100644
index 00000000..9f77dcf7
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetFx4.X.wxs
@@ -0,0 +1,176 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  <Fragment>
+    <util:RegistrySearch Id="WixNetFramework4xInstalledRelease" Variable="WixNetFramework4xInstalledRelease" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Release" Result="value" />
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X" Secure="yes">
+      <RegistrySearch Id="NetFramework4X" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Arabic language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_AR_SA_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XArSaLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1025" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Chinese (Simplified) language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_ZH_CN_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XZhCnLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\2052" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Chinese (Traditional) language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_ZH_TW_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XZhTwLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1028" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Czech language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_CS_CZ_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XCsCzLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1029" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Danish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_DA_DK_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XDaDkLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1030" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Dutch language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_NL_NL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XNlNlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1043" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Finnish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_FI_FI_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XFiFiLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1035" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x French language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_FR_FR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XFrFrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1036" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x German language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_DE_DE_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XDeDeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1031" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Greek language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_EL_GR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XElGrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1032" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Hebrew language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_HE_IL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XHeIlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1037" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Hungarian language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_HU_HU_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XHuHuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1038" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Italian language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_IT_IT_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XItItLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1040" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Japanese language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_JA_JP_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XJaJpLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1041" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Korean language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_KO_KR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XKoKrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1042" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Norwegian language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_NB_NO_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XNbNoLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1044" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Polish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_PL_PL_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XPlPlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1045" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Portuguese (Brazil) language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_PT_BR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XPtBrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1046" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Portuguese (Portugal) language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_PT_PT_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XPtPtLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\2070" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Russian language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_RU_RU_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XRuRuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1049" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Spanish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_ES_ES_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XEsEsLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\3082" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Swedish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_SV_SE_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XSvSeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1053" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+
+  <!-- set to Release number of the .NET Framework 4.x Turkish language pack if installed (not set otherwise) -->
+  <Fragment>
+    <Property Id="NETFRAMEWORK4X_TR_TR_LANGPACK" Secure="yes">
+      <RegistrySearch Id="NETFRAMEWORK4XTrTrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1055" Name="Release" Type="raw" />
+    </Property>
+  </Fragment>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx452.wxs b/src/ext/NetFx/wixlib/NetFx452.wxs
index e0b2f0f2..ef5bb108 100644
--- a/src/ext/NetFx/wixlib/NetFx452.wxs
+++ b/src/ext/NetFx/wixlib/NetFx452.wxs
@@ -22,48 +22,4 @@
     <Property Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Secure="yes" />
     <SetProperty Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx452MinRelease)&quot;" />
   </Fragment>
-
-  <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
-
-    <WixVariable Id="NetFx452WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
-    <WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" />
-    <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" />
-
-    <PackageGroup Id="$(var.NetFx452WebId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452WebDetectCondition)" InstallCondition="!(wix.NetFx452WebInstallCondition)" Id="$(var.NetFx452WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullWebLog" Cache="remove">
-        <ExePackagePayload Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe" DownloadUrl="$(var.NetFx452WebLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E" ProductName="Microsoft .NET Framework 4.5.2" Size="1118920" Version="4.5.51209.34209" />
-      </ExePackage>
-    </PackageGroup>
-  </Fragment>
-
-  <Fragment>
-    <PackageGroup Id="$(var.NetFx452WebId)AsPrereq">
-      <PackageGroupRef Id="$(var.NetFx452WebId)" />
-    </PackageGroup>
-
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452WebId)" LicenseUrl="$(var.NetFx452EulaLink)" />
-  </Fragment>
-
-  <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
-
-    <WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
-    <WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" />
-    <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" />
-
-    <PackageGroup Id="$(var.NetFx452RedistId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452RedistDetectCondition)" InstallCondition="!(wix.NetFx452RedistInstallCondition)" Id="$(var.NetFx452RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullLog" Cache="remove">
-        <ExePackagePayload Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx452RedistLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D" ProductName="Microsoft .NET Framework 4.5.2" Size="69999448" Version="4.5.51209.34209" />
-      </ExePackage>
-    </PackageGroup>
-  </Fragment>
-
-  <Fragment>
-    <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq">
-      <PackageGroupRef Id="$(var.NetFx452RedistId)" />
-    </PackageGroup>
-
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452RedistId)" LicenseUrl="$(var.NetFx452EulaLink)" />
-  </Fragment>
 </Wix>
diff --git a/src/ext/NetFx/wixlib/NetFxExtension.wxs b/src/ext/NetFx/wixlib/NetFxExtension.wxs
index 63c79235..81ed3627 100644
--- a/src/ext/NetFx/wixlib/NetFxExtension.wxs
+++ b/src/ext/NetFx/wixlib/NetFxExtension.wxs
@@ -7,7 +7,7 @@
         .NET Framework installation state properties
     -->
 
-  <!-- Location of .NET Framework redistributable install root directory -->
+  <!-- Location of .NET Framework install root directory -->
   <Fragment>
     <Property Id="NETFRAMEWORKINSTALLROOTDIR" Secure="yes">
       <RegistrySearch Id="NetFxInstallRootSearch" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" />
-- 
cgit v1.2.3-55-g6feb