diff options
Diffstat (limited to 'src/wixlib/NetFx451.wxs')
| -rw-r--r-- | src/wixlib/NetFx451.wxs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/wixlib/NetFx451.wxs b/src/wixlib/NetFx451.wxs index 145de6d9..266a744b 100644 --- a/src/wixlib/NetFx451.wxs +++ b/src/wixlib/NetFx451.wxs | |||
| @@ -36,9 +36,9 @@ | |||
| 36 | 36 | ||
| 37 | <PackageGroup Id="$(var.NetFx451WebId)"> | 37 | <PackageGroup Id="$(var.NetFx451WebId)"> |
| 38 | <ExePackage | 38 | <ExePackage |
| 39 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html"" | 39 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html"" |
| 40 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html"" | 40 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html"" |
| 41 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html"" | 41 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html"" |
| 42 | PerMachine="yes" | 42 | PerMachine="yes" |
| 43 | DetectCondition="!(wix.NetFx451WebDetectCondition)" | 43 | DetectCondition="!(wix.NetFx451WebDetectCondition)" |
| 44 | InstallCondition="!(wix.NetFx451WebInstallCondition)" | 44 | InstallCondition="!(wix.NetFx451WebInstallCondition)" |
| @@ -55,8 +55,6 @@ | |||
| 55 | Version="4.5.50938.18408" | 55 | Version="4.5.50938.18408" |
| 56 | ProductName="Microsoft .NET Framework 4.5.1" | 56 | ProductName="Microsoft .NET Framework 4.5.1" |
| 57 | Description="Microsoft .NET Framework 4.5.1 Setup" | 57 | Description="Microsoft .NET Framework 4.5.1 Setup" |
| 58 | CertificatePublicKey="A260A870BE1145ED71E2BB5AA19463A4FE9DCC41" | ||
| 59 | CertificateThumbprint="108E2BA23632620C427C570B6D9DB51AC31387FE" | ||
| 60 | Hash="4CBEA1E408DB5B423E130931B9478972E6798431" /> | 58 | Hash="4CBEA1E408DB5B423E130931B9478972E6798431" /> |
| 61 | </ExePackage> | 59 | </ExePackage> |
| 62 | </PackageGroup> | 60 | </PackageGroup> |
| @@ -79,9 +77,9 @@ | |||
| 79 | 77 | ||
| 80 | <PackageGroup Id="$(var.NetFx451RedistId)"> | 78 | <PackageGroup Id="$(var.NetFx451RedistId)"> |
| 81 | <ExePackage | 79 | <ExePackage |
| 82 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html"" | 80 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html"" |
| 83 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html"" | 81 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html"" |
| 84 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html"" | 82 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html"" |
| 85 | PerMachine="yes" | 83 | PerMachine="yes" |
| 86 | DetectCondition="!(wix.NetFx451RedistDetectCondition)" | 84 | DetectCondition="!(wix.NetFx451RedistDetectCondition)" |
| 87 | InstallCondition="!(wix.NetFx451RedistInstallCondition)" | 85 | InstallCondition="!(wix.NetFx451RedistInstallCondition)" |
| @@ -98,8 +96,6 @@ | |||
| 98 | Version="4.5.50938.18408" | 96 | Version="4.5.50938.18408" |
| 99 | ProductName="Microsoft .NET Framework 4.5.1" | 97 | ProductName="Microsoft .NET Framework 4.5.1" |
| 100 | Description="Microsoft .NET Framework 4.5.1 Setup" | 98 | Description="Microsoft .NET Framework 4.5.1 Setup" |
| 101 | CertificatePublicKey="A260A870BE1145ED71E2BB5AA19463A4FE9DCC41" | ||
| 102 | CertificateThumbprint="108E2BA23632620C427C570B6D9DB51AC31387FE" | ||
| 103 | Hash="5934DD101414BBC0B7F1EE2780D2FC8B9BEC5C4D" /> | 99 | Hash="5934DD101414BBC0B7F1EE2780D2FC8B9BEC5C4D" /> |
| 104 | </ExePackage> | 100 | </ExePackage> |
| 105 | </PackageGroup> | 101 | </PackageGroup> |