From 1362692be423f821e98f2f5693849206f5ce8620 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 8 Dec 2020 11:35:47 -0600
Subject: Format wixlib files using 'wix format'.

---
 src/wixlib/BalExtension.wxs      |  8 ----
 src/wixlib/Dnc.wxs               | 43 ++++++++++---------
 src/wixlib/Mba.wxs               | 90 ++++++++++++++++++++--------------------
 src/wixlib/caSuffix.wxi          | 13 +++---
 src/wixlib/wixstdba.wxs          | 77 +++++++++++++++++-----------------
 src/wixlib/wixstdba_platform.wxi | 27 ++++++------
 src/wixlib/wixstdba_x86.wxs      |  5 +--
 7 files changed, 124 insertions(+), 139 deletions(-)
 delete mode 100644 src/wixlib/BalExtension.wxs

(limited to 'src')

diff --git a/src/wixlib/BalExtension.wxs b/src/wixlib/BalExtension.wxs
deleted file mode 100644
index 2da3d5b2..00000000
--- a/src/wixlib/BalExtension.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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. -->
-
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Fragment>
-    </Fragment>
-</Wix>
diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs
index 2663360f..bb70583a 100644
--- a/src/wixlib/Dnc.wxs
+++ b/src/wixlib/Dnc.wxs
@@ -1,55 +1,54 @@
-<?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">
     <!--
      Dnc.wxs - .NET Core BA resources.
     -->
     <Fragment>
-        <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost' SourceFile='dnchost.dll'>
-            <PayloadGroupRef Id='Dnc' />
-            <PayloadGroupRef Id='DncPreqStandard' />
+        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost" SourceFile="dnchost.dll">
+            <PayloadGroupRef Id="Dnc" />
+            <PayloadGroupRef Id="DncPreqStandard" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.RtfLicense' SourceFile='dnchost.dll'>
-            <PayloadGroupRef Id='Dnc' />
-            <PayloadGroupRef Id='DncPreqStandard' />
+        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense" SourceFile="dnchost.dll">
+            <PayloadGroupRef Id="Dnc" />
+            <PayloadGroupRef Id="DncPreqStandard" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.Minimal' SourceFile='dnchost.dll'>
-            <PayloadGroupRef Id='Dnc' />
+        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal" SourceFile="dnchost.dll">
+            <PayloadGroupRef Id="Dnc" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal' SourceFile='dnchost.dll'>
-            <PayloadGroupRef Id='Dnc' />
+        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="dnchost.dll">
+            <PayloadGroupRef Id="Dnc" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.Foundation' SourceFile='dnchost.dll'>
-            <PayloadGroupRef Id='Dnc' />
+        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation" SourceFile="dnchost.dll">
+            <PayloadGroupRef Id="Dnc" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <PayloadGroup Id='Dnc'>
-            <Payload Compressed='yes' SourceFile='WixToolset.Dnc.Host.dll' />
-            <Payload Compressed='yes' SourceFile='wixstdba.dll' Name='dncpreq.dll' />
+        <PayloadGroup Id="Dnc">
+            <Payload Compressed="yes" SourceFile="WixToolset.Dnc.Host.dll" />
+            <Payload Compressed="yes" SourceFile="wixstdba.dll" Name="dncpreq.dll" />
         </PayloadGroup>
     </Fragment>
 
     <Fragment>
-        <PayloadGroup Id='DncPreqStandard'>
-            <Payload Name='mbapreq.thm' Compressed='yes' SourceFile='!(wix.DncPreqbaThemeXml=SourceDir\dncpreq.thm)' />
-            <Payload Name='mbapreq.png' Compressed='yes' SourceFile='!(wix.DncPreqbaLogo=SourceDir\mbapreq.png)' />
-            <Payload Name='mbapreq.wxl' Compressed='yes' SourceFile='!(wix.DncPreqbaThemeWxl=SourceDir\dncpreq.wxl)' />
+        <PayloadGroup Id="DncPreqStandard">
+            <Payload Name="mbapreq.thm" Compressed="yes" SourceFile="!(wix.DncPreqbaThemeXml=SourceDir\dncpreq.thm)" />
+            <Payload Name="mbapreq.png" Compressed="yes" SourceFile="!(wix.DncPreqbaLogo=SourceDir\mbapreq.png)" />
+            <Payload Name="mbapreq.wxl" Compressed="yes" SourceFile="!(wix.DncPreqbaThemeWxl=SourceDir\dncpreq.wxl)" />
         </PayloadGroup>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs
