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