From 56d24ed8b292c27288fbf00ff3dba3ff35f042a5 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 7 Apr 2021 20:49:42 -0400
Subject: Update dependencies.

---
 src/ca/netfxca.vcxproj                             |  2 +-
 .../TestData/UsingNativeImage/Package.en-us.wxl    |  4 +-
 .../TestData/UsingNativeImage/Package.wxs          |  8 +--
 .../UsingNativeImage/PackageComponents.wxs         |  4 +-
 src/wixlib/NetCore3.1.12_x64.wxs                   | 72 +++-------------------
 src/wixlib/NetCore3.1.12_x86.wxs                   | 72 +++-------------------
 src/wixlib/NetCore3.1_x64.wxs                      |  6 +-
 src/wixlib/NetCore3.1_x86.wxs                      |  6 +-
 src/wixlib/NetCore3_Platform.wxi                   | 28 ++-------
 src/wixlib/NetCoreShared.wxs                       | 15 +----
 src/wixlib/NetFx1.1.wxs                            |  3 +-
 src/wixlib/NetFx1.wxs                              |  3 +-
 src/wixlib/NetFx2.wxs                              |  3 +-
 src/wixlib/NetFx3.5.wxs                            | 11 +---
 src/wixlib/NetFx3.wxs                              |  3 +-
 src/wixlib/NetFx4.5.wxs                            | 14 +----
 src/wixlib/NetFx4.wxs                              | 22 ++-----
 src/wixlib/NetFx451.wxs                            |  6 +-
 src/wixlib/NetFx452.wxs                            | 49 ++-------------
 src/wixlib/NetFx46.wxs                             | 49 ++-------------
 src/wixlib/NetFx461.wxs                            | 49 ++-------------
 src/wixlib/NetFx462.wxs                            | 49 ++-------------
 src/wixlib/NetFx47.wxs                             |  6 +-
 src/wixlib/NetFx471.wxs                            |  6 +-
 src/wixlib/NetFx472.wxs                            | 49 ++-------------
 src/wixlib/NetFx48.wxs                             | 49 ++-------------
 src/wixlib/NetFxExtension.wxs                      |  3 +-
 src/wixlib/NetFxExtension_arm64.wxs                |  3 +-
 src/wixlib/NetFxExtension_x64.wxs                  |  3 +-
 src/wixlib/NetFxExtension_x86.wxs                  |  3 +-
 30 files changed, 93 insertions(+), 507 deletions(-)

(limited to 'src')

diff --git a/src/ca/netfxca.vcxproj b/src/ca/netfxca.vcxproj
index f01417b6..4196aa80 100644
--- a/src/ca/netfxca.vcxproj
+++ b/src/ca/netfxca.vcxproj
@@ -63,7 +63,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Dutil" Version="4.0.64" />
+    <PackageReference Include="WixToolset.Dutil" Version="4.0.65" />
     <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl
index 38c12ac1..5301bb1a 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
+<!--
 This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs
index 082ac4cc..ace73680 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs
@@ -8,10 +8,8 @@
   </Package>
 
   <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
+      <StandardDirectory Id="ProgramFilesFolder">
         <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
+      </StandardDirectory>
+    </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs
index 21c92f26..a1c806d9 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
   <Fragment>
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
        <Component>
diff --git a/src/wixlib/NetCore3.1.12_x64.wxs b/src/wixlib/NetCore3.1.12_x64.wxs
index e984468f..990dc0bf 100644
--- a/src/wixlib/NetCore3.1.12_x64.wxs
+++ b/src/wixlib/NetCore3.1.12_x64.wxs
@@ -1,8 +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"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
 
     <?define NetCorePlatform = x64?>
     <?define NetCoreIdVersion = 3112?>
@@ -22,26 +20,8 @@
         <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.AspNetCoreRedistId)">