index a99b41d8..ae3084ca 100644
--- a/src/wixlib/Mba.wxs
+++ b/src/wixlib/Mba.wxs
@@ -1,78 +1,76 @@
-<?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">
     <!--
      Mba.wxs - Managed UX resources.
     -->
     <Fragment>
-        <BootstrapperApplication Id='ManagedBootstrapperApplicationHost' SourceFile='mbahost.dll'>
-            <PayloadGroupRef Id='Mba' />
-            <PayloadGroupRef Id='MbaPreqStandard' />
+        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost" SourceFile="mbahost.dll">
+            <PayloadGroupRef Id="Mba" />
+            <PayloadGroupRef Id="MbaPreqStandard" />
         </BootstrapperApplication>
     </Fragment>
-    
     <Fragment>
-        <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.RtfLicense' SourceFile='mbahost.dll'>
-            <PayloadGroupRef Id='Mba' />
-            <PayloadGroupRef Id='MbaPreqStandard' />
+        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense" SourceFile="mbahost.dll">
+            <PayloadGroupRef Id="Mba" />
+            <PayloadGroupRef Id="MbaPreqStandard" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.Minimal' SourceFile='mbahost.dll'>
-            <PayloadGroupRef Id='Mba' />
+        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Minimal" SourceFile="mbahost.dll">
+            <PayloadGroupRef Id="Mba" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.RtfLicense.Minimal' SourceFile='mbahost.dll'>
-            <PayloadGroupRef Id='Mba' />
+        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="mbahost.dll">
+            <PayloadGroupRef Id="Mba" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.Foundation' SourceFile='mbahost.dll'>
-            <PayloadGroupRef Id='Mba' />
+        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Foundation" SourceFile="mbahost.dll">
+            <PayloadGroupRef Id="Mba" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <PayloadGroup Id='Mba'>
-            <Payload Compressed='yes' SourceFile='WixToolset.Mba.Host.dll' />
-            <Payload Compressed='yes' SourceFile='wixstdba.dll' Name='mbapreq.dll' />
+        <PayloadGroup Id="Mba">
+            <Payload Compressed="yes" SourceFile="WixToolset.Mba.Host.dll" />
+            <Payload Compressed="yes" SourceFile="wixstdba.dll" Name="mbapreq.dll" />
         </PayloadGroup>
     </Fragment>
 
     <Fragment>
