diff options
Diffstat (limited to '')
| -rw-r--r-- | src/wixlib/NetFx46.wxs | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/src/wixlib/NetFx46.wxs b/src/wixlib/NetFx46.wxs index c33c1df4..cb53be2e 100644 --- a/src/wixlib/NetFx46.wxs +++ b/src/wixlib/NetFx46.wxs | |||
| @@ -1,10 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
| 3 | 2 | ||
| 4 | 3 | ||
| 5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
| 6 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" | ||
| 7 | xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
| 8 | 5 | ||
| 9 | <!-- | 6 | <!-- |
| 10 | .NET Framework installation state properties | 7 | .NET Framework installation state properties |
| @@ -35,25 +32,8 @@ | |||
| 35 | <WixVariable Id="NetFx46WebPackageDirectory" Value="redist\" Overridable="yes" /> | 32 | <WixVariable Id="NetFx46WebPackageDirectory" Value="redist\" Overridable="yes" /> |
| 36 | 33 | ||
| 37 | <PackageGroup Id="$(var.NetFx46WebId)"> | 34 | <PackageGroup Id="$(var.NetFx46WebId)"> |
| 38 | <ExePackage | 35 | <ExePackage InstallArguments="/q /norestart /log "[NetFx46FullLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx46FullLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx46WebDetectCondition)" InstallCondition="!(wix.NetFx46WebInstallCondition)" Id="$(var.NetFx46WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog"> |
| 39 | InstallArguments="/q /norestart /log "[NetFx46FullLog].html"" | 36 | <ExePackagePayload Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe" DownloadUrl="$(var.NetFx46WebLink)" Description="Microsoft .NET Framework 4.6 Setup" Hash="CAA5F4D4DB0C9DF34252FCB74CF7762214F69D2419865EBC1E6717E6B1348E59A7599A8DECAAB5CEE6974E59D1AE5A749F8C4EC07C8E4C80C90E77B996B3B205" ProductName="Microsoft .NET Framework 4.6" Size="1497400" Version="4.6.81.0" /> |
| 40 | UninstallArguments="/uninstall /q /norestart /log "[NetFx46FullLog].html"" | ||
| 41 | PerMachine="yes" | ||
| 42 | DetectCondition="!(wix.NetFx46WebDetectCondition)" | ||
| 43 | InstallCondition="!(wix.NetFx46WebInstallCondition)" | ||
| 44 | Id="$(var.NetFx46WebId)" | ||
| 45 | Vital="yes" | ||
| 46 | Permanent="yes" | ||
| 47 | Protocol="netfx4" | ||
| 48 | LogPathVariable="NetFx46FullLog"> | ||
| 49 | <ExePackagePayload | ||
| 50 | Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe" | ||
| 51 | DownloadUrl="$(var.NetFx46WebLink)" | ||
| 52 | Description="Microsoft .NET Framework 4.6 Setup" | ||
| 53 | Hash="CAA5F4D4DB0C9DF34252FCB74CF7762214F69D2419865EBC1E6717E6B1348E59A7599A8DECAAB5CEE6974E59D1AE5A749F8C4EC07C8E4C80C90E77B996B3B205" | ||
| 54 | ProductName="Microsoft .NET Framework 4.6" | ||
| 55 | Size="1497400" | ||
| 56 | Version="4.6.81.0" /> | ||
| 57 | </ExePackage> | 37 | </ExePackage> |
| 58 | </PackageGroup> | 38 | </PackageGroup> |
| 59 | </Fragment> | 39 | </Fragment> |
| @@ -74,25 +54,8 @@ | |||
| 74 | <WixVariable Id="NetFx46RedistPackageDirectory" Value="redist\" Overridable="yes" /> | 54 | <WixVariable Id="NetFx46RedistPackageDirectory" Value="redist\" Overridable="yes" /> |
| 75 | 55 | ||
| 76 | <PackageGroup Id="$(var.NetFx46RedistId)"> | 56 | <PackageGroup Id="$(var.NetFx46RedistId)"> |
| 77 | <ExePackage | 57 | <ExePackage InstallArguments="/q /norestart /log "[NetFx46FullLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx46FullLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx46RedistDetectCondition)" InstallCondition="!(wix.NetFx46RedistInstallCondition)" Id="$(var.NetFx46RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog"> |
| 78 | InstallArguments="/q /norestart /log "[NetFx46FullLog].html"" | 58 | <ExePackagePayload Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx46RedistLink)" Description="Microsoft .NET Framework 4.6 Setup" Hash="C6FC54F648F822515ADACB4C27E0A6DBD6A3EAF2BA3F069C0002750894ECC453EBED8BC8D4FF2AFD73C7B3445C1DA18D43FE361EA5195AE8522249DF36B84B7E" ProductName="Microsoft .NET Framework 4.6" Size="65444688" Version="4.6.81.0" /> |
| 79 | UninstallArguments="/uninstall /q /norestart /log "[NetFx46FullLog].html"" | ||
| 80 | PerMachine="yes" | ||
| 81 | DetectCondition="!(wix.NetFx46RedistDetectCondition)" | ||
| 82 | InstallCondition="!(wix.NetFx46RedistInstallCondition)" | ||
| 83 | Id="$(var.NetFx46RedistId)" | ||
| 84 | Vital="yes" | ||
| 85 | Permanent="yes" | ||
| 86 | Protocol="netfx4" | ||
| 87 | LogPathVariable="NetFx46FullLog"> | ||
| 88 | <ExePackagePayload | ||
| 89 | Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe" | ||
| 90 | DownloadUrl="$(var.NetFx46RedistLink)" | ||
| 91 | Description="Microsoft .NET Framework 4.6 Setup" | ||
| 92 | Hash="C6FC54F648F822515ADACB4C27E0A6DBD6A3EAF2BA3F069C0002750894ECC453EBED8BC8D4FF2AFD73C7B3445C1DA18D43FE361EA5195AE8522249DF36B84B7E" | ||
| 93 | ProductName="Microsoft .NET Framework 4.6" | ||
| 94 | Size="65444688" | ||
| 95 | Version="4.6.81.0" /> | ||
| 96 | </ExePackage> | 59 | </ExePackage> |
| 97 | </PackageGroup> | 60 | </PackageGroup> |
| 98 | </Fragment> | 61 | </Fragment> |