-            <ExePackage
-                InstallArguments="$(var.AspNetCoreRedistInstallArguments)"
-                RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
-                UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)"
-                PerMachine="yes"
-                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.AspNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                LogPathVariable="$(var.AspNetCoreRedistLog)">
-                <ExePackagePayload
-                    Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                    DownloadUrl="$(var.AspNetCoreRedistLink)"
-                    Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
-                    Hash="5CE9839CAE90FB2936033431F2905E97C7DC080DC50108D58714939CCCC6A265694B8259A3BF742A68BF04D9CFFB0602B0306DD401C4CE644BDB96C7D1168E59"
-                    ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
-                    Size="7841808"
-                    Version="3.1.12.21070" />
+            <ExePackage InstallArguments="$(var.AspNetCoreRedistInstallArguments)" RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.AspNetCoreRedistLink)" Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Hash="5CE9839CAE90FB2936033431F2905E97C7DC080DC50108D58714939CCCC6A265694B8259A3BF742A68BF04D9CFFB0602B0306DD401C4CE644BDB96C7D1168E59" ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Size="7841808" Version="3.1.12.21070" />
             </ExePackage>
         </PackageGroup>
     </Fragment>
@@ -55,26 +35,8 @@
         <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
-            <ExePackage
-                InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)"
-                RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
-                UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)"
-                PerMachine="yes"
-                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.DesktopNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                LogPathVariable="$(var.DesktopNetCoreRedistLog)">
-                <ExePackagePayload
-                    Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                    DownloadUrl="$(var.DesktopNetCoreRedistLink)"
-                    Description="Microsoft Windows Desktop Runtime - 3.1.12 (x64)"
-                    Hash="CD69B8722B2FF175FADD6774AB6A97F89292FC57A15CEC95218E79FFF1E26F46A7EFFFB15CE0F6D22B83B991F7083BB5C04F5158F87D298EA0F204933F8ECD27"
-                    ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x64)"
-                    Size="54284816"
-                    Version="3.1.12.29719" />
+            <ExePackage InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DesktopNetCoreRedistLink)" Description="Microsoft Windows Desktop Runtime - 3.1.12 (x64)" Hash="CD69B8722B2FF175FADD6774AB6A97F89292FC57A15CEC95218E79FFF1E26F46A7EFFFB15CE0F6D22B83B991F7083BB5C04F5158F87D298EA0F204933F8ECD27" ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x64)" Size="54284816" Version="3.1.12.29719" />
             </ExePackage>
         </PackageGroup>
     </Fragment>
@@ -88,26 +50,8 @@
         <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DotNetCoreRedistId)">
-            <ExePackage
-                InstallArguments="$(var.DotNetCoreRedistInstallArguments)"
-                RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
-                UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)"
-                PerMachine="yes"
-                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.DotNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                LogPathVariable="$(var.DotNetCoreRedistLog)">
-                <ExePackagePayload
-                    Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                    DownloadUrl="$(var.DotNetCoreRedistLink)"
-                    Description="Microsoft .NET Core Runtime - 3.1.12 (x64)"
-                    Hash="9B3F882AE5DFDC8B50D3CEC4F3292292D658B2FECB84B3F73426FB3C16E6FC6B8E7118EF559CFAE25ED7A2C175FA4D89E18986CA3C05D15F706524FBB667F702"
-                    ProductName="Microsoft .NET Core Runtime - 3.1.12 (x64)"
-                    Size="26090616"
-                    Version="3.1.12.29719" />
+            <ExePackage InstallArguments="$(var.DotNetCoreRedistInstallArguments)" RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DotNetCoreRedistLink)" Description="Microsoft .NET Core Runtime - 3.1.12 (x64)" Hash="9B3F882AE5DFDC8B50D3CEC4F3292292D658B2FECB84B3F73426FB3C16E6FC6B8E7118EF559CFAE25ED7A2C175FA4D89E18986CA3C05D15F706524FBB667F702" ProductName="Microsoft .NET Core Runtime - 3.1.12 (x64)" Size="26090616" Version="3.1.12.29719" />
             </ExePackage>
         </PackageGroup>
     </Fragment>
