diff options
Diffstat (limited to 'src/wixlib/NetFx452.wxs')
| -rw-r--r-- | src/wixlib/NetFx452.wxs | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/wixlib/NetFx452.wxs b/src/wixlib/NetFx452.wxs index ca8859c2..0e2ad0d6 100644 --- a/src/wixlib/NetFx452.wxs +++ b/src/wixlib/NetFx452.wxs | |||
| @@ -14,9 +14,9 @@ | |||
| 14 | --> | 14 | --> |
| 15 | 15 | ||
| 16 | <?define NetFx452MinRelease = 379893 ?> | 16 | <?define NetFx452MinRelease = 379893 ?> |
| 17 | <?define NetFx452WebLink = http://go.microsoft.com/fwlink/?LinkId=397707 ?> | 17 | <?define NetFx452WebLink = https://go.microsoft.com/fwlink/?LinkId=397707 ?> |
| 18 | <?define NetFx452RedistLink = http://go.microsoft.com/fwlink/?LinkId=397708 ?> | 18 | <?define NetFx452RedistLink = https://go.microsoft.com/fwlink/?LinkId=397708 ?> |
| 19 | <?define NetFx452EulaLink = http://wixtoolset.org/licenses/netfx452 ?> | 19 | <?define NetFx452EulaLink = https://wixtoolset.org/licenses/netfx452 ?> |
| 20 | <?define NetFx452WebId = NetFx452Web ?> | 20 | <?define NetFx452WebId = NetFx452Web ?> |
| 21 | <?define NetFx452RedistId = NetFx452Redist ?> | 21 | <?define NetFx452RedistId = NetFx452Redist ?> |
| 22 | 22 | ||
| @@ -35,9 +35,8 @@ | |||
| 35 | 35 | ||
| 36 | <PackageGroup Id="$(var.NetFx452WebId)"> | 36 | <PackageGroup Id="$(var.NetFx452WebId)"> |
| 37 | <ExePackage | 37 | <ExePackage |
| 38 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html"" | 38 | InstallArguments="/q /norestart /log "[NetFx452FullWebLog].html"" |
| 39 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html"" | 39 | UninstallArguments="/uninstall /q /norestart /log "[NetFx452FullWebLog].html"" |
| 40 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html"" | ||
| 41 | PerMachine="yes" | 40 | PerMachine="yes" |
| 42 | DetectCondition="!(wix.NetFx452WebDetectCondition)" | 41 | DetectCondition="!(wix.NetFx452WebDetectCondition)" |
| 43 | InstallCondition="!(wix.NetFx452WebInstallCondition)" | 42 | InstallCondition="!(wix.NetFx452WebInstallCondition)" |
| @@ -45,13 +44,12 @@ | |||
| 45 | Vital="yes" | 44 | Vital="yes" |
| 46 | Permanent="yes" | 45 | Permanent="yes" |
| 47 | Protocol="netfx4" | 46 | Protocol="netfx4" |
| 47 | LogPathVariable="NetFx452FullWebLog"> | ||
| 48 | <ExePackagePayload | ||
| 49 | Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe" | ||
| 48 | DownloadUrl="$(var.NetFx452WebLink)" | 50 | DownloadUrl="$(var.NetFx452WebLink)" |
| 49 | LogPathVariable="NetFx452FullWebLog" | ||
| 50 | Compressed="no" | ||
| 51 | Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe"> | ||
| 52 | <RemotePayload | ||
| 53 | Description="Microsoft .NET Framework 4.5.2 Setup" | 51 | Description="Microsoft .NET Framework 4.5.2 Setup" |
| 54 | Hash="5B71B20A455F6EEAB79DD1EDCAB0BA66AD0D2208" | 52 | Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E" |
| 55 | ProductName="Microsoft .NET Framework 4.5.2" | 53 | ProductName="Microsoft .NET Framework 4.5.2" |
| 56 | Size="1118920" | 54 | Size="1118920" |
| 57 | Version="4.5.51209.34209" /> | 55 | Version="4.5.51209.34209" /> |
| @@ -76,9 +74,8 @@ | |||
| 76 | 74 | ||
| 77 | <PackageGroup Id="$(var.NetFx452RedistId)"> | 75 | <PackageGroup Id="$(var.NetFx452RedistId)"> |
| 78 | <ExePackage | 76 | <ExePackage |
| 79 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html"" | 77 | InstallArguments="/q /norestart /log "[NetFx452FullLog].html"" |
| 80 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html"" | 78 | UninstallArguments="/uninstall /q /norestart /log "[NetFx452FullLog].html"" |
| 81 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html"" | ||
| 82 | PerMachine="yes" | 79 | PerMachine="yes" |
| 83 | DetectCondition="!(wix.NetFx452RedistDetectCondition)" | 80 | DetectCondition="!(wix.NetFx452RedistDetectCondition)" |
| 84 | InstallCondition="!(wix.NetFx452RedistInstallCondition)" | 81 | InstallCondition="!(wix.NetFx452RedistInstallCondition)" |
| @@ -86,13 +83,12 @@ | |||
| 86 | Vital="yes" | 83 | Vital="yes" |
| 87 | Permanent="yes" | 84 | Permanent="yes" |
| 88 | Protocol="netfx4" | 85 | Protocol="netfx4" |
| 86 | LogPathVariable="NetFx452FullLog"> | ||
| 87 | <ExePackagePayload | ||
| 88 | Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe" | ||
| 89 | DownloadUrl="$(var.NetFx452RedistLink)" | 89 | DownloadUrl="$(var.NetFx452RedistLink)" |
| 90 | LogPathVariable="NetFx452FullLog" | ||
| 91 | Compressed="no" | ||
| 92 | Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe"> | ||
| 93 | <RemotePayload | ||
| 94 | Description="Microsoft .NET Framework 4.5.2 Setup" | 90 | Description="Microsoft .NET Framework 4.5.2 Setup" |
| 95 | Hash="89F86F9522DC7A8A965FACCE839ABB790A285A63" | 91 | Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D" |
| 96 | ProductName="Microsoft .NET Framework 4.5.2" | 92 | ProductName="Microsoft .NET Framework 4.5.2" |
| 97 | Size="69999448" | 93 | Size="69999448" |
| 98 | Version="4.5.51209.34209" /> | 94 | Version="4.5.51209.34209" /> |