-        <PayloadGroup Id='MbaPreqStandard'>
-            <Payload Name='mbapreq.thm' Compressed='yes' SourceFile='!(wix.PreqbaThemeXml=SourceDir\mbapreq.thm)' />
-            <Payload Name='mbapreq.png' Compressed='yes' SourceFile='!(wix.PreqbaLogo=SourceDir\mbapreq.png)' />
-            <Payload Name='mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl=SourceDir\mbapreq.wxl)' />
-            <Payload Name='1028\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1028=SourceDir\1028\mbapreq.wxl)' />
-            <Payload Name='1029\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1029=SourceDir\1029\mbapreq.wxl)' />
-            <Payload Name='1030\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1030=SourceDir\1030\mbapreq.wxl)' />
-            <Payload Name='1031\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1031=SourceDir\1031\mbapreq.wxl)' />
-            <Payload Name='1032\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1032=SourceDir\1032\mbapreq.wxl)' />
-            <Payload Name='1035\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1035=SourceDir\1035\mbapreq.wxl)' />
-            <Payload Name='1036\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1036=SourceDir\1036\mbapreq.wxl)' />
-            <Payload Name='1038\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1038=SourceDir\1038\mbapreq.wxl)' />
-            <Payload Name='1040\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1040=SourceDir\1040\mbapreq.wxl)' />
-            <Payload Name='1041\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1041=SourceDir\1041\mbapreq.wxl)' />
-            <Payload Name='1042\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1042=SourceDir\1042\mbapreq.wxl)' />
-            <Payload Name='1043\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1043=SourceDir\1043\mbapreq.wxl)' />
-            <Payload Name='1044\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1044=SourceDir\1044\mbapreq.wxl)' />
-            <Payload Name='1045\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1045=SourceDir\1045\mbapreq.wxl)' />
-            <Payload Name='1046\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1046=SourceDir\1046\mbapreq.wxl)' />
-            <Payload Name='1049\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1049=SourceDir\1049\mbapreq.wxl)' />
-            <Payload Name='1051\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1051=SourceDir\1051\mbapreq.wxl)' />
-            <Payload Name='1053\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1053=SourceDir\1053\mbapreq.wxl)' />
-            <Payload Name='1055\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1055=SourceDir\1055\mbapreq.wxl)' />
-            <Payload Name='1060\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1060=SourceDir\1060\mbapreq.wxl)' />
-            <Payload Name='2052\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl2052=SourceDir\2052\mbapreq.wxl)' />
-            <Payload Name='2070\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl2070=SourceDir\2070\mbapreq.wxl)' />
-            <Payload Name='3082\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl3082=SourceDir\3082\mbapreq.wxl)' />
+        <PayloadGroup Id="MbaPreqStandard">
+            <Payload Name="mbapreq.thm" Compressed="yes" SourceFile="!(wix.PreqbaThemeXml=SourceDir\mbapreq.thm)" />
+            <Payload Name="mbapreq.png" Compressed="yes" SourceFile="!(wix.PreqbaLogo=SourceDir\mbapreq.png)" />
+            <Payload Name="mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl=SourceDir\mbapreq.wxl)" />
+            <Payload Name="1028\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1028=SourceDir\1028\mbapreq.wxl)" />
+            <Payload Name="1029\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1029=SourceDir\1029\mbapreq.wxl)" />
+            <Payload Name="1030\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1030=SourceDir\1030\mbapreq.wxl)" />
+            <Payload Name="1031\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1031=SourceDir\1031\mbapreq.wxl)" />
+            <Payload Name="1032\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1032=SourceDir\1032\mbapreq.wxl)" />
+            <Payload Name="1035\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1035=SourceDir\1035\mbapreq.wxl)" />
+            <Payload Name="1036\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1036=SourceDir\1036\mbapreq.wxl)" />
+            <Payload Name="1038\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1038=SourceDir\1038\mbapreq.wxl)" />
+            <Payload Name="1040\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1040=SourceDir\1040\mbapreq.wxl)" />
+            <Payload Name="1041\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1041=SourceDir\1041\mbapreq.wxl)" />
+            <Payload Name="1042\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1042=SourceDir\1042\mbapreq.wxl)" />
+            <Payload Name="1043\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1043=SourceDir\1043\mbapreq.wxl)" />
+            <Payload Name="1044\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1044=SourceDir\1044\mbapreq.wxl)" />
+            <Payload Name="1045\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1045=SourceDir\1045\mbapreq.wxl)" />
+            <Payload Name="1046\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1046=SourceDir\1046\mbapreq.wxl)" />
+            <Payload Name="1049\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1049=SourceDir\1049\mbapreq.wxl)" />
+            <Payload Name="1051\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1051=SourceDir\1051\mbapreq.wxl)" />
+            <Payload Name="1053\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1053=SourceDir\1053\mbapreq.wxl)" />
+            <Payload Name="1055\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1055=SourceDir\1055\mbapreq.wxl)" />
+            <Payload Name="1060\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1060=SourceDir\1060\mbapreq.wxl)" />
+            <Payload Name="2052\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl2052=SourceDir\2052\mbapreq.wxl)" />
+            <Payload Name="2070\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl2070=SourceDir\2070\mbapreq.wxl)" />
+            <Payload Name="3082\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl3082=SourceDir\3082\mbapreq.wxl)" />
         </PayloadGroup>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi
index a56a2393..18436269 100644
--- a/src/wixlib/caSuffix.wxi
+++ b/src/wixlib/caSuffix.wxi
@@ -1,28 +1,27 @@
-<?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. -->
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?ifndef platform ?>
         <?error Required value "platform" not defined in include caSuffix.wxi ?>
