aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib/NetFx46.wxs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixlib/NetFx46.wxs')
-rw-r--r--src/wixlib/NetFx46.wxs16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/wixlib/NetFx46.wxs b/src/wixlib/NetFx46.wxs
index c185f339..dbe629ac 100644
--- a/src/wixlib/NetFx46.wxs
+++ b/src/wixlib/NetFx46.wxs
@@ -36,9 +36,9 @@
36 36
37 <PackageGroup Id="$(var.NetFx46WebId)"> 37 <PackageGroup Id="$(var.NetFx46WebId)">
38 <ExePackage 38 <ExePackage
39 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 39 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
40 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 40 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
41 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 41 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
42 PerMachine="yes" 42 PerMachine="yes"
43 DetectCondition="!(wix.NetFx46WebDetectCondition)" 43 DetectCondition="!(wix.NetFx46WebDetectCondition)"
44 InstallCondition="!(wix.NetFx46WebInstallCondition)" 44 InstallCondition="!(wix.NetFx46WebInstallCondition)"
@@ -51,8 +51,6 @@
51 Compressed="no" 51 Compressed="no"
52 Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe"> 52 Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe">
53 <RemotePayload 53 <RemotePayload
54 CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0"
55 CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"
56 Description="Microsoft .NET Framework 4.6 Setup" 54 Description="Microsoft .NET Framework 4.6 Setup"
57 Hash="480CA134B9E3F2437DF10719D5A8C77DDEC0A4F1" 55 Hash="480CA134B9E3F2437DF10719D5A8C77DDEC0A4F1"
58 ProductName="Microsoft .NET Framework 4.6" 56 ProductName="Microsoft .NET Framework 4.6"
@@ -79,9 +77,9 @@
79 77
80 <PackageGroup Id="$(var.NetFx46RedistId)"> 78 <PackageGroup Id="$(var.NetFx46RedistId)">
81 <ExePackage 79 <ExePackage
82 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 80 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
83 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 81 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
84 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 82 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
85 PerMachine="yes" 83 PerMachine="yes"
86 DetectCondition="!(wix.NetFx46RedistDetectCondition)" 84 DetectCondition="!(wix.NetFx46RedistDetectCondition)"
87 InstallCondition="!(wix.NetFx46RedistInstallCondition)" 85 InstallCondition="!(wix.NetFx46RedistInstallCondition)"
@@ -94,8 +92,6 @@
94 Compressed="no" 92 Compressed="no"
95 Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe"> 93 Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe">
96 <RemotePayload 94 <RemotePayload
97 CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0"
98 CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"
99 Description="Microsoft .NET Framework 4.6 Setup" 95 Description="Microsoft .NET Framework 4.6 Setup"
100 Hash="3049A85843EAF65E89E2336D5FE6E85E416797BE" 96 Hash="3049A85843EAF65E89E2336D5FE6E85E416797BE"
101 ProductName="Microsoft .NET Framework 4.6" 97 ProductName="Microsoft .NET Framework 4.6"