diff options
Diffstat (limited to 'src/ext/NetFx/wixlib/NetFx452.wxs')
| -rw-r--r-- | src/ext/NetFx/wixlib/NetFx452.wxs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ext/NetFx/wixlib/NetFx452.wxs b/src/ext/NetFx/wixlib/NetFx452.wxs index 33f79db4..6c55a563 100644 --- a/src/ext/NetFx/wixlib/NetFx452.wxs +++ b/src/ext/NetFx/wixlib/NetFx452.wxs | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" /> | 31 | <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" /> |
| 32 | 32 | ||
| 33 | <PackageGroup Id="$(var.NetFx452WebId)"> | 33 | <PackageGroup Id="$(var.NetFx452WebId)"> |
| 34 | <ExePackage InstallArguments="/q /norestart /log "[NetFx452FullWebLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx452FullWebLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx452WebDetectCondition)" InstallCondition="!(wix.NetFx452WebInstallCondition)" Id="$(var.NetFx452WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullWebLog"> | 34 | <ExePackage InstallArguments="/q /norestart /log "[NetFx452FullWebLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx452WebDetectCondition)" InstallCondition="!(wix.NetFx452WebInstallCondition)" Id="$(var.NetFx452WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullWebLog" Cache="no"> |
| 35 | <ExePackagePayload Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe" DownloadUrl="$(var.NetFx452WebLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E" ProductName="Microsoft .NET Framework 4.5.2" Size="1118920" Version="4.5.51209.34209" /> | 35 | <ExePackagePayload Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe" DownloadUrl="$(var.NetFx452WebLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E" ProductName="Microsoft .NET Framework 4.5.2" Size="1118920" Version="4.5.51209.34209" /> |
| 36 | </ExePackage> | 36 | </ExePackage> |
| 37 | </PackageGroup> | 37 | </PackageGroup> |
| @@ -53,7 +53,7 @@ | |||
| 53 | <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" /> | 53 | <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" /> |
| 54 | 54 | ||
| 55 | <PackageGroup Id="$(var.NetFx452RedistId)"> | 55 | <PackageGroup Id="$(var.NetFx452RedistId)"> |
| 56 | <ExePackage InstallArguments="/q /norestart /log "[NetFx452FullLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx452FullLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx452RedistDetectCondition)" InstallCondition="!(wix.NetFx452RedistInstallCondition)" Id="$(var.NetFx452RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullLog"> | 56 | <ExePackage InstallArguments="/q /norestart /log "[NetFx452FullLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx452RedistDetectCondition)" InstallCondition="!(wix.NetFx452RedistInstallCondition)" Id="$(var.NetFx452RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullLog" Cache="no"> |
| 57 | <ExePackagePayload Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx452RedistLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D" ProductName="Microsoft .NET Framework 4.5.2" Size="69999448" Version="4.5.51209.34209" /> | 57 | <ExePackagePayload Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx452RedistLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D" ProductName="Microsoft .NET Framework 4.5.2" Size="69999448" Version="4.5.51209.34209" /> |
| 58 | </ExePackage> | 58 | </ExePackage> |
| 59 | </PackageGroup> | 59 | </PackageGroup> |