-    <?endif ?>
+    <?endif?>
 
     <?ifdef Suffix ?>
         <?undef Suffix ?>
         <?undef DeferredSuffix ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)="x86" ?>
         <?define Suffix="" ?>
         <?define DeferredSuffix="" ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)="x64" ?>
         <?define Suffix="_x64" ?>
         <?define DeferredSuffix="_64" ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)="arm" ?>
         <?define Suffix="_ARM" ?>
         <?define DeferredSuffix="_ARM" ?>
-    <?endif ?>
+    <?endif?>
 </Include>
diff --git a/src/wixlib/wixstdba.wxs b/src/wixlib/wixstdba.wxs
index b2923eaa..8181b9b4 100644
--- a/src/wixlib/wixstdba.wxs
+++ b/src/wixlib/wixstdba.wxs
@@ -1,93 +1,92 @@
-<?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">
     <!-- RTF License Payload Group -->
     <Fragment>
-        <PayloadGroup Id='WixStdbaRtfLicensePayloads'>
-            <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=RtfTheme.xml)' />
-            <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=RtfTheme.wxl)' />
-            <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
+        <PayloadGroup Id="WixStdbaRtfLicensePayloads">
+            <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=RtfTheme.xml)" />
+            <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=RtfTheme.wxl)" />
+            <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" />
 
-            <Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' />
+            <Payload Name="!(wix.WixStdbaLicenseRtfName=license.rtf)" Compressed="yes" SourceFile="!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)" />
         </PayloadGroup>
 
-        <BundleCustomDataRef Id='WixStdbaInformation'>
+        <BundleCustomDataRef Id="WixStdbaInformation">
             <BundleElement>
-                <BundleAttribute Id='LicenseFile' Value='!(wix.WixStdbaLicenseRtfName=license.rtf)' />
+                <BundleAttribute Id="LicenseFile" Value="!(wix.WixStdbaLicenseRtfName=license.rtf)" />
             </BundleElement>
         </BundleCustomDataRef>
     </Fragment>
 
     <!-- RTF Large License Payload Group -->
     <Fragment>
-        <PayloadGroup Id='WixStdbaRtfLargeLicensePayloads'>
-            <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=RtfLargeTheme.xml)' />
-            <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=RtfTheme.wxl)' />
-            <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
+        <PayloadGroup Id="WixStdbaRtfLargeLicensePayloads">
+            <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=RtfLargeTheme.xml)" />
+            <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=RtfTheme.wxl)" />
+            <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" />
 
-            <Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' />
+            <Payload Name="!(wix.WixStdbaLicenseRtfName=license.rtf)" Compressed="yes" SourceFile="!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)" />
         </PayloadGroup>
 
-        <BundleCustomDataRef Id='WixStdbaInformation'>
+        <BundleCustomDataRef Id="WixStdbaInformation">
             <BundleElement>
-                <BundleAttribute Id='LicenseFile' Value='!(wix.WixStdbaLicenseRtfName=license.rtf)' />
+                <BundleAttribute Id="LicenseFile" Value="!(wix.WixStdbaLicenseRtfName=license.rtf)" />
             </BundleElement>
         </BundleCustomDataRef>
     </Fragment>
 
     <!-- Hyperlink License Payload Group -->
     <Fragment>
-        <PayloadGroup Id='WixStdbaHyperlinkLicensePayloads'>
-            <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=HyperlinkTheme.xml)' />
-            <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)' />
-            <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
+        <PayloadGroup Id="WixStdbaHyperlinkLicensePayloads">
+            <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=HyperlinkTheme.xml)" />
+            <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)" />
+            <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" />
         </PayloadGroup>
 
-        <BundleCustomDataRef Id='WixStdbaInformation'>
+        <BundleCustomDataRef Id="WixStdbaInformation">
             <BundleElement>
-                <BundleAttribute Id='LicenseUrl' Value='!(wix.WixStdbaLicenseUrl)' />
+                <BundleAttribute Id="LicenseUrl" Value="!(wix.WixStdbaLicenseUrl)" />
             </BundleElement>
         </BundleCustomDataRef>
     </Fragment>
 
     <!-- Hyperlink Large License Payload Group -->
     <Fragment>
