diff options
Diffstat (limited to 'src/wixlib/NetFx4.wxs')
| -rw-r--r-- | src/wixlib/NetFx4.wxs | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/wixlib/NetFx4.wxs b/src/wixlib/NetFx4.wxs index ac463c3c..8816a235 100644 --- a/src/wixlib/NetFx4.wxs +++ b/src/wixlib/NetFx4.wxs | |||
| @@ -45,9 +45,9 @@ | |||
| 45 | 45 | ||
| 46 | <PackageGroup Id="$(var.NetFx40WebId)"> | 46 | <PackageGroup Id="$(var.NetFx40WebId)"> |
| 47 | <ExePackage | 47 | <ExePackage |
| 48 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]"" | 48 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]"" |
| 49 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]"" | 49 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]"" |
| 50 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]"" | 50 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]"" |
| 51 | PerMachine="yes" | 51 | PerMachine="yes" |
| 52 | DetectCondition="NETFRAMEWORK40" | 52 | DetectCondition="NETFRAMEWORK40" |
| 53 | Id="$(var.NetFx40WebId)" | 53 | Id="$(var.NetFx40WebId)" |
| @@ -62,8 +62,6 @@ | |||
| 62 | Version="4.0.30319.1" | 62 | Version="4.0.30319.1" |
| 63 | ProductName="Microsoft .NET Framework 4" | 63 | ProductName="Microsoft .NET Framework 4" |
| 64 | Description="Microsoft .NET Framework 4 Setup" | 64 | Description="Microsoft .NET Framework 4 Setup" |
| 65 | CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6" | ||
| 66 | CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F" | ||
| 67 | Hash="06BECADB92A5FCCA2529C0B93687C2A0C6D0D610"/> | 65 | Hash="06BECADB92A5FCCA2529C0B93687C2A0C6D0D610"/> |
| 68 | </ExePackage> | 66 | </ExePackage> |
| 69 | </PackageGroup> | 67 | </PackageGroup> |
| @@ -82,9 +80,9 @@ | |||
| 82 | 80 | ||
| 83 | <PackageGroup Id="$(var.NetFx40RedistId)"> | 81 | <PackageGroup Id="$(var.NetFx40RedistId)"> |
| 84 | <ExePackage | 82 | <ExePackage |
| 85 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]"" | 83 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]"" |
| 86 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]"" | 84 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]"" |
| 87 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]"" | 85 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]"" |
| 88 | PerMachine="yes" | 86 | PerMachine="yes" |
| 89 | DetectCondition="NETFRAMEWORK40" | 87 | DetectCondition="NETFRAMEWORK40" |
| 90 | Id="$(var.NetFx40RedistId)" | 88 | Id="$(var.NetFx40RedistId)" |
| @@ -99,8 +97,6 @@ | |||
| 99 | Version="4.0.30319.1" | 97 | Version="4.0.30319.1" |
| 100 | ProductName="Microsoft .NET Framework 4" | 98 | ProductName="Microsoft .NET Framework 4" |
| 101 | Description="Microsoft .NET Framework 4 Setup" | 99 | Description="Microsoft .NET Framework 4 Setup" |
| 102 | CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6" | ||
| 103 | CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F" | ||
| 104 | Hash="58DA3D74DB353AAD03588CBB5CEA8234166D8B99"/> | 100 | Hash="58DA3D74DB353AAD03588CBB5CEA8234166D8B99"/> |
| 105 | </ExePackage> | 101 | </ExePackage> |
| 106 | </PackageGroup> | 102 | </PackageGroup> |
| @@ -129,9 +125,9 @@ | |||
| 129 | 125 | ||
| 130 | <PackageGroup Id="$(var.NetFx40ClientWebId)"> | 126 | <PackageGroup Id="$(var.NetFx40ClientWebId)"> |
| 131 | <ExePackage | 127 | <ExePackage |
| 132 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]"" | 128 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]"" |
| 133 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]"" | 129 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]"" |
| 134 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]"" | 130 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]"" |
| 135 | PerMachine="yes" | 131 | PerMachine="yes" |
| 136 | DetectCondition="NETFRAMEWORK40CLIENT" | 132 | DetectCondition="NETFRAMEWORK40CLIENT" |
| 137 | Id="$(var.NetFx40ClientWebId)" | 133 | Id="$(var.NetFx40ClientWebId)" |
| @@ -146,8 +142,6 @@ | |||
| 146 | Version="4.0.30319.1" | 142 | Version="4.0.30319.1" |
| 147 | ProductName="Microsoft .NET Framework 4 Client Profile" | 143 | ProductName="Microsoft .NET Framework 4 Client Profile" |
| 148 | Description="Microsoft .NET Framework 4 Client Profile Setup" | 144 | Description="Microsoft .NET Framework 4 Client Profile Setup" |
| 149 | CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6" | ||
| 150 | CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F" | ||
| 151 | Hash="E15AD80FC74277EF2048312E9A71AF56B2EBA622"/> | 145 | Hash="E15AD80FC74277EF2048312E9A71AF56B2EBA622"/> |
| 152 | </ExePackage> | 146 | </ExePackage> |
| 153 | </PackageGroup> | 147 | </PackageGroup> |
| @@ -166,9 +160,9 @@ | |||
| 166 | 160 | ||
| 167 | <PackageGroup Id="$(var.NetFx40ClientRedistId)"> | 161 | <PackageGroup Id="$(var.NetFx40ClientRedistId)"> |
| 168 | <ExePackage | 162 | <ExePackage |
| 169 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]"" | 163 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]"" |
| 170 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]"" | 164 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]"" |
| 171 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]"" | 165 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]"" |
| 172 | PerMachine="yes" | 166 | PerMachine="yes" |
| 173 | DetectCondition="NETFRAMEWORK40CLIENT" | 167 | DetectCondition="NETFRAMEWORK40CLIENT" |
| 174 | Id="$(var.NetFx40ClientRedistId)" | 168 | Id="$(var.NetFx40ClientRedistId)" |
| @@ -183,8 +177,6 @@ | |||
| 183 | Version="4.0.30319.1" | 177 | Version="4.0.30319.1" |
| 184 | ProductName="Microsoft .NET Framework 4 Client Profile" | 178 | ProductName="Microsoft .NET Framework 4 Client Profile" |
| 185 | Description="Microsoft .NET Framework 4 Client Profile Setup" | 179 | Description="Microsoft .NET Framework 4 Client Profile Setup" |
| 186 | CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6" | ||
| 187 | CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F" | ||
| 188 | Hash="4CD67F609F89D617D2B206341B8C211E1B88B287"/> | 180 | Hash="4CD67F609F89D617D2B206341B8C211E1B88B287"/> |
| 189 | </ExePackage> | 181 | </ExePackage> |
| 190 | </PackageGroup> | 182 | </PackageGroup> |