diff options
Diffstat (limited to 'src/ext/NetFx/wixlib/NetFx461.wxs')
| -rw-r--r-- | src/ext/NetFx/wixlib/NetFx461.wxs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ext/NetFx/wixlib/NetFx461.wxs b/src/ext/NetFx/wixlib/NetFx461.wxs index 95cc2876..d47e75bd 100644 --- a/src/ext/NetFx/wixlib/NetFx461.wxs +++ b/src/ext/NetFx/wixlib/NetFx461.wxs | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | <WixVariable Id="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" /> | 31 | <WixVariable Id="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" /> |
| 32 | 32 | ||
| 33 | <PackageGroup Id="$(var.NetFx461WebId)"> | 33 | <PackageGroup Id="$(var.NetFx461WebId)"> |
| 34 | <ExePackage InstallArguments="/q /norestart /log "[NetFx461FullLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx461FullLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx461WebDetectCondition)" InstallCondition="!(wix.NetFx461WebInstallCondition)" Id="$(var.NetFx461WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog"> | 34 | <ExePackage InstallArguments="/q /norestart /log "[NetFx461FullLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx461WebDetectCondition)" InstallCondition="!(wix.NetFx461WebInstallCondition)" Id="$(var.NetFx461WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog" Cache="no"> |
| 35 | <ExePackagePayload Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe" DownloadUrl="$(var.NetFx461WebLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="97C4DD638E2E0324D60BDD1D7BE85603EDBF969898469A524FB271EBA5E22B78CA67DB1F568F5C45393381F1E76408C366AD4A68A7BB00E23D1FB820E67DE99E" ProductName="Microsoft .NET Framework 4.6.1" Size="1424328" Version="4.6.1055.0" /> | 35 | <ExePackagePayload Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe" DownloadUrl="$(var.NetFx461WebLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="97C4DD638E2E0324D60BDD1D7BE85603EDBF969898469A524FB271EBA5E22B78CA67DB1F568F5C45393381F1E76408C366AD4A68A7BB00E23D1FB820E67DE99E" ProductName="Microsoft .NET Framework 4.6.1" Size="1424328" Version="4.6.1055.0" /> |
| 36 | </ExePackage> | 36 | </ExePackage> |
| 37 | </PackageGroup> | 37 | </PackageGroup> |
| @@ -53,7 +53,7 @@ | |||
| 53 | <WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" /> | 53 | <WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" /> |
| 54 | 54 | ||
| 55 | <PackageGroup Id="$(var.NetFx461RedistId)"> | 55 | <PackageGroup Id="$(var.NetFx461RedistId)"> |
| 56 | <ExePackage InstallArguments="/q /norestart /log "[NetFx461FullLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx461FullLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx461RedistDetectCondition)" InstallCondition="!(wix.NetFx461RedistInstallCondition)" Id="$(var.NetFx461RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog"> | 56 | <ExePackage InstallArguments="/q /norestart /log "[NetFx461FullLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx461RedistDetectCondition)" InstallCondition="!(wix.NetFx461RedistInstallCondition)" Id="$(var.NetFx461RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog" Cache="no"> |
| 57 | <ExePackagePayload Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx461RedistLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="43BEF5EB278CF0954EAE1A6FEEC5A9852B932270508DD10647B9EA32DFD3832ECB58172B28707216709705BF0013FCEBB0B39DB31E38786FC2DAE219622EA00F" ProductName="Microsoft .NET Framework 4.6.1" Size="67681000" Version="4.6.1055.0" /> | 57 | <ExePackagePayload Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx461RedistLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="43BEF5EB278CF0954EAE1A6FEEC5A9852B932270508DD10647B9EA32DFD3832ECB58172B28707216709705BF0013FCEBB0B39DB31E38786FC2DAE219622EA00F" ProductName="Microsoft .NET Framework 4.6.1" Size="67681000" Version="4.6.1055.0" /> |
| 58 | </ExePackage> | 58 | </ExePackage> |
| 59 | </PackageGroup> | 59 | </PackageGroup> |