aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib/NetFx461.wxs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixlib/NetFx461.wxs')
-rw-r--r--src/wixlib/NetFx461.wxs49
1 files changed, 6 insertions, 43 deletions
diff --git a/src/wixlib/NetFx461.wxs b/src/wixlib/NetFx461.wxs
index cf9d3d60..95cc2876 100644
--- a/src/wixlib/NetFx461.wxs
+++ b/src/wixlib/NetFx461.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="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" /> 31 <WixVariable Id="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" />
35 32
36 <PackageGroup Id="$(var.NetFx461WebId)"> 33 <PackageGroup Id="$(var.NetFx461WebId)">
37 <ExePackage 34 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx461WebDetectCondition)" InstallCondition="!(wix.NetFx461WebInstallCondition)" Id="$(var.NetFx461WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog">
38 InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" 35 <ExePackagePayload Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe" DownloadUrl="$(var.NetFx461WebLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="97C4DD638E2E0324D60BDD1D7BE85603EDBF969898469A524FB271EBA5E22B78CA67DB1F568F5C45393381F1E76408C366AD4A68A7BB00E23D1FB820E67DE99E" ProductName="Microsoft .NET Framework 4.6.1" Size="1424328" Version="4.6.1055.0" />
39 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;"
40 PerMachine="yes"
41 DetectCondition="!(wix.NetFx461WebDetectCondition)"
42 InstallCondition="!(wix.NetFx461WebInstallCondition)"
43 Id="$(var.NetFx461WebId)"
44 Vital="yes"
45 Permanent="yes"
46 Protocol="netfx4"
47 LogPathVariable="NetFx461FullLog">
48 <ExePackagePayload
49 Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe"
50 DownloadUrl="$(var.NetFx461WebLink)"
51 Description="Microsoft .NET Framework 4.6.1 Setup"
52 Hash="97C4DD638E2E0324D60BDD1D7BE85603EDBF969898469A524FB271EBA5E22B78CA67DB1F568F5C45393381F1E76408C366AD4A68A7BB00E23D1FB820E67DE99E"
53 ProductName="Microsoft .NET Framework 4.6.1"
54 Size="1424328"
55 Version="4.6.1055.0" />
56 </ExePackage> 36 </ExePackage>
57 </PackageGroup> 37 </PackageGroup>
58 </Fragment> 38 </Fragment>
@@ -73,25 +53,8 @@
73 <WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" /> 53 <WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" />
74 54
75 <PackageGroup Id="$(var.NetFx461RedistId)"> 55 <PackageGroup Id="$(var.NetFx461RedistId)">
76 <ExePackage 56 <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx461RedistDetectCondition)" InstallCondition="!(wix.NetFx461RedistInstallCondition)" Id="$(var.NetFx461RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog">
77 InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" 57 <ExePackagePayload Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx461RedistLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="43BEF5EB278CF0954EAE1A6FEEC5A9852B932270508DD10647B9EA32DFD3832ECB58172B28707216709705BF0013FCEBB0B39DB31E38786FC2DAE219622EA00F" ProductName="Microsoft .NET Framework 4.6.1" Size="67681000" Version="4.6.1055.0" />
78 UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;"
79 PerMachine="yes"
80 DetectCondition="!(wix.NetFx461RedistDetectCondition)"
81 InstallCondition="!(wix.NetFx461RedistInstallCondition)"
82 Id="$(var.NetFx461RedistId)"
83 Vital="yes"
84 Permanent="yes"
85 Protocol="netfx4"
86 LogPathVariable="NetFx461FullLog">
87 <ExePackagePayload
88 Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe"
89 DownloadUrl="$(var.NetFx461RedistLink)"
90 Description="Microsoft .NET Framework 4.6.1 Setup"
91 Hash="43BEF5EB278CF0954EAE1A6FEEC5A9852B932270508DD10647B9EA32DFD3832ECB58172B28707216709705BF0013FCEBB0B39DB31E38786FC2DAE219622EA00F"
92 ProductName="Microsoft .NET Framework 4.6.1"
93 Size="67681000"
94 Version="4.6.1055.0" />
95 </ExePackage> 58 </ExePackage>
96 </PackageGroup> 59 </PackageGroup>
97 </Fragment> 60 </Fragment>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-12 08:57:30 +0000