diff options
Diffstat (limited to 'src/wixlib/NetFx461.wxs')
| -rw-r--r-- | src/wixlib/NetFx461.wxs | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/wixlib/NetFx461.wxs b/src/wixlib/NetFx461.wxs index 900080cc..cf9d3d60 100644 --- a/src/wixlib/NetFx461.wxs +++ b/src/wixlib/NetFx461.wxs | |||
| @@ -14,9 +14,9 @@ | |||
| 14 | --> | 14 | --> |
| 15 | 15 | ||
| 16 | <?define NetFx461MinRelease = 394254 ?> | 16 | <?define NetFx461MinRelease = 394254 ?> |
| 17 | <?define NetFx461WebLink = http://go.microsoft.com/fwlink/?LinkId=671728 ?> | 17 | <?define NetFx461WebLink = https://go.microsoft.com/fwlink/?LinkId=671728 ?> |
| 18 | <?define NetFx461RedistLink = http://go.microsoft.com/fwlink/?LinkId=671743 ?> | 18 | <?define NetFx461RedistLink = https://go.microsoft.com/fwlink/?LinkId=671743 ?> |
| 19 | <?define NetFx461EulaLink = http://referencesource.microsoft.com/license.html ?> | 19 | <?define NetFx461EulaLink = https://referencesource.microsoft.com/license.html ?> |
| 20 | <?define NetFx461WebId = NetFx461Web ?> | 20 | <?define NetFx461WebId = NetFx461Web ?> |
| 21 | <?define NetFx461RedistId = NetFx461Redist ?> | 21 | <?define NetFx461RedistId = NetFx461Redist ?> |
| 22 | 22 | ||
| @@ -35,9 +35,8 @@ | |||
| 35 | 35 | ||
| 36 | <PackageGroup Id="$(var.NetFx461WebId)"> | 36 | <PackageGroup Id="$(var.NetFx461WebId)"> |
| 37 | <ExePackage | 37 | <ExePackage |
| 38 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | 38 | InstallArguments="/q /norestart /log "[NetFx461FullLog].html"" |
| 39 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | 39 | UninstallArguments="/uninstall /q /norestart /log "[NetFx461FullLog].html"" |
| 40 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | ||
| 41 | PerMachine="yes" | 40 | PerMachine="yes" |
| 42 | DetectCondition="!(wix.NetFx461WebDetectCondition)" | 41 | DetectCondition="!(wix.NetFx461WebDetectCondition)" |
| 43 | InstallCondition="!(wix.NetFx461WebInstallCondition)" | 42 | InstallCondition="!(wix.NetFx461WebInstallCondition)" |
| @@ -45,13 +44,12 @@ | |||
| 45 | Vital="yes" | 44 | Vital="yes" |
| 46 | Permanent="yes" | 45 | Permanent="yes" |
| 47 | Protocol="netfx4" | 46 | Protocol="netfx4" |
| 47 | LogPathVariable="NetFx461FullLog"> | ||
| 48 | <ExePackagePayload | ||
| 49 | Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe" | ||
| 48 | DownloadUrl="$(var.NetFx461WebLink)" | 50 | DownloadUrl="$(var.NetFx461WebLink)" |
| 49 | LogPathVariable="NetFx461FullLog" | ||
| 50 | Compressed="no" | ||
| 51 | Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe"> | ||
| 52 | <RemotePayload | ||
| 53 | Description="Microsoft .NET Framework 4.6.1 Setup" | 51 | Description="Microsoft .NET Framework 4.6.1 Setup" |
| 54 | Hash="EE88B05232F43B517D4A368F7EE5065CDE7F67FA" | 52 | Hash="97C4DD638E2E0324D60BDD1D7BE85603EDBF969898469A524FB271EBA5E22B78CA67DB1F568F5C45393381F1E76408C366AD4A68A7BB00E23D1FB820E67DE99E" |
| 55 | ProductName="Microsoft .NET Framework 4.6.1" | 53 | ProductName="Microsoft .NET Framework 4.6.1" |
| 56 | Size="1424328" | 54 | Size="1424328" |
| 57 | Version="4.6.1055.0" /> | 55 | Version="4.6.1055.0" /> |
| @@ -76,9 +74,8 @@ | |||
| 76 | 74 | ||
| 77 | <PackageGroup Id="$(var.NetFx461RedistId)"> | 75 | <PackageGroup Id="$(var.NetFx461RedistId)"> |
| 78 | <ExePackage | 76 | <ExePackage |
| 79 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | 77 | InstallArguments="/q /norestart /log "[NetFx461FullLog].html"" |
| 80 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | 78 | UninstallArguments="/uninstall /q /norestart /log "[NetFx461FullLog].html"" |
| 81 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html"" | ||
| 82 | PerMachine="yes" | 79 | PerMachine="yes" |
| 83 | DetectCondition="!(wix.NetFx461RedistDetectCondition)" | 80 | DetectCondition="!(wix.NetFx461RedistDetectCondition)" |
| 84 | InstallCondition="!(wix.NetFx461RedistInstallCondition)" | 81 | InstallCondition="!(wix.NetFx461RedistInstallCondition)" |
| @@ -86,13 +83,12 @@ | |||
| 86 | Vital="yes" | 83 | Vital="yes" |
| 87 | Permanent="yes" | 84 | Permanent="yes" |
| 88 | Protocol="netfx4" | 85 | Protocol="netfx4" |
| 86 | LogPathVariable="NetFx461FullLog"> | ||
| 87 | <ExePackagePayload | ||
| 88 | Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe" | ||
| 89 | DownloadUrl="$(var.NetFx461RedistLink)" | 89 | DownloadUrl="$(var.NetFx461RedistLink)" |
| 90 | LogPathVariable="NetFx461FullLog" | ||
| 91 | Compressed="no" | ||
| 92 | Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe"> | ||
| 93 | <RemotePayload | ||
| 94 | Description="Microsoft .NET Framework 4.6.1 Setup" | 90 | Description="Microsoft .NET Framework 4.6.1 Setup" |
| 95 | Hash="83D048D171FF44A3CAD9B422137656F585295866" | 91 | Hash="43BEF5EB278CF0954EAE1A6FEEC5A9852B932270508DD10647B9EA32DFD3832ECB58172B28707216709705BF0013FCEBB0B39DB31E38786FC2DAE219622EA00F" |
| 96 | ProductName="Microsoft .NET Framework 4.6.1" | 92 | ProductName="Microsoft .NET Framework 4.6.1" |
| 97 | Size="67681000" | 93 | Size="67681000" |
| 98 | Version="4.6.1055.0" /> | 94 | Version="4.6.1055.0" /> |