aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib/NetFx452.wxs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixlib/NetFx452.wxs')
-rw-r--r--src/wixlib/NetFx452.wxs49
1 files changed, 6 insertions, 43 deletions
diff --git a/src/wixlib/NetFx452.wxs b/src/wixlib/NetFx452.wxs
index 0e2ad0d6..33f79db4 100644
--- a/src/wixlib/NetFx452.wxs
+++ b/src/wixlib/NetFx452.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
@@ -34,25 +31,8 @@
34 <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" /> 31 <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" />
35 32
36 <PackageGroup Id="$(var.NetFx452WebId)"> 33 <PackageGroup Id="$(var.NetFx452WebId)">
37 <ExePackage 34 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452WebDetectCondition)" InstallCondition="!(wix.NetFx452WebInstallCondition)" Id="$(var.NetFx452WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullWebLog">
38 InstallArguments="/q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" 35 <ExePackagePayload Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe" DownloadUrl="$(var.NetFx452WebLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E" ProductName="Microsoft .NET Framework 4.5.2" Size="1118920" Version="4.5.51209.34209" />
39 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullWebLog].html&quot;"
40 PerMachine="yes"
41 DetectCondition="!(wix.NetFx452WebDetectCondition)"
42 InstallCondition="!(wix.NetFx452WebInstallCondition)"
43 Id="$(var.NetFx452WebId)"
44 Vital="yes"
45 Permanent="yes"
46 Protocol="netfx4"
47 LogPathVariable="NetFx452FullWebLog">
48 <ExePackagePayload
49 Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe"
50 DownloadUrl="$(var.NetFx452WebLink)"
51 Description="Microsoft .NET Framework 4.5.2 Setup"
52 Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E"
53 ProductName="Microsoft .NET Framework 4.5.2"
54 Size="1118920"
55 Version="4.5.51209.34209" />
56 </ExePackage> 36 </ExePackage>
57 </PackageGroup> 37 </PackageGroup>
58 </Fragment> 38 </Fragment>
@@ -73,25 +53,8 @@
73 <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" /> 53 <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" />
74 54
75 <PackageGroup Id="$(var.NetFx452RedistId)"> 55 <PackageGroup Id="$(var.NetFx452RedistId)">
76 <ExePackage 56 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452RedistDetectCondition)" InstallCondition="!(wix.NetFx452RedistInstallCondition)" Id="$(var.NetFx452RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullLog">
77 InstallArguments="/q /norestart /log &quot;[NetFx452FullLog].html&quot;" 57 <ExePackagePayload Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx452RedistLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D" ProductName="Microsoft .NET Framework 4.5.2" Size="69999448" Version="4.5.51209.34209" />
78 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullLog].html&quot;"
79 PerMachine="yes"
80 DetectCondition="!(wix.NetFx452RedistDetectCondition)"
81 InstallCondition="!(wix.NetFx452RedistInstallCondition)"
82 Id="$(var.NetFx452RedistId)"
83 Vital="yes"
84 Permanent="yes"
85 Protocol="netfx4"
86 LogPathVariable="NetFx452FullLog">
87 <ExePackagePayload
88 Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe"
89 DownloadUrl="$(var.NetFx452RedistLink)"
90 Description="Microsoft .NET Framework 4.5.2 Setup"
91 Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D"
92 ProductName="Microsoft .NET Framework 4.5.2"
93 Size="69999448"
94 Version="4.5.51209.34209" />
95 </ExePackage> 58 </ExePackage>
96 </PackageGroup> 59 </PackageGroup>
97 </Fragment> 60 </Fragment>