diff options
Diffstat (limited to 'src/wixlib/NetFx472.wxs')
-rw-r--r-- | src/wixlib/NetFx472.wxs | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/src/wixlib/NetFx472.wxs b/src/wixlib/NetFx472.wxs index 35a3453a..1a47a3cc 100644 --- a/src/wixlib/NetFx472.wxs +++ b/src/wixlib/NetFx472.wxs | |||
@@ -1,9 +1,6 @@ | |||
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 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 3 | <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"> |
5 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" | ||
6 | xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
7 | 4 | ||
8 | <!-- | 5 | <!-- |
9 | .NET Framework installation state properties | 6 | .NET Framework installation state properties |
@@ -32,25 +29,8 @@ | |||
32 | <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" /> | 29 | <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" /> |
33 | 30 | ||
34 | <PackageGroup Id="$(var.NetFx472WebId)"> | 31 | <PackageGroup Id="$(var.NetFx472WebId)"> |
35 | <ExePackage | 32 | <ExePackage InstallArguments="/q /norestart /log "[NetFx472WebLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx472WebLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx472WebDetectCondition)" InstallCondition="!(wix.NetFx472WebInstallCondition)" Id="$(var.NetFx472WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472WebLog"> |
36 | InstallArguments="/q /norestart /log "[NetFx472WebLog].html"" | 33 | <ExePackagePayload Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe" DownloadUrl="$(var.NetFx472WebLink)" Description="Microsoft .NET Framework 4.7.2 Setup" Hash="37006954E3AFE07FB02D24894CC34794618B78C27A1B514818985B6CC1FA3E896ED99BA2E4AAC3F6469D263819BD94EE70E7113946C51BA83C93B74826FC8FA8" ProductName="Microsoft .NET Framework 4.7.2" Size="1432848" Version="4.7.3081.0" /> |
37 | UninstallArguments="/uninstall /q /norestart /log "[NetFx472WebLog].html"" | ||
38 | PerMachine="yes" | ||
39 | DetectCondition="!(wix.NetFx472WebDetectCondition)" | ||
40 | InstallCondition="!(wix.NetFx472WebInstallCondition)" | ||
41 | Id="$(var.NetFx472WebId)" | ||
42 | Vital="yes" | ||
43 | Permanent="yes" | ||
44 | Protocol="netfx4" | ||
45 | LogPathVariable="NetFx472WebLog"> | ||
46 | <ExePackagePayload | ||
47 | Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe" | ||
48 | DownloadUrl="$(var.NetFx472WebLink)" | ||
49 | Description="Microsoft .NET Framework 4.7.2 Setup" | ||
50 | Hash="37006954E3AFE07FB02D24894CC34794618B78C27A1B514818985B6CC1FA3E896ED99BA2E4AAC3F6469D263819BD94EE70E7113946C51BA83C93B74826FC8FA8" | ||
51 | ProductName="Microsoft .NET Framework 4.7.2" | ||
52 | Size="1432848" | ||
53 | Version="4.7.3081.0" /> | ||
54 | </ExePackage> | 34 | </ExePackage> |
55 | </PackageGroup> | 35 | </PackageGroup> |
56 | </Fragment> | 36 | </Fragment> |
@@ -71,25 +51,8 @@ | |||
71 | <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" /> | 51 | <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" /> |
72 | 52 | ||
73 | <PackageGroup Id="$(var.NetFx472RedistId)"> | 53 | <PackageGroup Id="$(var.NetFx472RedistId)"> |
74 | <ExePackage | 54 | <ExePackage InstallArguments="/q /norestart /log "[NetFx472RedistLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx472RedistLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx472RedistDetectCondition)" InstallCondition="!(wix.NetFx472RedistInstallCondition)" Id="$(var.NetFx472RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472RedistLog"> |
75 | InstallArguments="/q /norestart /log "[NetFx472RedistLog].html"" | 55 | <ExePackagePayload Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx472RedistLink)" Description="Microsoft .NET Framework 4.7.2 Setup" Hash="36F295ED19A5BD5C5F05803BA26EFD17D419ABC7A791312AD011B63A4402492529AED0FB4D45FF1F74381079A310B33649C9C56C36E815B12E79ECD671897489" ProductName="Microsoft .NET Framework 4.7.2" Size="83943272" Version="4.7.3081.0" /> |
76 | UninstallArguments="/uninstall /q /norestart /log "[NetFx472RedistLog].html"" | ||
77 | PerMachine="yes" | ||
78 | DetectCondition="!(wix.NetFx472RedistDetectCondition)" | ||
79 | InstallCondition="!(wix.NetFx472RedistInstallCondition)" | ||
80 | Id="$(var.NetFx472RedistId)" | ||
81 | Vital="yes" | ||
82 | Permanent="yes" | ||
83 | Protocol="netfx4" | ||
84 | LogPathVariable="NetFx472RedistLog"> | ||
85 | <ExePackagePayload | ||
86 | Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe" | ||
87 | DownloadUrl="$(var.NetFx472RedistLink)" | ||
88 | Description="Microsoft .NET Framework 4.7.2 Setup" | ||
89 | Hash="36F295ED19A5BD5C5F05803BA26EFD17D419ABC7A791312AD011B63A4402492529AED0FB4D45FF1F74381079A310B33649C9C56C36E815B12E79ECD671897489" | ||
90 | ProductName="Microsoft .NET Framework 4.7.2" | ||
91 | Size="83943272" | ||
92 | Version="4.7.3081.0" /> | ||
93 | </ExePackage> | 56 | </ExePackage> |
94 | </PackageGroup> | 57 | </PackageGroup> |
95 | </Fragment> | 58 | </Fragment> |