1 files changed, 6 insertions, 43 deletions
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs
index a48fe4cf..4958c647 100644
--- a/src/wixlib/NetFx48.wxs
+++ b/src/wixlib/NetFx48.wxs
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
-<!-- 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. -->
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+<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">
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
    <!--
      .NET Framework installation state properties
@@ -32,25 +29,8 @@
        <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
        <PackageGroup Id="$(var.NetFx48WebId)">
-            <ExePackage
+            <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48WebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48WebDetectCondition)" InstallCondition="!(wix.NetFx48WebInstallCondition)" Id="$(var.NetFx48WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48WebLog">
-                InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;"
+                <ExePackagePayload Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe" DownloadUrl="$(var.NetFx48WebLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="E18E3DB30A0AB2B51F34A9B7EBCEC0FD7B015F74B4525643C170FDE73EE94BA4092E3A82C98BCAE4AEBF48009BA8B6E7FA60B89AB917D8F28E74E84DB9D8CF21" ProductName="Microsoft .NET Framework 4.8" Size="1479400" Version="4.8.3928.0" />
-                UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48WebLog].html&quot;"
-                PerMachine="yes"
-                DetectCondition="!(wix.NetFx48WebDetectCondition)"
-                InstallCondition="!(wix.NetFx48WebInstallCondition)"
-                Id="$(var.NetFx48WebId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="netfx4"
-                LogPathVariable="NetFx48WebLog">
-                <ExePackagePayload
-                  Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe"
-                  DownloadUrl="$(var.NetFx48WebLink)"
-                  Description="Microsoft .NET Framework 4.8 Setup"
-                  Hash="E18E3DB30A0AB2B51F34A9B7EBCEC0FD7B015F74B4525643C170FDE73EE94BA4092E3A82C98BCAE4AEBF48009BA8B6E7FA60B89AB917D8F28E74E84DB9D8CF21" 
-                  ProductName="Microsoft .NET Framework 4.8"
-                  Size="1479400" 
-                  Version="4.8.3928.0" />
            </ExePackage>
        </PackageGroup>
    </Fragment>
@@ -71,25 +51,8 @@
        <WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" />
        <PackageGroup Id="$(var.NetFx48RedistId)">
-            <ExePackage
+            <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx48RedistLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48RedistDetectCondition)" InstallCondition="!(wix.NetFx48RedistInstallCondition)" Id="$(var.NetFx48RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48RedistLog">
-                InstallArguments="/q /norestart /log &quot;[NetFx48RedistLog].html&quot;"
+                <ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="B758812388CD1BE1E6994B58267088FE6C22961D875153CC8B924DFC590F681AF85D750AA412571745B3872CADA56E2A45C4328CFDC5EE8E201743830614609E" ProductName="Microsoft .NET Framework 4.8" Size="117380440" Version="4.8.3928.0" />
-                UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48RedistLog].html&quot;"
-                PerMachine="yes"
-                DetectCondition="!(wix.NetFx48RedistDetectCondition)"
-                InstallCondition="!(wix.NetFx48RedistInstallCondition)"
-                Id="$(var.NetFx48RedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="netfx4"
-                LogPathVariable="NetFx48RedistLog">
-                <ExePackagePayload
-                  Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe"
-                  DownloadUrl="$(var.NetFx48RedistLink)"
-                  Description="Microsoft .NET Framework 4.8 Setup"
-                  Hash="B758812388CD1BE1E6994B58267088FE6C22961D875153CC8B924DFC590F681AF85D750AA412571745B3872CADA56E2A45C4328CFDC5EE8E201743830614609E" 
-                  ProductName="Microsoft .NET Framework 4.8"
-                  Size="117380440" 
-                  Version="4.8.3928.0" />
            </ExePackage>
        </PackageGroup>
    </Fragment>

diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs index a48fe4cf..4958c647 100644 --- a/src/wixlib/NetFx48.wxs +++ b/src/wixlib/NetFx48.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="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />	29	<WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
33		30
34	<PackageGroup Id="$(var.NetFx48WebId)">	31	<PackageGroup Id="$(var.NetFx48WebId)">
35	<ExePackage	32	<ExePackage InstallArguments="/q /norestart /log "[NetFx48WebLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx48WebLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx48WebDetectCondition)" InstallCondition="!(wix.NetFx48WebInstallCondition)" Id="$(var.NetFx48WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48WebLog">
36	InstallArguments="/q /norestart /log "[NetFx48WebLog].html""	33	<ExePackagePayload Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe" DownloadUrl="$(var.NetFx48WebLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="E18E3DB30A0AB2B51F34A9B7EBCEC0FD7B015F74B4525643C170FDE73EE94BA4092E3A82C98BCAE4AEBF48009BA8B6E7FA60B89AB917D8F28E74E84DB9D8CF21" ProductName="Microsoft .NET Framework 4.8" Size="1479400" Version="4.8.3928.0" />
37	UninstallArguments="/uninstall /q /norestart /log "[NetFx48WebLog].html""
38	PerMachine="yes"
39	DetectCondition="!(wix.NetFx48WebDetectCondition)"
40	InstallCondition="!(wix.NetFx48WebInstallCondition)"
41	Id="$(var.NetFx48WebId)"
42	Vital="yes"
43	Permanent="yes"
44	Protocol="netfx4"
45	LogPathVariable="NetFx48WebLog">
46	<ExePackagePayload
47	Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe"
48	DownloadUrl="$(var.NetFx48WebLink)"
49	Description="Microsoft .NET Framework 4.8 Setup"
50	Hash="E18E3DB30A0AB2B51F34A9B7EBCEC0FD7B015F74B4525643C170FDE73EE94BA4092E3A82C98BCAE4AEBF48009BA8B6E7FA60B89AB917D8F28E74E84DB9D8CF21"
51	ProductName="Microsoft .NET Framework 4.8"
52	Size="1479400"
53	Version="4.8.3928.0" />
54	</ExePackage>	34	</ExePackage>
55	</PackageGroup>	35	</PackageGroup>
56	</Fragment>	36	</Fragment>
@@ -71,25 +51,8 @@
71	<WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" />	51	<WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" />
72		52
73	<PackageGroup Id="$(var.NetFx48RedistId)">	53	<PackageGroup Id="$(var.NetFx48RedistId)">
74	<ExePackage	54	<ExePackage InstallArguments="/q /norestart /log "[NetFx48RedistLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx48RedistLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx48RedistDetectCondition)" InstallCondition="!(wix.NetFx48RedistInstallCondition)" Id="$(var.NetFx48RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48RedistLog">
75	InstallArguments="/q /norestart /log "[NetFx48RedistLog].html""	55	<ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="B758812388CD1BE1E6994B58267088FE6C22961D875153CC8B924DFC590F681AF85D750AA412571745B3872CADA56E2A45C4328CFDC5EE8E201743830614609E" ProductName="Microsoft .NET Framework 4.8" Size="117380440" Version="4.8.3928.0" />
76	UninstallArguments="/uninstall /q /norestart /log "[NetFx48RedistLog].html""
77	PerMachine="yes"
78	DetectCondition="!(wix.NetFx48RedistDetectCondition)"
79	InstallCondition="!(wix.NetFx48RedistInstallCondition)"
80	Id="$(var.NetFx48RedistId)"
81	Vital="yes"
82	Permanent="yes"
83	Protocol="netfx4"
84	LogPathVariable="NetFx48RedistLog">
85	<ExePackagePayload
86	Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe"
87	DownloadUrl="$(var.NetFx48RedistLink)"
88	Description="Microsoft .NET Framework 4.8 Setup"
89	Hash="B758812388CD1BE1E6994B58267088FE6C22961D875153CC8B924DFC590F681AF85D750AA412571745B3872CADA56E2A45C4328CFDC5EE8E201743830614609E"
90	ProductName="Microsoft .NET Framework 4.8"
91	Size="117380440"
92	Version="4.8.3928.0" />
93	</ExePackage>	56	</ExePackage>
94	</PackageGroup>	57	</PackageGroup>
95	</Fragment>	58	</Fragment>