@joebigelow / wix-1 / commits / 29e5b6d8

Add "4X" variants for the "45" properties

(to help avoid confusion and funny looks).

Bob Arnson committed Feb 21, 2023 at 20:27 UTC 29e5b6d8a61dc2722a426a77cda1b2d6eabff11f
3 files changed +177 -45
src/ext/NetFx/wixlib/NetFx4.X.wxs new
+176
@@ -0,0 +1,176 @@
1 +<!-- 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. -->
2 +
3 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4 +
5 + <Fragment>
6 + <util:RegistrySearch Id="WixNetFramework4xInstalledRelease" Variable="WixNetFramework4xInstalledRelease" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Release" Result="value" />
7 + </Fragment>
8 +
9 + <!-- set to Release number of the .NET Framework 4.x if installed (not set otherwise) -->
10 + <Fragment>
11 + <Property Id="NETFRAMEWORK4X" Secure="yes">
12 + <RegistrySearch Id="NetFramework4X" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Name="Release" Type="raw" />
13 + </Property>
14 + </Fragment>
15 +
16 + <!-- set to Release number of the .NET Framework 4.x Arabic language pack if installed (not set otherwise) -->
17 + <Fragment>
18 + <Property Id="NETFRAMEWORK4X_AR_SA_LANGPACK" Secure="yes">
19 + <RegistrySearch Id="NETFRAMEWORK4XArSaLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1025" Name="Release" Type="raw" />
20 + </Property>
21 + </Fragment>
22 +
23 + <!-- set to Release number of the .NET Framework 4.x Chinese (Simplified) language pack if installed (not set otherwise) -->
24 + <Fragment>
25 + <Property Id="NETFRAMEWORK4X_ZH_CN_LANGPACK" Secure="yes">
26 + <RegistrySearch Id="NETFRAMEWORK4XZhCnLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\2052" Name="Release" Type="raw" />
27 + </Property>
28 + </Fragment>
29 +
30 + <!-- set to Release number of the .NET Framework 4.x Chinese (Traditional) language pack if installed (not set otherwise) -->
31 + <Fragment>
32 + <Property Id="NETFRAMEWORK4X_ZH_TW_LANGPACK" Secure="yes">
33 + <RegistrySearch Id="NETFRAMEWORK4XZhTwLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1028" Name="Release" Type="raw" />
34 + </Property>
35 + </Fragment>
36 +
37 + <!-- set to Release number of the .NET Framework 4.x Czech language pack if installed (not set otherwise) -->
38 + <Fragment>
39 + <Property Id="NETFRAMEWORK4X_CS_CZ_LANGPACK" Secure="yes">
40 + <RegistrySearch Id="NETFRAMEWORK4XCsCzLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1029" Name="Release" Type="raw" />
41 + </Property>
42 + </Fragment>
43 +
44 + <!-- set to Release number of the .NET Framework 4.x Danish language pack if installed (not set otherwise) -->
45 + <Fragment>
46 + <Property Id="NETFRAMEWORK4X_DA_DK_LANGPACK" Secure="yes">
47 + <RegistrySearch Id="NETFRAMEWORK4XDaDkLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1030" Name="Release" Type="raw" />
48 + </Property>
49 + </Fragment>
50 +
51 + <!-- set to Release number of the .NET Framework 4.x Dutch language pack if installed (not set otherwise) -->
52 + <Fragment>
53 + <Property Id="NETFRAMEWORK4X_NL_NL_LANGPACK" Secure="yes">
54 + <RegistrySearch Id="NETFRAMEWORK4XNlNlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1043" Name="Release" Type="raw" />
55 + </Property>
56 + </Fragment>
57 +
58 + <!-- set to Release number of the .NET Framework 4.x Finnish language pack if installed (not set otherwise) -->
59 + <Fragment>
60 + <Property Id="NETFRAMEWORK4X_FI_FI_LANGPACK" Secure="yes">
61 + <RegistrySearch Id="NETFRAMEWORK4XFiFiLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1035" Name="Release" Type="raw" />
62 + </Property>
63 + </Fragment>
64 +
65 + <!-- set to Release number of the .NET Framework 4.x French language pack if installed (not set otherwise) -->
66 + <Fragment>
67 + <Property Id="NETFRAMEWORK4X_FR_FR_LANGPACK" Secure="yes">
68 + <RegistrySearch Id="NETFRAMEWORK4XFrFrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1036" Name="Release" Type="raw" />
69 + </Property>
70 + </Fragment>
71 +
72 + <!-- set to Release number of the .NET Framework 4.x German language pack if installed (not set otherwise) -->
73 + <Fragment>
74 + <Property Id="NETFRAMEWORK4X_DE_DE_LANGPACK" Secure="yes">
75 + <RegistrySearch Id="NETFRAMEWORK4XDeDeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1031" Name="Release" Type="raw" />
76 + </Property>
77 + </Fragment>
78 +
79 + <!-- set to Release number of the .NET Framework 4.x Greek language pack if installed (not set otherwise) -->
80 + <Fragment>
81 + <Property Id="NETFRAMEWORK4X_EL_GR_LANGPACK" Secure="yes">
82 + <RegistrySearch Id="NETFRAMEWORK4XElGrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1032" Name="Release" Type="raw" />
83 + </Property>
84 + </Fragment>
85 +
86 + <!-- set to Release number of the .NET Framework 4.x Hebrew language pack if installed (not set otherwise) -->
87 + <Fragment>
88 + <Property Id="NETFRAMEWORK4X_HE_IL_LANGPACK" Secure="yes">
89 + <RegistrySearch Id="NETFRAMEWORK4XHeIlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1037" Name="Release" Type="raw" />
90 + </Property>
91 + </Fragment>
92 +
93 + <!-- set to Release number of the .NET Framework 4.x Hungarian language pack if installed (not set otherwise) -->
94 + <Fragment>
95 + <Property Id="NETFRAMEWORK4X_HU_HU_LANGPACK" Secure="yes">
96 + <RegistrySearch Id="NETFRAMEWORK4XHuHuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1038" Name="Release" Type="raw" />
97 + </Property>
98 + </Fragment>
99 +
100 + <!-- set to Release number of the .NET Framework 4.x Italian language pack if installed (not set otherwise) -->
101 + <Fragment>
102 + <Property Id="NETFRAMEWORK4X_IT_IT_LANGPACK" Secure="yes">
103 + <RegistrySearch Id="NETFRAMEWORK4XItItLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1040" Name="Release" Type="raw" />
104 + </Property>
105 + </Fragment>
106 +
107 + <!-- set to Release number of the .NET Framework 4.x Japanese language pack if installed (not set otherwise) -->
108 + <Fragment>
109 + <Property Id="NETFRAMEWORK4X_JA_JP_LANGPACK" Secure="yes">
110 + <RegistrySearch Id="NETFRAMEWORK4XJaJpLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1041" Name="Release" Type="raw" />
111 + </Property>
112 + </Fragment>
113 +
114 + <!-- set to Release number of the .NET Framework 4.x Korean language pack if installed (not set otherwise) -->
115 + <Fragment>
116 + <Property Id="NETFRAMEWORK4X_KO_KR_LANGPACK" Secure="yes">
117 + <RegistrySearch Id="NETFRAMEWORK4XKoKrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1042" Name="Release" Type="raw" />
118 + </Property>
119 + </Fragment>
120 +
121 + <!-- set to Release number of the .NET Framework 4.x Norwegian language pack if installed (not set otherwise) -->
122 + <Fragment>
123 + <Property Id="NETFRAMEWORK4X_NB_NO_LANGPACK" Secure="yes">
124 + <RegistrySearch Id="NETFRAMEWORK4XNbNoLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1044" Name="Release" Type="raw" />
125 + </Property>
126 + </Fragment>
127 +
128 + <!-- set to Release number of the .NET Framework 4.x Polish language pack if installed (not set otherwise) -->
129 + <Fragment>
130 + <Property Id="NETFRAMEWORK4X_PL_PL_LANGPACK" Secure="yes">
131 + <RegistrySearch Id="NETFRAMEWORK4XPlPlLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1045" Name="Release" Type="raw" />
132 + </Property>
133 + </Fragment>
134 +
135 + <!-- set to Release number of the .NET Framework 4.x Portuguese (Brazil) language pack if installed (not set otherwise) -->
136 + <Fragment>
137 + <Property Id="NETFRAMEWORK4X_PT_BR_LANGPACK" Secure="yes">
138 + <RegistrySearch Id="NETFRAMEWORK4XPtBrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1046" Name="Release" Type="raw" />
139 + </Property>
140 + </Fragment>
141 +
142 + <!-- set to Release number of the .NET Framework 4.x Portuguese (Portugal) language pack if installed (not set otherwise) -->
143 + <Fragment>
144 + <Property Id="NETFRAMEWORK4X_PT_PT_LANGPACK" Secure="yes">
145 + <RegistrySearch Id="NETFRAMEWORK4XPtPtLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\2070" Name="Release" Type="raw" />
146 + </Property>
147 + </Fragment>
148 +
149 + <!-- set to Release number of the .NET Framework 4.x Russian language pack if installed (not set otherwise) -->
150 + <Fragment>
151 + <Property Id="NETFRAMEWORK4X_RU_RU_LANGPACK" Secure="yes">
152 + <RegistrySearch Id="NETFRAMEWORK4XRuRuLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1049" Name="Release" Type="raw" />
153 + </Property>
154 + </Fragment>
155 +
156 + <!-- set to Release number of the .NET Framework 4.x Spanish language pack if installed (not set otherwise) -->
157 + <Fragment>
158 + <Property Id="NETFRAMEWORK4X_ES_ES_LANGPACK" Secure="yes">
159 + <RegistrySearch Id="NETFRAMEWORK4XEsEsLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\3082" Name="Release" Type="raw" />
160 + </Property>
161 + </Fragment>
162 +
163 + <!-- set to Release number of the .NET Framework 4.x Swedish language pack if installed (not set otherwise) -->
164 + <Fragment>
165 + <Property Id="NETFRAMEWORK4X_SV_SE_LANGPACK" Secure="yes">
166 + <RegistrySearch Id="NETFRAMEWORK4XSvSeLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1053" Name="Release" Type="raw" />
167 + </Property>
168 + </Fragment>
169 +
170 + <!-- set to Release number of the .NET Framework 4.x Turkish language pack if installed (not set otherwise) -->
171 + <Fragment>
172 + <Property Id="NETFRAMEWORK4X_TR_TR_LANGPACK" Secure="yes">
173 + <RegistrySearch Id="NETFRAMEWORK4XTrTrLp" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full\1055" Name="Release" Type="raw" />
174 + </Property>
175 + </Fragment>
176 +</Wix>
src/ext/NetFx/wixlib/NetFx452.wxs
-44
@@ -22,48 +22,4 @@
22 <Property Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Secure="yes" />
23 <SetProperty Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx452MinRelease)&quot;" />
24 </Fragment>
25 -
26 - <Fragment>
27 - <util:RegistrySearchRef Id="NETFRAMEWORK45" />
28 -
29 - <WixVariable Id="NetFx452WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
30 - <WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" />
31 - <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" />
32 -
33 - <PackageGroup Id="$(var.NetFx452WebId)">
34 - <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">
35 - <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" />
36 - </ExePackage>
37 - </PackageGroup>
38 - </Fragment>
39 -
40 - <Fragment>
41 - <PackageGroup Id="$(var.NetFx452WebId)AsPrereq">
42 - <PackageGroupRef Id="$(var.NetFx452WebId)" />
43 - </PackageGroup>
44 -
45 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452WebId)" LicenseUrl="$(var.NetFx452EulaLink)" />
46 - </Fragment>
47 -
48 - <Fragment>
49 - <util:RegistrySearchRef Id="NETFRAMEWORK45" />
50 -
51 - <WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
52 - <WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" />
53 - <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" />
54 -
55 - <PackageGroup Id="$(var.NetFx452RedistId)">
56 - <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">
57 - <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" />
58 - </ExePackage>
59 - </PackageGroup>
60 - </Fragment>
61 -
62 - <Fragment>
63 - <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq">
64 - <PackageGroupRef Id="$(var.NetFx452RedistId)" />
65 - </PackageGroup>
66 -
67 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452RedistId)" LicenseUrl="$(var.NetFx452EulaLink)" />
68 - </Fragment>
25 </Wix>
src/ext/NetFx/wixlib/NetFxExtension.wxs
+1 -1
@@ -7,7 +7,7 @@
7 .NET Framework installation state properties
8 -->
9
10 - <!-- Location of .NET Framework redistributable install root directory -->
10 + <!-- Location of .NET Framework install root directory -->
11 <Fragment>
12 <Property Id="NETFRAMEWORKINSTALLROOTDIR" Secure="yes">
13 <RegistrySearch Id="NetFxInstallRootSearch" Type="raw" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" />