diff --git a/src/wixlib/NetCore3.1.12_x86.wxs b/src/wixlib/NetCore3.1.12_x86.wxs
index 727336fe..b6d5d371 100644
--- a/src/wixlib/NetCore3.1.12_x86.wxs
+++ b/src/wixlib/NetCore3.1.12_x86.wxs
@@ -1,8 +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"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
 
     <?define NetCorePlatform = x86?>
     <?define NetCoreIdVersion = 3112?>
@@ -22,26 +20,8 @@
         <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.AspNetCoreRedistId)">
-            <ExePackage
-                InstallArguments="$(var.AspNetCoreRedistInstallArguments)"
-                RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
-                UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)"
-                PerMachine="yes"
-                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.AspNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                LogPathVariable="$(var.AspNetCoreRedistLog)">
-                <ExePackagePayload
-                    Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                    DownloadUrl="$(var.AspNetCoreRedistLink)"
-                    Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
-                    Hash="03EE5F6D3B2AF8FFE2A5154BB05E50938E2D36E98D996D9E67A3C349DD0C8B3051D5A9628F48C51E006CEA0B1F4484B4BE51920FE5CA841060B0D2C6A12FD5D2"
-                    ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
-                    Size="7841808"
-                    Version="3.1.12.21070" />
+            <ExePackage InstallArguments="$(var.AspNetCoreRedistInstallArguments)" RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.AspNetCoreRedistLink)" Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Hash="03EE5F6D3B2AF8FFE2A5154BB05E50938E2D36E98D996D9E67A3C349DD0C8B3051D5A9628F48C51E006CEA0B1F4484B4BE51920FE5CA841060B0D2C6A12FD5D2" ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Size="7841808" Version="3.1.12.21070" />
             </ExePackage>
         </PackageGroup>
     </Fragment>
@@ -55,26 +35,8 @@
         <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
-            <ExePackage
-                InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)"
-                RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
-                UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)"
-                PerMachine="yes"
-                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.DesktopNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                LogPathVariable="$(var.DesktopNetCoreRedistLog)">
-                <ExePackagePayload
-                    Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                    DownloadUrl="$(var.DesktopNetCoreRedistLink)"
-                    Description="Microsoft Windows Desktop Runtime - 3.1.12 (x86)"
-                    Hash="C211A7F29D9B6FEEFCF0379B153FFBFB815157D3D494CFD7D0D84D619701EEA284BF12502094BCFF2BB2968213190454E7CE0E865FD623E78C2FCDAEBEF963DA"
-                    ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x86)"
-                    Size="48590696"
-                    Version="3.1.12.29719" />
+            <ExePackage InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DesktopNetCoreRedistLink)" Description="Microsoft Windows Desktop Runtime - 3.1.12 (x86)" Hash="C211A7F29D9B6FEEFCF0379B153FFBFB815157D3D494CFD7D0D84D619701EEA284BF12502094BCFF2BB2968213190454E7CE0E865FD623E78C2FCDAEBEF963DA" ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x86)" Size="48590696" Version="3.1.12.29719" />
             </ExePackage>
         </PackageGroup>
     </Fragment>
@@ -88,26 +50,8 @@
         <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DotNetCoreRedistId)">
-            <ExePackage
-                InstallArguments="$(var.DotNetCoreRedistInstallArguments)"
-                RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
-                UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)"
-                PerMachine="yes"
-                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.DotNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                LogPathVariable="$(var.DotNetCoreRedistLog)">
-                <ExePackagePayload
-                    Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                    DownloadUrl="$(var.DotNetCoreRedistLink)"
-                    Description="Microsoft .NET Core Runtime - 3.1.12 (x86)"
-                    Hash="BA18F9028B19630D91017BEACCD8D79388125C228A83B5A62306108F3BB283617A7ED9B98785BC73192EC00E5D186DA767E940DCAB388699FAF274E437D0C16F"
-                    ProductName="Microsoft .NET Core Runtime - 3.1.12 (x86)"
-                    Size="23392184"
-                    Version="3.1.12.29719" />
+            <ExePackage InstallArguments="$(var.DotNetCoreRedistInstallArguments)" RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)" UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)">
+                <ExePackagePayload Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DotNetCoreRedistLink)" Description="Microsoft .NET Core Runtime - 3.1.12 (x86)" Hash="BA18F9028B19630D91017BEACCD8D79388125C228A83B5A62306108F3BB283617A7ED9B98785BC73192EC00E5D186DA767E940DCAB388699FAF274E437D0C16F" ProductName="Microsoft .NET Core Runtime - 3.1.12 (x86)" Size="23392184" Version="3.1.12.29719" />
             </ExePackage>
         </PackageGroup>
     </Fragment>
