diff options
Diffstat (limited to 'src/wixlib/NetFx4.5.wxs')
| -rw-r--r-- | src/wixlib/NetFx4.5.wxs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/wixlib/NetFx4.5.wxs b/src/wixlib/NetFx4.5.wxs index ea8b66c5..883c34da 100644 --- a/src/wixlib/NetFx4.5.wxs +++ b/src/wixlib/NetFx4.5.wxs | |||
| @@ -46,9 +46,9 @@ | |||
| 46 | 46 | ||
| 47 | <PackageGroup Id="$(var.NetFx45WebId)"> | 47 | <PackageGroup Id="$(var.NetFx45WebId)"> |
| 48 | <ExePackage | 48 | <ExePackage |
| 49 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullWebLog].html"" | 49 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullWebLog].html"" |
| 50 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx45FullWebLog].html"" | 50 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx45FullWebLog].html"" |
| 51 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullWebLog].html"" | 51 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullWebLog].html"" |
| 52 | PerMachine="yes" | 52 | PerMachine="yes" |
| 53 | DetectCondition="!(wix.NetFx45WebDetectCondition)" | 53 | DetectCondition="!(wix.NetFx45WebDetectCondition)" |
| 54 | InstallCondition="!(wix.NetFx45WebInstallCondition)" | 54 | InstallCondition="!(wix.NetFx45WebInstallCondition)" |
| @@ -65,8 +65,6 @@ | |||
| 65 | Version="4.5.50709.17929" | 65 | Version="4.5.50709.17929" |
| 66 | ProductName="Microsoft .NET Framework 4.5" | 66 | ProductName="Microsoft .NET Framework 4.5" |
| 67 | Description="Microsoft .NET Framework 4.5 Setup" | 67 | Description="Microsoft .NET Framework 4.5 Setup" |
| 68 | CertificatePublicKey="BE931A1B869E4BB989C2B32D0C105204ECBEFB3D" | ||
| 69 | CertificateThumbprint="8363887511B4835B79C383ECF06FC055B5839255" | ||
| 70 | Hash="F6BA6F03C65C3996A258F58324A917463B2D6FF4"/> | 68 | Hash="F6BA6F03C65C3996A258F58324A917463B2D6FF4"/> |
| 71 | </ExePackage> | 69 | </ExePackage> |
| 72 | </PackageGroup> | 70 | </PackageGroup> |
| @@ -89,9 +87,9 @@ | |||
| 89 | 87 | ||
| 90 | <PackageGroup Id="$(var.NetFx45RedistId)"> | 88 | <PackageGroup Id="$(var.NetFx45RedistId)"> |
| 91 | <ExePackage | 89 | <ExePackage |
| 92 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullLog].html"" | 90 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullLog].html"" |
| 93 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx45FullLog].html"" | 91 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx45FullLog].html"" |
| 94 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullLog].html"" | 92 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullLog].html"" |
| 95 | PerMachine="yes" | 93 | PerMachine="yes" |
| 96 | DetectCondition="!(wix.NetFx45RedistDetectCondition)" | 94 | DetectCondition="!(wix.NetFx45RedistDetectCondition)" |
| 97 | InstallCondition="!(wix.NetFx45RedistInstallCondition)" | 95 | InstallCondition="!(wix.NetFx45RedistInstallCondition)" |
| @@ -108,8 +106,6 @@ | |||
| 108 | Version="4.5.50709.17929" | 106 | Version="4.5.50709.17929" |
| 109 | ProductName="Microsoft .NET Framework 4.5" | 107 | ProductName="Microsoft .NET Framework 4.5" |
| 110 | Description="Microsoft .NET Framework 4.5 Setup" | 108 | Description="Microsoft .NET Framework 4.5 Setup" |
| 111 | CertificatePublicKey="BE931A1B869E4BB989C2B32D0C105204ECBEFB3D" | ||
| 112 | CertificateThumbprint="8363887511B4835B79C383ECF06FC055B5839255" | ||
| 113 | Hash="B2FF712CA0947040CA0B8E9BD7436A3C3524BB5D"/> | 109 | Hash="B2FF712CA0947040CA0B8E9BD7436A3C3524BB5D"/> |
| 114 | </ExePackage> | 110 | </ExePackage> |
| 115 | </PackageGroup> | 111 | </PackageGroup> |