aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-05-20 23:04:12 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-05-20 23:20:10 +1000
commit2f656639071852058f884126f8d75bbf3512d78f (patch)
tree366075e3855c30b7ca975e4878d4ee5e7230a544
parent9875a626e3b171c206fe6ae83e1c6c2d8c5dc25b (diff)
downloadwix-2f656639071852058f884126f8d75bbf3512d78f.tar.gz
wix-2f656639071852058f884126f8d75bbf3512d78f.tar.bz2
wix-2f656639071852058f884126f8d75bbf3512d78f.zip
Integrate new .NET Framework packages into v4.
Diffstat
-rw-r--r--src/wixlib/NetFx472.wxs60
-rw-r--r--src/wixlib/NetFx48.wxs66
-rw-r--r--src/wixlib/netfx.wixproj4
3 files changed, 77 insertions, 53 deletions
diff --git a/src/wixlib/NetFx472.wxs b/src/wixlib/NetFx472.wxs
index 152d2245..08a17d5b 100644
--- a/src/wixlib/NetFx472.wxs
+++ b/src/wixlib/NetFx472.wxs
@@ -1,7 +1,9 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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<!-- 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. -->
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
5 7
6 <!-- 8 <!--
7 .NET Framework installation state properties 9 .NET Framework installation state properties
@@ -11,8 +13,10 @@
11 13
12 <?define NetFx472MinRelease = 461808 ?> 14 <?define NetFx472MinRelease = 461808 ?>
13 <?define NetFx472WebLink = https://go.microsoft.com/fwlink/?LinkId=863262 ?> 15 <?define NetFx472WebLink = https://go.microsoft.com/fwlink/?LinkId=863262 ?>
14 <?define NetFx472RedistLink = https://go.microsoft.com/fwlink/?LinkId=863265 ?> 16 <?define NetFx472RedistLink = https://go.microsoft.com/fwlink/?LinkId=863258 ?>
15 <?define NetFx472EulaLink = https://referencesource.microsoft.com/license.html ?> 17 <?define NetFx472EulaLink = https://referencesource.microsoft.com/license.html ?>
18 <?define NetFx472WebId = NetFx472Web ?>
19 <?define NetFx472RedistId = NetFx472Redist ?>
16 20
17 <Fragment> 21 <Fragment>
18 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 22 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -25,74 +29,82 @@
25 <Fragment> 29 <Fragment>
26 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 30 <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
27 31
28 <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx472Web" />
29 <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx472EulaLink)" Overridable="yes" />
30 <WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" /> 32 <WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
31 <WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" /> 33 <WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" />
32 <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" /> 34 <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" />
33 35
34 <PackageGroup Id="NetFx472Web"> 36 <PackageGroup Id="$(var.NetFx472WebId)">
35 <ExePackage 37 <ExePackage
36 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;" 38 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
37 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;" 39 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
38 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;" 40 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
39 PerMachine="yes" 41 PerMachine="yes"
40 DetectCondition="!(wix.NetFx472WebDetectCondition)" 42 DetectCondition="!(wix.NetFx472WebDetectCondition)"
41 InstallCondition="!(wix.NetFx472WebInstallCondition)" 43 InstallCondition="!(wix.NetFx472WebInstallCondition)"
42 Id="NetFx472Web" 44 Id="$(var.NetFx472WebId)"
43 Vital="yes" 45 Vital="yes"
44 Permanent="yes" 46 Permanent="yes"
45 Protocol="netfx4" 47 Protocol="netfx4"
46 DownloadUrl="$(var.NetFx472WebLink)" 48 DownloadUrl="$(var.NetFx472WebLink)"
47 LogPathVariable="NetFx472FullLog" 49 LogPathVariable="NetFx472WebLog"
48 Compressed="no" 50 Compressed="no"
49 Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe"> 51 Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe">
50 <RemotePayload 52 <RemotePayload
51 CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2" 53 CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
52 CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17" 54 CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
53 Description="Microsoft .NET Framework 4.7.2 Setup" 55 Description="Microsoft .NET Framework 4.7.2 Setup"
54 Hash="507ECDADC23A27C2283BA130A2AA51650E6BC05B" 56 Hash="CEDBBF404B166A5E72D035760BCB0FA508E4F4CB"
55 ProductName="Microsoft .NET Framework 4.7.2" 57 ProductName="Microsoft .NET Framework 4.7.2"
56 Size="1447320" 58 Size="1432848"
57 Version="4.7.3062.0" /> 59 Version="4.7.3081.0" />
58 </ExePackage> 60 </ExePackage>
59 </PackageGroup> 61 </PackageGroup>
60 </Fragment> 62 </Fragment>
61 63
62 <Fragment> 64 <Fragment>
65 <PackageGroup Id="$(var.NetFx472WebId)AsPrereq" />
66
67 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" />
68 </Fragment>
69
70 <Fragment>
63 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 71 <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
64 72
65 <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx472Redist" />
66 <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx472EulaLink)" Overridable="yes" />
67 <WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" /> 73 <WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
68 <WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" /> 74 <WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" />
69 <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" /> 75 <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" />
70 76
71 <PackageGroup Id="NetFx472Redist"> 77 <PackageGroup Id="$(var.NetFx472RedistId)">
72 <ExePackage 78 <ExePackage
73 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;" 79 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
74 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;" 80 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
75 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;" 81 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
76 PerMachine="yes" 82 PerMachine="yes"
77 DetectCondition="!(wix.NetFx472RedistDetectCondition)" 83 DetectCondition="!(wix.NetFx472RedistDetectCondition)"
78 InstallCondition="!(wix.NetFx472RedistInstallCondition)" 84 InstallCondition="!(wix.NetFx472RedistInstallCondition)"
79 Id="NetFx472Redist" 85 Id="$(var.NetFx472RedistId)"
80 Vital="yes" 86 Vital="yes"
81 Permanent="yes" 87 Permanent="yes"
82 Protocol="netfx4" 88 Protocol="netfx4"
83 DownloadUrl="$(var.NetFx472RedistLink)" 89 DownloadUrl="$(var.NetFx472RedistLink)"
84 LogPathVariable="NetFx472FullLog" 90 LogPathVariable="NetFx472RedistLog"
85 Compressed="no" 91 Compressed="no"
86 Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe"> 92 Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe">
87 <RemotePayload 93 <RemotePayload
88 CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2" 94 CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
89 CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17" 95 CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
90 Description="Microsoft .NET Framework 4.7.2 Setup" 96 Description="Microsoft .NET Framework 4.7.2 Setup"
91 Hash="D3A416DC5FC75758D41B4C0158ACA69270D2A904" 97 Hash="31FC0D305A6F651C9E892C98EB10997AE885EB1E"
92 ProductName="Microsoft .NET Framework 4.7.2" 98 ProductName="Microsoft .NET Framework 4.7.2"
93 Size="71607232" 99 Size="83943272"
94 Version="4.7.3062.0" /> 100 Version="4.7.3081.0" />
95 </ExePackage> 101 </ExePackage>
96 </PackageGroup> 102 </PackageGroup>
97 </Fragment> 103 </Fragment>
104
105 <Fragment>
106 <PackageGroup Id="$(var.NetFx472RedistId)AsPrereq" />
107
108 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" />
109 </Fragment>
98</Wix> 110</Wix>
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs
index 5156c3f0..d65d36be 100644
--- a/src/wixlib/NetFx48.wxs
+++ b/src/wixlib/NetFx48.wxs
@@ -1,7 +1,9 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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<!-- 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. -->
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
5 7
6 <!-- 8 <!--
7 .NET Framework installation state properties 9 .NET Framework installation state properties
@@ -13,6 +15,8 @@
13 <?define NetFx48WebLink = https://go.microsoft.com/fwlink/?LinkId=2085155 ?> 15 <?define NetFx48WebLink = https://go.microsoft.com/fwlink/?LinkId=2085155 ?>
14 <?define NetFx48RedistLink = https://go.microsoft.com/fwlink/?linkid=2088631 ?> 16 <?define NetFx48RedistLink = https://go.microsoft.com/fwlink/?linkid=2088631 ?>
15 <?define NetFx48EulaLink = https://referencesource.microsoft.com/license.html ?> 17 <?define NetFx48EulaLink = https://referencesource.microsoft.com/license.html ?>
18 <?define NetFx48WebId = NetFx48Web ?>
19 <?define NetFx48RedistId = NetFx48Redist ?>
16 20
17 <Fragment> 21 <Fragment>
18 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 22 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -25,74 +29,82 @@
25 <Fragment> 29 <Fragment>
26 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 30 <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
27 31
28 <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx48Web" />
29 <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx48EulaLink)" Overridable="yes" />
30 <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" /> 32 <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
31 <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" /> 33 <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" />
32 <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" /> 34 <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
33 35
34 <PackageGroup Id="NetFx48Web"> 36 <PackageGroup Id="$(var.NetFx48WebId)">
35 <ExePackage 37 <ExePackage
36 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;" 38 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
37 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;" 39 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
38 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;" 40 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
39 PerMachine="yes" 41 PerMachine="yes"
40 DetectCondition="!(wix.NetFx48WebDetectCondition)" 42 DetectCondition="!(wix.NetFx48WebDetectCondition)"
41 InstallCondition="!(wix.NetFx48WebInstallCondition)" 43 InstallCondition="!(wix.NetFx48WebInstallCondition)"
42 Id="NetFx48Web" 44 Id="$(var.NetFx48WebId)"
43 Vital="yes" 45 Vital="yes"
44 Permanent="yes" 46 Permanent="yes"
45 Protocol="netfx4" 47 Protocol="netfx4"
46 DownloadUrl="$(var.NetFx48WebLink)" 48 DownloadUrl="$(var.NetFx48WebLink)"
47 LogPathVariable="NetFx48FullLog" 49 LogPathVariable="NetFx48WebLog"
48 Compressed="no" 50 Compressed="no"
49 Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe"> 51 Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe">
50 <RemotePayload 52 <RemotePayload
51 CertificatePublicKey="793980B0038EBF0A88DAA08420FD3E66F53CC0CE" 53 CertificatePublicKey="D17AFCE951979605250FAEBAFA7AE974899AED22"
52 CertificateThumbprint="9DC17888B5CFAD98B3CB35C1994E96227F061675" 54 CertificateThumbprint="C82273A065EC470FB1EBDE846A91E6FFB29E9C12"
53 Description="Microsoft .NET Framework 4.8 Setup" 55 Description="Microsoft .NET Framework 4.8 Setup"
54 Hash="755349ECD6A478FE010E466B29911D2388F6CE94" 56 Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9"
55 ProductName="Microsoft .NET Framework 4.8" 57 ProductName="Microsoft .NET Framework 4.8"
56 Size="1486376" 58 Size="1479400"
57 Version="4.8.3761.0" /> 59 Version="4.8.3928.0" />
58 </ExePackage> 60 </ExePackage>
59 </PackageGroup> 61 </PackageGroup>
60 </Fragment> 62 </Fragment>
61 63
62 <Fragment> 64 <Fragment>
65 <PackageGroup Id="$(var.NetFx48WebId)AsPrereq" />
66
67 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" />
68 </Fragment>
69
70 <Fragment>
63 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 71 <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
64 72
65 <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx48Redist" />
66 <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx48EulaLink)" Overridable="yes" />
67 <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" /> 73 <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
68 <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" /> 74 <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" />
69 <WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" /> 75 <WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" />
70 76
71 <PackageGroup Id="NetFx48Redist"> 77 <PackageGroup Id="$(var.NetFx48RedistId)">
72 <ExePackage 78 <ExePackage
73 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;" 79 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
74 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;" 80 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
75 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;" 81 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
76 PerMachine="yes" 82 PerMachine="yes"
77 DetectCondition="!(wix.NetFx48RedistDetectCondition)" 83 DetectCondition="!(wix.NetFx48RedistDetectCondition)"
78 InstallCondition="!(wix.NetFx48RedistInstallCondition)" 84 InstallCondition="!(wix.NetFx48RedistInstallCondition)"
79 Id="NetFx48Redist" 85 Id="$(var.NetFx48RedistId)"
80 Vital="yes" 86 Vital="yes"
81 Permanent="yes" 87 Permanent="yes"
82 Protocol="netfx4" 88 Protocol="netfx4"
83 DownloadUrl="$(var.NetFx48RedistLink)" 89 DownloadUrl="$(var.NetFx48RedistLink)"
84 LogPathVariable="NetFx48FullLog" 90 LogPathVariable="NetFx48RedistLog"
85 Compressed="no" 91 Compressed="no"
86 Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe"> 92 Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe">
87 <RemotePayload 93 <RemotePayload
88 CertificatePublicKey="793980B0038EBF0A88DAA08420FD3E66F53CC0CE" 94 CertificatePublicKey="D17AFCE951979605250FAEBAFA7AE974899AED22"
89 CertificateThumbprint="9DC17888B5CFAD98B3CB35C1994E96227F061675" 95 CertificateThumbprint="C82273A065EC470FB1EBDE846A91E6FFB29E9C12"
90 Description="Microsoft .NET Framework 4.8 Setup" 96 Description="Microsoft .NET Framework 4.8 Setup"
91 Hash="0D425249D42A01E7AB3AC243152FA7773C43F0BF" 97 Hash="8DD233698D5EB4609B86C2AC917279FE39E0EF4C"
92 ProductName="Microsoft .NET Framework 4.8" 98 ProductName="Microsoft .NET Framework 4.8"
93 Size="72721568" 99 Size="117380440"
94 Version="4.8.3761.0" /> 100 Version="4.8.3928.0" />
95 </ExePackage> 101 </ExePackage>
96 </PackageGroup> 102 </PackageGroup>
97 </Fragment> 103 </Fragment>
104
105 <Fragment>
106 <PackageGroup Id="$(var.NetFx48RedistId)AsPrereq" />
107
108 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" />
109 </Fragment>
98</Wix> 110</Wix>
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index 371ee24d..7cbd4a2b 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -11,8 +11,6 @@
11 <Pedantic>true</Pedantic> 11 <Pedantic>true</Pedantic>
12 </PropertyGroup> 12 </PropertyGroup>
13 <ItemGroup> 13 <ItemGroup>
14 <Compile Include="NetFx472.wxs" />
15 <Compile Include="NetFx48.wxs" />
16 <Compile Include="NetFxExtension.wxs" /> 14 <Compile Include="NetFxExtension.wxs" />
17 <Compile Include="NetFx1.wxs" /> 15 <Compile Include="NetFx1.wxs" />
18 <Compile Include="NetFx1.1.wxs" /> 16 <Compile Include="NetFx1.1.wxs" />
@@ -26,6 +24,8 @@
26 <Compile Include="NetFx46.wxs" /> 24 <Compile Include="NetFx46.wxs" />
27 <Compile Include="NetFx461.wxs" /> 25 <Compile Include="NetFx461.wxs" />
28 <Compile Include="NetFx462.wxs" /> 26 <Compile Include="NetFx462.wxs" />
27 <Compile Include="NetFx472.wxs" />
28 <Compile Include="NetFx48.wxs" />
29 <Compile Include="NetFxExtension_x86.wxs" /> 29 <Compile Include="NetFxExtension_x86.wxs" />
30 <Compile Include="NetCore3.1.0_x64.wxs" /> 30 <Compile Include="NetCore3.1.0_x64.wxs" />
31 <Compile Include="NetCore3.1.0_x86.wxs" /> 31 <Compile Include="NetCore3.1.0_x86.wxs" />
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 05:34:03 +0000