diff --git a/src/wixlib/NetCore3.1_x64.wxs b/src/wixlib/NetCore3.1_x64.wxs
index 7c283de1..60d7c27f 100644
--- a/src/wixlib/NetCore3.1_x64.wxs
+++ b/src/wixlib/NetCore3.1_x64.wxs
@@ -1,8 +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"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
     <Fragment>
         <PackageGroup Id="AspNetCoreRuntime31Redist_x64">
diff --git a/src/wixlib/NetCore3.1_x86.wxs b/src/wixlib/NetCore3.1_x86.wxs
index 751d364d..cfff07b3 100644
--- a/src/wixlib/NetCore3.1_x86.wxs
+++ b/src/wixlib/NetCore3.1_x86.wxs
@@ -1,8 +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"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
     <Fragment>
         <PackageGroup Id="AspNetCoreRuntime31Redist_x86">
diff --git a/src/wixlib/NetCore3_Platform.wxi b/src/wixlib/NetCore3_Platform.wxi
index bb7e59a7..c7aaca50 100644
--- a/src/wixlib/NetCore3_Platform.wxi
+++ b/src/wixlib/NetCore3_Platform.wxi
@@ -1,10 +1,7 @@
-<?xml version="1.0"?>
-<!-- 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. -->
 
 
-<Include 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">
+<Include 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">
 
   <?define AspNetCoreId = ASPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
   <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
@@ -29,32 +26,17 @@
 
   <Fragment>
     <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
-    <util:DirectorySearch
-        Id="$(var.AspNetCoreId)"
-        Variable="$(var.AspNetCoreId)"
-        Path="[$(var.DotNetHomeId)]\shared\Microsoft.AspNetCore.App\$(var.NetCoreVersion)"
-        Result="exists"
-        After="$(var.DotNetHomeId)" />
+    <util:DirectorySearch Id="$(var.AspNetCoreId)" Variable="$(var.AspNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.AspNetCore.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" />
   </Fragment>
 
   <Fragment>
     <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
-    <util:DirectorySearch
-        Id="$(var.DesktopNetCoreId)"
-        Variable="$(var.DesktopNetCoreId)"
-        Path="[$(var.DotNetHomeId)]\shared\Microsoft.WindowsDesktop.App\$(var.NetCoreVersion)"
-        Result="exists"
-        After="$(var.DotNetHomeId)" />
+    <util:DirectorySearch Id="$(var.DesktopNetCoreId)" Variable="$(var.DesktopNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.WindowsDesktop.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" />
   </Fragment>
 
   <Fragment>
     <util:RegistrySearchRef Id="$(var.DotNetHomeId)" />
-    <util:DirectorySearch
-        Id="$(var.DotNetCoreId)"
-        Variable="$(var.DotNetCoreId)"
-        Path="[$(var.DotNetHomeId)]\shared\Microsoft.NETCore.App\$(var.NetCoreVersion)"
-        Result="exists"
-        After="$(var.DotNetHomeId)" />
+    <util:DirectorySearch Id="$(var.DotNetCoreId)" Variable="$(var.DotNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.NETCore.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" />
   </Fragment>
 
   <Fragment>
