diff options
Diffstat (limited to 'src/wixlib/NetFx452.wxs')
| -rw-r--r-- | src/wixlib/NetFx452.wxs | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/wixlib/NetFx452.wxs b/src/wixlib/NetFx452.wxs index 1dfa6600..ca8859c2 100644 --- a/src/wixlib/NetFx452.wxs +++ b/src/wixlib/NetFx452.wxs | |||
| @@ -35,9 +35,9 @@ | |||
| 35 | 35 | ||
| 36 | <PackageGroup Id="$(var.NetFx452WebId)"> | 36 | <PackageGroup Id="$(var.NetFx452WebId)"> |
| 37 | <ExePackage | 37 | <ExePackage |
| 38 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html"" | 38 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html"" |
| 39 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html"" | 39 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html"" |
| 40 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html"" | 40 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html"" |
| 41 | PerMachine="yes" | 41 | PerMachine="yes" |
| 42 | DetectCondition="!(wix.NetFx452WebDetectCondition)" | 42 | DetectCondition="!(wix.NetFx452WebDetectCondition)" |
| 43 | InstallCondition="!(wix.NetFx452WebInstallCondition)" | 43 | InstallCondition="!(wix.NetFx452WebInstallCondition)" |
| @@ -49,13 +49,12 @@ | |||
| 49 | LogPathVariable="NetFx452FullWebLog" | 49 | LogPathVariable="NetFx452FullWebLog" |
| 50 | Compressed="no" | 50 | Compressed="no" |
| 51 | Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe"> | 51 | Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe"> |
| 52 | <RemotePayload CertificatePublicKey="B78FE7F6917E1BC5F4A9C77BA3D555A0E807B9E0" | 52 | <RemotePayload |
| 53 | CertificateThumbprint="67B1757863E3EFF760EA9EBB02849AF07D3A8080" | 53 | Description="Microsoft .NET Framework 4.5.2 Setup" |
| 54 | Description="Microsoft .NET Framework 4.5.2 Setup" | 54 | Hash="5B71B20A455F6EEAB79DD1EDCAB0BA66AD0D2208" |
| 55 | Hash="5B71B20A455F6EEAB79DD1EDCAB0BA66AD0D2208" | 55 | ProductName="Microsoft .NET Framework 4.5.2" |
| 56 | ProductName="Microsoft .NET Framework 4.5.2" | 56 | Size="1118920" |
| 57 | Size="1118920" | 57 | Version="4.5.51209.34209" /> |
| 58 | Version="4.5.51209.34209" /> | ||
| 59 | </ExePackage> | 58 | </ExePackage> |
| 60 | </PackageGroup> | 59 | </PackageGroup> |
| 61 | </Fragment> | 60 | </Fragment> |
| @@ -77,9 +76,9 @@ | |||
| 77 | 76 | ||
| 78 | <PackageGroup Id="$(var.NetFx452RedistId)"> | 77 | <PackageGroup Id="$(var.NetFx452RedistId)"> |
| 79 | <ExePackage | 78 | <ExePackage |
| 80 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html"" | 79 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html"" |
| 81 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html"" | 80 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html"" |
| 82 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html"" | 81 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html"" |
| 83 | PerMachine="yes" | 82 | PerMachine="yes" |
| 84 | DetectCondition="!(wix.NetFx452RedistDetectCondition)" | 83 | DetectCondition="!(wix.NetFx452RedistDetectCondition)" |
| 85 | InstallCondition="!(wix.NetFx452RedistInstallCondition)" | 84 | InstallCondition="!(wix.NetFx452RedistInstallCondition)" |
| @@ -92,8 +91,6 @@ | |||
| 92 | Compressed="no" | 91 | Compressed="no" |
| 93 | Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe"> | 92 | Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe"> |
| 94 | <RemotePayload | 93 | <RemotePayload |
| 95 | CertificatePublicKey="B78FE7F6917E1BC5F4A9C77BA3D555A0E807B9E0" | ||
| 96 | CertificateThumbprint="67B1757863E3EFF760EA9EBB02849AF07D3A8080" | ||
| 97 | Description="Microsoft .NET Framework 4.5.2 Setup" | 94 | Description="Microsoft .NET Framework 4.5.2 Setup" |
| 98 | Hash="89F86F9522DC7A8A965FACCE839ABB790A285A63" | 95 | Hash="89F86F9522DC7A8A965FACCE839ABB790A285A63" |
| 99 | ProductName="Microsoft .NET Framework 4.5.2" | 96 | ProductName="Microsoft .NET Framework 4.5.2" |