diff options
Diffstat (limited to 'src/wixlib/NetFx46.wxs')
| -rw-r--r-- | src/wixlib/NetFx46.wxs | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/wixlib/NetFx46.wxs b/src/wixlib/NetFx46.wxs index dbe629ac..c33c1df4 100644 --- a/src/wixlib/NetFx46.wxs +++ b/src/wixlib/NetFx46.wxs | |||
| @@ -15,9 +15,9 @@ | |||
| 15 | --> | 15 | --> |
| 16 | 16 | ||
| 17 | <?define NetFx46MinRelease = 393295 ?> | 17 | <?define NetFx46MinRelease = 393295 ?> |
| 18 | <?define NetFx46WebLink = http://go.microsoft.com/fwlink/?LinkId=560371 ?> | 18 | <?define NetFx46WebLink = https://go.microsoft.com/fwlink/?LinkId=560371 ?> |
| 19 | <?define NetFx46RedistLink = http://go.microsoft.com/fwlink/?LinkId=560369 ?> | 19 | <?define NetFx46RedistLink = https://go.microsoft.com/fwlink/?LinkId=560369 ?> |
| 20 | <?define NetFx46EulaLink = http://go.microsoft.com/fwlink/?LinkID=558772 ?> | 20 | <?define NetFx46EulaLink = https://go.microsoft.com/fwlink/?LinkID=558772 ?> |
| 21 | <?define NetFx46WebId = NetFx46Web ?> | 21 | <?define NetFx46WebId = NetFx46Web ?> |
| 22 | <?define NetFx46RedistId = NetFx46Redist ?> | 22 | <?define NetFx46RedistId = NetFx46Redist ?> |
| 23 | 23 | ||
| @@ -36,9 +36,8 @@ | |||
| 36 | 36 | ||
| 37 | <PackageGroup Id="$(var.NetFx46WebId)"> | 37 | <PackageGroup Id="$(var.NetFx46WebId)"> |
| 38 | <ExePackage | 38 | <ExePackage |
| 39 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html"" | 39 | InstallArguments="/q /norestart /log "[NetFx46FullLog].html"" |
| 40 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html"" | 40 | UninstallArguments="/uninstall /q /norestart /log "[NetFx46FullLog].html"" |
| 41 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html"" | ||
| 42 | PerMachine="yes" | 41 | PerMachine="yes" |
| 43 | DetectCondition="!(wix.NetFx46WebDetectCondition)" | 42 | DetectCondition="!(wix.NetFx46WebDetectCondition)" |
| 44 | InstallCondition="!(wix.NetFx46WebInstallCondition)" | 43 | InstallCondition="!(wix.NetFx46WebInstallCondition)" |
| @@ -46,13 +45,12 @@ | |||
| 46 | Vital="yes" | 45 | Vital="yes" |
| 47 | Permanent="yes" | 46 | Permanent="yes" |
| 48 | Protocol="netfx4" | 47 | Protocol="netfx4" |
| 48 | LogPathVariable="NetFx46FullLog"> | ||
| 49 | <ExePackagePayload | ||
| 50 | Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe" | ||
| 49 | DownloadUrl="$(var.NetFx46WebLink)" | 51 | DownloadUrl="$(var.NetFx46WebLink)" |
| 50 | LogPathVariable="NetFx46FullLog" | ||
| 51 | Compressed="no" | ||
| 52 | Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe"> | ||
| 53 | <RemotePayload | ||
| 54 | Description="Microsoft .NET Framework 4.6 Setup" | 52 | Description="Microsoft .NET Framework 4.6 Setup" |
| 55 | Hash="480CA134B9E3F2437DF10719D5A8C77DDEC0A4F1" | 53 | Hash="CAA5F4D4DB0C9DF34252FCB74CF7762214F69D2419865EBC1E6717E6B1348E59A7599A8DECAAB5CEE6974E59D1AE5A749F8C4EC07C8E4C80C90E77B996B3B205" |
| 56 | ProductName="Microsoft .NET Framework 4.6" | 54 | ProductName="Microsoft .NET Framework 4.6" |
| 57 | Size="1497400" | 55 | Size="1497400" |
| 58 | Version="4.6.81.0" /> | 56 | Version="4.6.81.0" /> |
| @@ -77,9 +75,8 @@ | |||
| 77 | 75 | ||
| 78 | <PackageGroup Id="$(var.NetFx46RedistId)"> | 76 | <PackageGroup Id="$(var.NetFx46RedistId)"> |
| 79 | <ExePackage | 77 | <ExePackage |
| 80 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html"" | 78 | InstallArguments="/q /norestart /log "[NetFx46FullLog].html"" |
| 81 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html"" | 79 | UninstallArguments="/uninstall /q /norestart /log "[NetFx46FullLog].html"" |
| 82 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html"" | ||
| 83 | PerMachine="yes" | 80 | PerMachine="yes" |
| 84 | DetectCondition="!(wix.NetFx46RedistDetectCondition)" | 81 | DetectCondition="!(wix.NetFx46RedistDetectCondition)" |
| 85 | InstallCondition="!(wix.NetFx46RedistInstallCondition)" | 82 | InstallCondition="!(wix.NetFx46RedistInstallCondition)" |
| @@ -87,13 +84,12 @@ | |||
| 87 | Vital="yes" | 84 | Vital="yes" |
| 88 | Permanent="yes" | 85 | Permanent="yes" |
| 89 | Protocol="netfx4" | 86 | Protocol="netfx4" |
| 87 | LogPathVariable="NetFx46FullLog"> | ||
| 88 | <ExePackagePayload | ||
| 89 | Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe" | ||
| 90 | DownloadUrl="$(var.NetFx46RedistLink)" | 90 | DownloadUrl="$(var.NetFx46RedistLink)" |
| 91 | LogPathVariable="NetFx46FullLog" | ||
| 92 | Compressed="no" | ||
| 93 | Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe"> | ||
| 94 | <RemotePayload | ||
| 95 | Description="Microsoft .NET Framework 4.6 Setup" | 91 | Description="Microsoft .NET Framework 4.6 Setup" |
| 96 | Hash="3049A85843EAF65E89E2336D5FE6E85E416797BE" | 92 | Hash="C6FC54F648F822515ADACB4C27E0A6DBD6A3EAF2BA3F069C0002750894ECC453EBED8BC8D4FF2AFD73C7B3445C1DA18D43FE361EA5195AE8522249DF36B84B7E" |
| 97 | ProductName="Microsoft .NET Framework 4.6" | 93 | ProductName="Microsoft .NET Framework 4.6" |
| 98 | Size="65444688" | 94 | Size="65444688" |
| 99 | Version="4.6.81.0" /> | 95 | Version="4.6.81.0" /> |