-        <PayloadGroup Id='WixStdbaHyperlinkLargeLicensePayloads'>
-            <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=HyperlinkLargeTheme.xml)' />
-            <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)' />
-            <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
+        <PayloadGroup Id="WixStdbaHyperlinkLargeLicensePayloads">
+            <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=HyperlinkLargeTheme.xml)" />
+            <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)" />
+            <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" />
         </PayloadGroup>
 
-        <BundleCustomDataRef Id='WixStdbaInformation'>
+        <BundleCustomDataRef Id="WixStdbaInformation">
             <BundleElement>
-                <BundleAttribute Id='LicenseUrl' Value='!(wix.WixStdbaLicenseUrl)' />
+                <BundleAttribute Id="LicenseUrl" Value="!(wix.WixStdbaLicenseUrl)" />
             </BundleElement>
         </BundleCustomDataRef>
     </Fragment>
 
     <!-- HyperlinkSidebar License Payload Group -->
     <Fragment>
-        <PayloadGroup Id='WixStdbaHyperlinkSidebarLicensePayloads'>
-            <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=HyperlinkSidebarTheme.xml)' />
-            <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)' />
-            <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
-            <Payload Name='logoside.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogoSide=logoside.png)' />
+        <PayloadGroup Id="WixStdbaHyperlinkSidebarLicensePayloads">
+            <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=HyperlinkSidebarTheme.xml)" />
+            <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)" />
+            <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" />
+            <Payload Name="logoside.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogoSide=logoside.png)" />
         </PayloadGroup>
 
-        <BundleCustomDataRef Id='WixStdbaInformation'>
+        <BundleCustomDataRef Id="WixStdbaInformation">
             <BundleElement>
-                <BundleAttribute Id='LicenseUrl' Value='!(wix.WixStdbaLicenseUrl)' />
+                <BundleAttribute Id="LicenseUrl" Value="!(wix.WixStdbaLicenseUrl)" />
             </BundleElement>
         </BundleCustomDataRef>
     </Fragment>
 
     <!-- BootstrapperApplicationData tables definition -->
     <Fragment>
-        <BundleCustomData Id='WixStdbaInformation'>
-            <BundleAttributeDefinition Id='LicenseFile' />
-            <BundleAttributeDefinition Id='LicenseUrl' />
+        <BundleCustomData Id="WixStdbaInformation">
+            <BundleAttributeDefinition Id="LicenseFile" />
+            <BundleAttributeDefinition Id="LicenseUrl" />
         </BundleCustomData>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/wixstdba_platform.wxi b/src/wixlib/wixstdba_platform.wxi
index 4076e30c..a4dc917d 100644
--- a/src/wixlib/wixstdba_platform.wxi
+++ b/src/wixlib/wixstdba_platform.wxi
@@ -1,41 +1,40 @@
-<?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. -->
 
 
-<Include xmlns='http://wixtoolset.org/schemas/v4/wxs'>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?include caSuffix.wxi ?>
     <Fragment>
-        <BootstrapperApplication Id='WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'>
-            <PayloadGroupRef Id='WixStdbaRtfLicensePayloads' />
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
+            <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'>
-            <PayloadGroupRef Id='WixStdbaRtfLargeLicensePayloads' />
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
+            <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'>
-            <PayloadGroupRef Id='WixStdbaHyperlinkLicensePayloads' />
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
+            <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'>
-            <PayloadGroupRef Id='WixStdbaHyperlinkLargeLicensePayloads' />
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
+            <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id='WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'>
-            <PayloadGroupRef Id='WixStdbaHyperlinkSidebarLicensePayloads' />
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
+            <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
 
-        <BootstrapperApplication Id='WixStandardBootstrapperApplication.Foundation$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll' />
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.Foundation$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
     </Fragment>
 </Include>
diff --git a/src/wixlib/wixstdba_x86.wxs b/src/wixlib/wixstdba_x86.wxs
index 09a5080c..e3ad07e8 100644
--- a/src/wixlib/wixstdba_x86.wxs
+++ b/src/wixlib/wixstdba_x86.wxs
@@ -1,8 +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'>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=x86 ?>
     <?include wixstdba_platform.wxi ?>
 </Wix>
-- 
cgit v1.2.3-55-g6feb