diff --git a/src/wixlib/NetCoreShared.wxs b/src/wixlib/NetCoreShared.wxs
index 540eae6a..0332041a 100644
--- a/src/wixlib/NetCoreShared.wxs
+++ b/src/wixlib/NetCoreShared.wxs
@@ -1,20 +1,11 @@
-<?xml version="1.0"?>
-<!-- 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"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
 
   <?foreach PLATFORM in x86;x64?>
   <Fragment>
-    <util:RegistrySearch
-        Id="DOTNETHOME_$(var.PLATFORM)"
-        Variable="DOTNETHOME_$(var.PLATFORM)"
-        Root="HKLM"
-        Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)"
-        Value="InstallLocation"
-        Result="value"
-        Bitness="always32" />
+    <util:RegistrySearch Id="DOTNETHOME_$(var.PLATFORM)" Variable="DOTNETHOME_$(var.PLATFORM)" Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)" Value="InstallLocation" Result="value" Bitness="always32" />
   </Fragment>
   <?endforeach?>
 </Wix>
diff --git a/src/wixlib/NetFx1.1.wxs b/src/wixlib/NetFx1.1.wxs
index 406aef3f..12f0a4e3 100644
--- a/src/wixlib/NetFx1.1.wxs
+++ b/src/wixlib/NetFx1.1.wxs
@@ -1,5 +1,4 @@
-<?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">
diff --git a/src/wixlib/NetFx1.wxs b/src/wixlib/NetFx1.wxs
index c1b266e8..68d6f13d 100644
--- a/src/wixlib/NetFx1.wxs
+++ b/src/wixlib/NetFx1.wxs
@@ -1,5 +1,4 @@
-<?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">
diff --git a/src/wixlib/NetFx2.wxs b/src/wixlib/NetFx2.wxs
index 9ca358f1..e5eef54b 100644
--- a/src/wixlib/NetFx2.wxs
+++ b/src/wixlib/NetFx2.wxs
@@ -1,5 +1,4 @@
-<?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">
diff --git a/src/wixlib/NetFx3.5.wxs b/src/wixlib/NetFx3.5.wxs
index 7544e433..c1a80f50 100644
--- a/src/wixlib/NetFx3.5.wxs
+++ b/src/wixlib/NetFx3.5.wxs
@@ -1,5 +1,4 @@
-<?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" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
@@ -15,13 +14,7 @@
 
     <!-- Indicates the service pack level for the .NET Framework 3.5 (for bundles). -->
     <Fragment>
-        <util:RegistrySearch
-            Id="NETFRAMEWORK35_SP_LEVEL"
-            Variable="NETFRAMEWORK35_SP_LEVEL"
-            Root="HKLM"
-            Key="Software\Microsoft\NET Framework Setup\NDP\v3.5"
-            Value="SP"
-            Result="value" />
+        <util:RegistrySearch Id="NETFRAMEWORK35_SP_LEVEL" Variable="NETFRAMEWORK35_SP_LEVEL" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5" Value="SP" Result="value" />
     </Fragment>
 
     <!-- set to #1 if the .NET Framework 3.5 is installed (not set otherwise) -->
diff --git a/src/wixlib/NetFx3.wxs b/src/wixlib/NetFx3.wxs
index ee5dbdb3..5fb279ea 100644
--- a/src/wixlib/NetFx3.wxs
+++ b/src/wixlib/NetFx3.wxs
@@ -1,5 +1,4 @@
-<?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">
diff --git a/src/wixlib/NetFx4.5.wxs b/src/wixlib/NetFx4.5.wxs
index 9f09e663..443235d4 100644
--- a/src/wixlib/NetFx4.5.wxs
+++ b/src/wixlib/NetFx4.5.wxs
@@ -1,9 +1,7 @@
-<?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"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
 
   <!--
         .NET Framework installation state properties
@@ -27,13 +25,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearch
-        Id="NETFRAMEWORK45"
-        Variable="NETFRAMEWORK45"
-        Root="HKLM"
-        Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full"
-        Value="Release"
-        Result="value" />
+    <util:RegistrySearch Id="NETFRAMEWORK45" Variable="NETFRAMEWORK45" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Release" Result="value" />
   </Fragment>
 
   <!-- set to Release number of the .NET Framework 4.5 if installed (not set otherwise) -->
