diff options
Diffstat (limited to 'src/wixlib/NetFx472.wxs')
| -rw-r--r-- | src/wixlib/NetFx472.wxs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/wixlib/NetFx472.wxs b/src/wixlib/NetFx472.wxs index f17e9997..bb439649 100644 --- a/src/wixlib/NetFx472.wxs +++ b/src/wixlib/NetFx472.wxs | |||
| @@ -33,9 +33,9 @@ | |||
| 33 | 33 | ||
| 34 | <PackageGroup Id="$(var.NetFx472WebId)"> | 34 | <PackageGroup Id="$(var.NetFx472WebId)"> |
| 35 | <ExePackage | 35 | <ExePackage |
| 36 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472WebLog].html"" | 36 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472WebLog].html"" |
| 37 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx472WebLog].html"" | 37 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx472WebLog].html"" |
| 38 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472WebLog].html"" | 38 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472WebLog].html"" |
| 39 | PerMachine="yes" | 39 | PerMachine="yes" |
| 40 | DetectCondition="!(wix.NetFx472WebDetectCondition)" | 40 | DetectCondition="!(wix.NetFx472WebDetectCondition)" |
| 41 | InstallCondition="!(wix.NetFx472WebInstallCondition)" | 41 | InstallCondition="!(wix.NetFx472WebInstallCondition)" |
| @@ -48,8 +48,6 @@ | |||
| 48 | Compressed="no" | 48 | Compressed="no" |
| 49 | Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe"> | 49 | Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe"> |
| 50 | <RemotePayload | 50 | <RemotePayload |
| 51 | CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2" | ||
| 52 | CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17" | ||
| 53 | Description="Microsoft .NET Framework 4.7.2 Setup" | 51 | Description="Microsoft .NET Framework 4.7.2 Setup" |
| 54 | Hash="CEDBBF404B166A5E72D035760BCB0FA508E4F4CB" | 52 | Hash="CEDBBF404B166A5E72D035760BCB0FA508E4F4CB" |
| 55 | ProductName="Microsoft .NET Framework 4.7.2" | 53 | ProductName="Microsoft .NET Framework 4.7.2" |
| @@ -76,9 +74,9 @@ | |||
| 76 | 74 | ||
| 77 | <PackageGroup Id="$(var.NetFx472RedistId)"> | 75 | <PackageGroup Id="$(var.NetFx472RedistId)"> |
| 78 | <ExePackage | 76 | <ExePackage |
| 79 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472RedistLog].html"" | 77 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472RedistLog].html"" |
| 80 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx472RedistLog].html"" | 78 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx472RedistLog].html"" |
| 81 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472RedistLog].html"" | 79 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472RedistLog].html"" |
| 82 | PerMachine="yes" | 80 | PerMachine="yes" |
| 83 | DetectCondition="!(wix.NetFx472RedistDetectCondition)" | 81 | DetectCondition="!(wix.NetFx472RedistDetectCondition)" |
| 84 | InstallCondition="!(wix.NetFx472RedistInstallCondition)" | 82 | InstallCondition="!(wix.NetFx472RedistInstallCondition)" |
| @@ -91,8 +89,6 @@ | |||
| 91 | Compressed="no" | 89 | Compressed="no" |
| 92 | Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe"> | 90 | Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe"> |
| 93 | <RemotePayload | 91 | <RemotePayload |
| 94 | CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2" | ||
| 95 | CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17" | ||
| 96 | Description="Microsoft .NET Framework 4.7.2 Setup" | 92 | Description="Microsoft .NET Framework 4.7.2 Setup" |
| 97 | Hash="31FC0D305A6F651C9E892C98EB10997AE885EB1E" | 93 | Hash="31FC0D305A6F651C9E892C98EB10997AE885EB1E" |
| 98 | ProductName="Microsoft .NET Framework 4.7.2" | 94 | ProductName="Microsoft .NET Framework 4.7.2" |