diff options
Diffstat (limited to 'src/wixlib/NetFx472.wxs')
-rw-r--r-- | src/wixlib/NetFx472.wxs | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/wixlib/NetFx472.wxs b/src/wixlib/NetFx472.wxs index bb439649..35a3453a 100644 --- a/src/wixlib/NetFx472.wxs +++ b/src/wixlib/NetFx472.wxs | |||
@@ -33,9 +33,8 @@ | |||
33 | 33 | ||
34 | <PackageGroup Id="$(var.NetFx472WebId)"> | 34 | <PackageGroup Id="$(var.NetFx472WebId)"> |
35 | <ExePackage | 35 | <ExePackage |
36 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472WebLog].html"" | 36 | InstallArguments="/q /norestart /log "[NetFx472WebLog].html"" |
37 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx472WebLog].html"" | 37 | UninstallArguments="/uninstall /q /norestart /log "[NetFx472WebLog].html"" |
38 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472WebLog].html"" | ||
39 | PerMachine="yes" | 38 | PerMachine="yes" |
40 | DetectCondition="!(wix.NetFx472WebDetectCondition)" | 39 | DetectCondition="!(wix.NetFx472WebDetectCondition)" |
41 | InstallCondition="!(wix.NetFx472WebInstallCondition)" | 40 | InstallCondition="!(wix.NetFx472WebInstallCondition)" |
@@ -43,13 +42,12 @@ | |||
43 | Vital="yes" | 42 | Vital="yes" |
44 | Permanent="yes" | 43 | Permanent="yes" |
45 | Protocol="netfx4" | 44 | Protocol="netfx4" |
45 | LogPathVariable="NetFx472WebLog"> | ||
46 | <ExePackagePayload | ||
47 | Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe" | ||
46 | DownloadUrl="$(var.NetFx472WebLink)" | 48 | DownloadUrl="$(var.NetFx472WebLink)" |
47 | LogPathVariable="NetFx472WebLog" | ||
48 | Compressed="no" | ||
49 | Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe"> | ||
50 | <RemotePayload | ||
51 | Description="Microsoft .NET Framework 4.7.2 Setup" | 49 | Description="Microsoft .NET Framework 4.7.2 Setup" |
52 | Hash="CEDBBF404B166A5E72D035760BCB0FA508E4F4CB" | 50 | Hash="37006954E3AFE07FB02D24894CC34794618B78C27A1B514818985B6CC1FA3E896ED99BA2E4AAC3F6469D263819BD94EE70E7113946C51BA83C93B74826FC8FA8" |
53 | ProductName="Microsoft .NET Framework 4.7.2" | 51 | ProductName="Microsoft .NET Framework 4.7.2" |
54 | Size="1432848" | 52 | Size="1432848" |
55 | Version="4.7.3081.0" /> | 53 | Version="4.7.3081.0" /> |
@@ -74,9 +72,8 @@ | |||
74 | 72 | ||
75 | <PackageGroup Id="$(var.NetFx472RedistId)"> | 73 | <PackageGroup Id="$(var.NetFx472RedistId)"> |
76 | <ExePackage | 74 | <ExePackage |
77 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472RedistLog].html"" | 75 | InstallArguments="/q /norestart /log "[NetFx472RedistLog].html"" |
78 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx472RedistLog].html"" | 76 | UninstallArguments="/uninstall /q /norestart /log "[NetFx472RedistLog].html"" |
79 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472RedistLog].html"" | ||
80 | PerMachine="yes" | 77 | PerMachine="yes" |
81 | DetectCondition="!(wix.NetFx472RedistDetectCondition)" | 78 | DetectCondition="!(wix.NetFx472RedistDetectCondition)" |
82 | InstallCondition="!(wix.NetFx472RedistInstallCondition)" | 79 | InstallCondition="!(wix.NetFx472RedistInstallCondition)" |
@@ -84,13 +81,12 @@ | |||
84 | Vital="yes" | 81 | Vital="yes" |
85 | Permanent="yes" | 82 | Permanent="yes" |
86 | Protocol="netfx4" | 83 | Protocol="netfx4" |
84 | LogPathVariable="NetFx472RedistLog"> | ||
85 | <ExePackagePayload | ||
86 | Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe" | ||
87 | DownloadUrl="$(var.NetFx472RedistLink)" | 87 | DownloadUrl="$(var.NetFx472RedistLink)" |
88 | LogPathVariable="NetFx472RedistLog" | ||
89 | Compressed="no" | ||
90 | Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe"> | ||
91 | <RemotePayload | ||
92 | Description="Microsoft .NET Framework 4.7.2 Setup" | 88 | Description="Microsoft .NET Framework 4.7.2 Setup" |
93 | Hash="31FC0D305A6F651C9E892C98EB10997AE885EB1E" | 89 | Hash="36F295ED19A5BD5C5F05803BA26EFD17D419ABC7A791312AD011B63A4402492529AED0FB4D45FF1F74381079A310B33649C9C56C36E815B12E79ECD671897489" |
94 | ProductName="Microsoft .NET Framework 4.7.2" | 90 | ProductName="Microsoft .NET Framework 4.7.2" |
95 | Size="83943272" | 91 | Size="83943272" |
96 | Version="4.7.3081.0" /> | 92 | Version="4.7.3081.0" /> |