diff --git a/src/wixlib/NetFx4.wxs b/src/wixlib/NetFx4.wxs
index 979c1da4..295d8078 100644
--- a/src/wixlib/NetFx4.wxs
+++ b/src/wixlib/NetFx4.wxs
@@ -1,9 +1,7 @@
-<?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"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
 
   <!--
         .NET Framework installation state properties
@@ -30,23 +28,11 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearch
-        Id="NETFRAMEWORK40"
-        Variable="NETFRAMEWORK40"
-        Root="HKLM"
-        Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full"
-        Value="Install"
-        Result="value" />
+    <util:RegistrySearch Id="NETFRAMEWORK40" Variable="NETFRAMEWORK40" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Install" Result="value" />
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearch
-        Id="NETFRAMEWORK40CLIENT"
-        Variable="NETFRAMEWORK40CLIENT"
-        Root="HKLM"
-        Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client"
-        Value="Install"
-        Result="value" />
+    <util:RegistrySearch Id="NETFRAMEWORK40CLIENT" Variable="NETFRAMEWORK40CLIENT" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" Value="Install" Result="value" />
   </Fragment>
 
   <!-- set to #1 if the .NET Framework 4.0 client is installed (not set otherwise) -->
diff --git a/src/wixlib/NetFx451.wxs b/src/wixlib/NetFx451.wxs
index 08a9b4f2..88363555 100644
--- a/src/wixlib/NetFx451.wxs
+++ b/src/wixlib/NetFx451.wxs
@@ -1,9 +1,7 @@
-<?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"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
   <!--
         .NET Framework installation state properties
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 @@
-<?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"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<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">
 
   <!--
         .NET Framework installation state properties
@@ -34,25 +31,8 @@
     <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx452WebId)">
-      <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">
-        <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" />
+      <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">
+        <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" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
@@ -73,25 +53,8 @@
     <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx452RedistId)">
-      <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">
-        <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" />
+      <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">
+        <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" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
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 @@
-<?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"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<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">
 
   <!--
         .NET Framework installation state properties
@@ -35,25 +32,8 @@
     <WixVariable Id="NetFx46WebPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx46WebId)">
-      <ExePackage
-          InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;"
-          UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;"
-          PerMachine="yes"
-          DetectCondition="!(wix.NetFx46WebDetectCondition)"
-          InstallCondition="!(wix.NetFx46WebInstallCondition)"
-          Id="$(var.NetFx46WebId)"
-          Vital="yes"
-          Permanent="yes"
-          Protocol="netfx4"
-          LogPathVariable="NetFx46FullLog">
-        <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" />
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx46WebDetectCondition)" InstallCondition="!(wix.NetFx46WebInstallCondition)" Id="$(var.NetFx46WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog">
+        <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" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
@@ -74,25 +54,8 @@
     <WixVariable Id="NetFx46RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx46RedistId)">
-      <ExePackage
-          InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;"
-          UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;"
-          PerMachine="yes"
-          DetectCondition="!(wix.NetFx46RedistDetectCondition)"
-          InstallCondition="!(wix.NetFx46RedistInstallCondition)"
-          Id="$(var.NetFx46RedistId)"
-          Vital="yes"
-          Permanent="yes"
-          Protocol="netfx4"
-          LogPathVariable="NetFx46FullLog">
-        <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" />
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx46RedistDetectCondition)" InstallCondition="!(wix.NetFx46RedistInstallCondition)" Id="$(var.NetFx46RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog">
+        <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" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
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 @@
-<?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"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<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">
 
   <!--
         .NET Framework installation state properties
@@ -34,25 +31,8 @@
     <WixVariable Id="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx461WebId)">
-      <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">
-        <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" />
+      <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">
+        <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" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
@@ -73,25 +53,8 @@
     <WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx461RedistId)">
