aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib/NetFx462.wxs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixlib/NetFx462.wxs')
-rw-r--r--src/wixlib/NetFx462.wxs49
1 files changed, 6 insertions, 43 deletions
diff --git a/src/wixlib/NetFx462.wxs b/src/wixlib/NetFx462.wxs
index 22cb70c9..52cd5b14 100644
--- a/src/wixlib/NetFx462.wxs
+++ b/src/wixlib/NetFx462.wxs
@@ -1,9 +1,6 @@
1<?xml version="1.0" encoding="utf-8"?> 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<!-- 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 2
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
5 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7 4
8 <!-- 5 <!--
9 .NET Framework installation state properties 6 .NET Framework installation state properties
@@ -34,25 +31,8 @@
34 <WixVariable Id="NetFx462WebPackageDirectory" Value="redist\" Overridable="yes" /> 31 <WixVariable Id="NetFx462WebPackageDirectory" Value="redist\" Overridable="yes" />
35 32
36 <PackageGroup Id="$(var.NetFx462WebId)"> 33 <PackageGroup Id="$(var.NetFx462WebId)">
37 <ExePackage 34 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx462WebDetectCondition)" InstallCondition="!(wix.NetFx462WebInstallCondition)" Id="$(var.NetFx462WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx462FullLog">
38 InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" 35 <ExePackagePayload Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe" DownloadUrl="$(var.NetFx462WebLink)" Description="Microsoft .NET Framework 4.6.2 Setup" Hash="31D7081BFFEEB5F32457096E51A29236306E5D971DE7EDB80A51188BCCDA9B9F17F0C3593D30828FC140B7A023F5B6842BC922F2023C7B8EA3786C2DBEC40472" ProductName="Microsoft .NET Framework 4.6.2" Size="1429344" Version="4.6.1590.0" />
39 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;"
40 PerMachine="yes"
41 DetectCondition="!(wix.NetFx462WebDetectCondition)"
42 InstallCondition="!(wix.NetFx462WebInstallCondition)"
43 Id="$(var.NetFx462WebId)"
44 Vital="yes"
45 Permanent="yes"
46 Protocol="netfx4"
47 LogPathVariable="NetFx462FullLog">
48 <ExePackagePayload
49 Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe"
50 DownloadUrl="$(var.NetFx462WebLink)"
51 Description="Microsoft .NET Framework 4.6.2 Setup"
52 Hash="31D7081BFFEEB5F32457096E51A29236306E5D971DE7EDB80A51188BCCDA9B9F17F0C3593D30828FC140B7A023F5B6842BC922F2023C7B8EA3786C2DBEC40472"
53 ProductName="Microsoft .NET Framework 4.6.2"
54 Size="1429344"
55 Version="4.6.1590.0" />
56 </ExePackage> 36 </ExePackage>
57 </PackageGroup> 37 </PackageGroup>
58 </Fragment> 38 </Fragment>
@@ -73,25 +53,8 @@
73 <WixVariable Id="NetFx462RedistPackageDirectory" Value="redist\" Overridable="yes" /> 53 <WixVariable Id="NetFx462RedistPackageDirectory" Value="redist\" Overridable="yes" />
74 54
75 <PackageGroup Id="$(var.NetFx462RedistId)"> 55 <PackageGroup Id="$(var.NetFx462RedistId)">
76 <ExePackage 56 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx462RedistDetectCondition)" InstallCondition="!(wix.NetFx462RedistInstallCondition)" Id="$(var.NetFx462RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx462FullLog">
77 InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" 57 <ExePackagePayload Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx462RedistLink)" Description="Microsoft .NET Framework 4.6.2 Setup" Hash="E183B33F93FD5F9AA93A1EC02103D2548CA22E3447EF2CEEDE89A5DEBEFC4F2C20990567EB17AFA412E0698D577ADDA373E433847EC8B79EC04BE3C86EDD9F0E" ProductName="Microsoft .NET Framework 4.6.2" Size="62008080" Version="4.6.1590.0" />
78 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;"
79 PerMachine="yes"
80 DetectCondition="!(wix.NetFx462RedistDetectCondition)"
81 InstallCondition="!(wix.NetFx462RedistInstallCondition)"
82 Id="$(var.NetFx462RedistId)"
83 Vital="yes"
84 Permanent="yes"
85 Protocol="netfx4"
86 LogPathVariable="NetFx462FullLog">
87 <ExePackagePayload
88 Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe"
89 DownloadUrl="$(var.NetFx462RedistLink)"
90 Description="Microsoft .NET Framework 4.6.2 Setup"
91 Hash="E183B33F93FD5F9AA93A1EC02103D2548CA22E3447EF2CEEDE89A5DEBEFC4F2C20990567EB17AFA412E0698D577ADDA373E433847EC8B79EC04BE3C86EDD9F0E"
92 ProductName="Microsoft .NET Framework 4.6.2"
93 Size="62008080"
94 Version="4.6.1590.0" />
95 </ExePackage> 58 </ExePackage>
96 </PackageGroup> 59 </PackageGroup>
97 </Fragment> 60 </Fragment>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-12 08:56:11 +0000