diff options
Diffstat (limited to 'src/wixlib/NetFx461.wxs')
| -rw-r--r-- | src/wixlib/NetFx461.wxs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/wixlib/NetFx461.wxs b/src/wixlib/NetFx461.wxs index 5a43929f..900080cc 100644 --- a/src/wixlib/NetFx461.wxs +++ b/src/wixlib/NetFx461.wxs | |||
| @@ -35,9 +35,9 @@ | |||
| 35 | 35 | ||
| 36 | <PackageGroup Id="$(var.NetFx461WebId)"> | 36 | <PackageGroup Id="$(var.NetFx461WebId)"> |
| 37 | <ExePackage | 37 | <ExePackage |
| 38 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | 38 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" |
| 39 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | 39 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" |
| 40 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | 40 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" |
| 41 | PerMachine="yes" | 41 | PerMachine="yes" |
| 42 | DetectCondition="!(wix.NetFx461WebDetectCondition)" | 42 | DetectCondition="!(wix.NetFx461WebDetectCondition)" |
| 43 | InstallCondition="!(wix.NetFx461WebInstallCondition)" | 43 | InstallCondition="!(wix.NetFx461WebInstallCondition)" |
| @@ -50,8 +50,6 @@ | |||
| 50 | Compressed="no" | 50 | Compressed="no" |
| 51 | Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe"> | 51 | Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe"> |
| 52 | <RemotePayload | 52 | <RemotePayload |
| 53 | CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0" | ||
| 54 | CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" | ||
| 55 | Description="Microsoft .NET Framework 4.6.1 Setup" | 53 | Description="Microsoft .NET Framework 4.6.1 Setup" |
| 56 | Hash="EE88B05232F43B517D4A368F7EE5065CDE7F67FA" | 54 | Hash="EE88B05232F43B517D4A368F7EE5065CDE7F67FA" |
| 57 | ProductName="Microsoft .NET Framework 4.6.1" | 55 | ProductName="Microsoft .NET Framework 4.6.1" |
| @@ -78,9 +76,9 @@ | |||
| 78 | 76 | ||
| 79 | <PackageGroup Id="$(var.NetFx461RedistId)"> | 77 | <PackageGroup Id="$(var.NetFx461RedistId)"> |
| 80 | <ExePackage | 78 | <ExePackage |
| 81 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | 79 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" |
| 82 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | 80 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" |
| 83 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | 81 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" |
| 84 | PerMachine="yes" | 82 | PerMachine="yes" |
| 85 | DetectCondition="!(wix.NetFx461RedistDetectCondition)" | 83 | DetectCondition="!(wix.NetFx461RedistDetectCondition)" |
| 86 | InstallCondition="!(wix.NetFx461RedistInstallCondition)" | 84 | InstallCondition="!(wix.NetFx461RedistInstallCondition)" |
| @@ -93,8 +91,6 @@ | |||
| 93 | Compressed="no" | 91 | Compressed="no" |
| 94 | Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe"> | 92 | Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe"> |
| 95 | <RemotePayload | 93 | <RemotePayload |
| 96 | CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0" | ||
| 97 | CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" | ||
| 98 | Description="Microsoft .NET Framework 4.6.1 Setup" | 94 | Description="Microsoft .NET Framework 4.6.1 Setup" |
| 99 | Hash="83D048D171FF44A3CAD9B422137656F585295866" | 95 | Hash="83D048D171FF44A3CAD9B422137656F585295866" |
| 100 | ProductName="Microsoft .NET Framework 4.6.1" | 96 | ProductName="Microsoft .NET Framework 4.6.1" |