-      <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">
-        <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" />
+      <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">
+        <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" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
diff --git a/src/wixlib/NetFx462.wxs b/src/wixlib/NetFx462.wxs
index 22cb70c9..52cd5b14 100644
--- a/src/wixlib/NetFx462.wxs
+++ b/src/wixlib/NetFx462.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"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<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">
 
   <!--
         .NET Framework installation state properties
@@ -34,25 +31,8 @@
     <WixVariable Id="NetFx462WebPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx462WebId)">
-      <ExePackage
-          InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;"
-          UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;"
-          PerMachine="yes"
-          DetectCondition="!(wix.NetFx462WebDetectCondition)"
-          InstallCondition="!(wix.NetFx462WebInstallCondition)"
-          Id="$(var.NetFx462WebId)"
-          Vital="yes"
-          Permanent="yes"
-          Protocol="netfx4"
-          LogPathVariable="NetFx462FullLog">
-        <ExePackagePayload 
-          Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe"
-          DownloadUrl="$(var.NetFx462WebLink)"
-          Description="Microsoft .NET Framework 4.6.2 Setup" 
-          Hash="31D7081BFFEEB5F32457096E51A29236306E5D971DE7EDB80A51188BCCDA9B9F17F0C3593D30828FC140B7A023F5B6842BC922F2023C7B8EA3786C2DBEC40472" 
-          ProductName="Microsoft .NET Framework 4.6.2" 
-          Size="1429344" 
-          Version="4.6.1590.0" />
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx462WebDetectCondition)" InstallCondition="!(wix.NetFx462WebInstallCondition)" Id="$(var.NetFx462WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx462FullLog">
+        <ExePackagePayload Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe" DownloadUrl="$(var.NetFx462WebLink)" Description="Microsoft .NET Framework 4.6.2 Setup" Hash="31D7081BFFEEB5F32457096E51A29236306E5D971DE7EDB80A51188BCCDA9B9F17F0C3593D30828FC140B7A023F5B6842BC922F2023C7B8EA3786C2DBEC40472" ProductName="Microsoft .NET Framework 4.6.2" Size="1429344" Version="4.6.1590.0" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
@@ -73,25 +53,8 @@
     <WixVariable Id="NetFx462RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx462RedistId)">
-      <ExePackage
-          InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;"
-          UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;"
-          PerMachine="yes"
-          DetectCondition="!(wix.NetFx462RedistDetectCondition)"
-          InstallCondition="!(wix.NetFx462RedistInstallCondition)"
-          Id="$(var.NetFx462RedistId)"
-          Vital="yes"
-          Permanent="yes"
-          Protocol="netfx4"
-          LogPathVariable="NetFx462FullLog">
-        <ExePackagePayload
-          Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe"
-          DownloadUrl="$(var.NetFx462RedistLink)"
-          Description="Microsoft .NET Framework 4.6.2 Setup" 
-          Hash="E183B33F93FD5F9AA93A1EC02103D2548CA22E3447EF2CEEDE89A5DEBEFC4F2C20990567EB17AFA412E0698D577ADDA373E433847EC8B79EC04BE3C86EDD9F0E" 
-          ProductName="Microsoft .NET Framework 4.6.2" 
-          Size="62008080" 
-          Version="4.6.1590.0" />
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx462RedistDetectCondition)" InstallCondition="!(wix.NetFx462RedistInstallCondition)" Id="$(var.NetFx462RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx462FullLog">
+        <ExePackagePayload Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx462RedistLink)" Description="Microsoft .NET Framework 4.6.2 Setup" Hash="E183B33F93FD5F9AA93A1EC02103D2548CA22E3447EF2CEEDE89A5DEBEFC4F2C20990567EB17AFA412E0698D577ADDA373E433847EC8B79EC04BE3C86EDD9F0E" ProductName="Microsoft .NET Framework 4.6.2" Size="62008080" Version="4.6.1590.0" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
diff --git a/src/wixlib/NetFx47.wxs b/src/wixlib/NetFx47.wxs
index 277f466e..84f4a221 100644
--- a/src/wixlib/NetFx47.wxs
+++ b/src/wixlib/NetFx47.wxs
@@ -1,8 +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"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
   <!--
         .NET Framework installation state properties
diff --git a/src/wixlib/NetFx471.wxs b/src/wixlib/NetFx471.wxs
index c5399ce0..b5f825ab 100644
--- a/src/wixlib/NetFx471.wxs
+++ b/src/wixlib/NetFx471.wxs
@@ -1,8 +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"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
   <!--
         .NET Framework installation state properties
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 @@
-<?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"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<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">
 
   <!--
         .NET Framework installation state properties
@@ -32,25 +29,8 @@
     <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx472WebId)">
-      <ExePackage
-          InstallArguments="/q /norestart /log &quot;[NetFx472WebLog].html&quot;"
-          UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472WebLog].html&quot;"
-          PerMachine="yes"
-          DetectCondition="!(wix.NetFx472WebDetectCondition)"
-          InstallCondition="!(wix.NetFx472WebInstallCondition)"
-          Id="$(var.NetFx472WebId)"
-          Vital="yes"
-          Permanent="yes"
-          Protocol="netfx4"
-          LogPathVariable="NetFx472WebLog">
-        <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" />
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx472WebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472WebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx472WebDetectCondition)" InstallCondition="!(wix.NetFx472WebInstallCondition)" Id="$(var.NetFx472WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472WebLog">
+        <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" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
@@ -71,25 +51,8 @@
     <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx472RedistId)">
-      <ExePackage
-          InstallArguments="/q /norestart /log &quot;[NetFx472RedistLog].html&quot;"
-          UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472RedistLog].html&quot;"
-          PerMachine="yes"
-          DetectCondition="!(wix.NetFx472RedistDetectCondition)"
-          InstallCondition="!(wix.NetFx472RedistInstallCondition)"
-          Id="$(var.NetFx472RedistId)"
-          Vital="yes"
-          Permanent="yes"
-          Protocol="netfx4"
-          LogPathVariable="NetFx472RedistLog">
-        <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" />
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx472RedistLog].html&quot;" UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx472RedistDetectCondition)" InstallCondition="!(wix.NetFx472RedistInstallCondition)" Id="$(var.NetFx472RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472RedistLog">
+        <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" />
       </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 @@
-<?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"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<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">
 
     <!--
       .NET Framework installation state properties
@@ -32,25 +29,8 @@
         <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
 
         <PackageGroup Id="$(var.NetFx48WebId)">
-            <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">
-                <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 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">
+                <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
-                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">
-                <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 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">
+                <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/NetFxExtension.wxs b/src/wixlib/NetFxExtension.wxs
index b64dc004..63c79235 100644
--- a/src/wixlib/NetFxExtension.wxs
+++ b/src/wixlib/NetFxExtension.wxs
@@ -1,5 +1,4 @@
-<?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">
diff --git a/src/wixlib/NetFxExtension_arm64.wxs b/src/wixlib/NetFxExtension_arm64.wxs
index 8b1f9d36..a0492fde 100644
--- a/src/wixlib/NetFxExtension_arm64.wxs
+++ b/src/wixlib/NetFxExtension_arm64.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<!-- 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">
diff --git a/src/wixlib/NetFxExtension_x64.wxs b/src/wixlib/NetFxExtension_x64.wxs
index cc079e5a..81c9d768 100644
--- a/src/wixlib/NetFxExtension_x64.wxs
+++ b/src/wixlib/NetFxExtension_x64.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<!-- 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">
diff --git a/src/wixlib/NetFxExtension_x86.wxs b/src/wixlib/NetFxExtension_x86.wxs
index 7245a4dd..b8ad1927 100644
--- a/src/wixlib/NetFxExtension_x86.wxs
+++ b/src/wixlib/NetFxExtension_x86.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<!-- 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">
-- 
cgit v1.2.3-55-g6feb