diff --git a/assets/AppxManifest.xml b/assets/AppxManifest.xml
index 29a7fe78e26..8b245a3b25d 100644
--- a/assets/AppxManifest.xml
+++ b/assets/AppxManifest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <Package IgnorableNamespaces="uap mp rescap desktop6"
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
diff --git a/assets/GroupPolicy/PowerShellCoreExecutionPolicy.admx b/assets/GroupPolicy/PowerShellCoreExecutionPolicy.admx
index 55e888fdfe9..0622a8d2695 100644
--- a/assets/GroupPolicy/PowerShellCoreExecutionPolicy.admx
+++ b/assets/GroupPolicy/PowerShellCoreExecutionPolicy.admx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <policyDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" revision="1.0" schemaVersion="1.0" xmlns="http://www.microsoft.com/GroupPolicy/PolicyDefinitions">
   <policyNamespaces>
     <target prefix="powershellexecutionpolicy" namespace="Microsoft.Policies.PowerShellCore" />
diff --git a/assets/Product.wxs b/assets/Product.wxs
index 82ee672072b..6056a07ec20 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <!-- MSI installs on Win7 and above -->
   <?define MinOSVersionSupported = "VersionNT >= 601" ?>
   <!-- The URL for add/remove programs -->
diff --git a/demos/Azure/Compute-Linux.json b/demos/Azure/Compute-Linux.json
index c829db408b9..a0e9e27b85e 100644
--- a/demos/Azure/Compute-Linux.json
+++ b/demos/Azure/Compute-Linux.json
@@ -1,4 +1,4 @@
-{
+{
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
@@ -197,4 +197,4 @@
       "value": "[concat('ssh ', parameters('adminUsername'), '@', parameters('dnsLabelPrefix'), '.', resourceGroup().location, '.cloudapp.azure.com')]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/docs/host-powershell/sample/MyApp/MyApp.csproj b/docs/host-powershell/sample/MyApp/MyApp.csproj
index b03d053c16b..ab507b5acfc 100644
--- a/docs/host-powershell/sample/MyApp/MyApp.csproj
+++ b/docs/host-powershell/sample/MyApp/MyApp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj b/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj
index 95516295d7b..582858a592b 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's Microsoft.Management.Infrastructure.CimCmdlets project</Description>
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/resources/Microsoft.Management.Infrastructure.CimCmdlets.Strings.resx b/src/Microsoft.Management.Infrastructure.CimCmdlets/resources/Microsoft.Management.Infrastructure.CimCmdlets.Strings.resx
index 5015ddad221..d479d28b5bf 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/resources/Microsoft.Management.Infrastructure.CimCmdlets.Strings.resx
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/resources/Microsoft.Management.Infrastructure.CimCmdlets.Strings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.Management.UI.Internal/HelpWindow/HelpWindow.xaml b/src/Microsoft.Management.UI.Internal/HelpWindow/HelpWindow.xaml
index b30ddfdbbfe..15d3ed562c7 100644
--- a/src/Microsoft.Management.UI.Internal/HelpWindow/HelpWindow.xaml
+++ b/src/Microsoft.Management.UI.Internal/HelpWindow/HelpWindow.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/HelpWindow/HelpWindowSettings.settings b/src/Microsoft.Management.UI.Internal/HelpWindow/HelpWindowSettings.settings
index 4de65371758..2631ff7c38a 100644
--- a/src/Microsoft.Management.UI.Internal/HelpWindow/HelpWindowSettings.settings
+++ b/src/Microsoft.Management.UI.Internal/HelpWindow/HelpWindowSettings.settings
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Microsoft.Management.UI.Internal.HelpWindow" GeneratedClassName="HelpWindowSettings">
   <Profiles />
   <Settings>
@@ -57,4 +57,4 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/src/Microsoft.Management.UI.Internal/HelpWindow/SettingsDialog.xaml b/src/Microsoft.Management.UI.Internal/HelpWindow/SettingsDialog.xaml
index 53d23720c9e..47877ddb78f 100644
--- a/src/Microsoft.Management.UI.Internal/HelpWindow/SettingsDialog.xaml
+++ b/src/Microsoft.Management.UI.Internal/HelpWindow/SettingsDialog.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ColumnPicker.xaml b/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ColumnPicker.xaml
index 0ffae837785..4c2a6ee6acb 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ColumnPicker.xaml
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/ManagementList/ColumnPicker.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj b/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
index 01049440a64..466511d6d22 100644
--- a/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
+++ b/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>Assembly containing WPF code for Out-GridView, HelpWindow, and Show-Command</Description>
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/AllModulesControl.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/AllModulesControl.xaml
index 95446ac2784..d02f3cbd2a1 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/AllModulesControl.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/AllModulesControl.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/CmdletControl.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/CmdletControl.xaml
index 77a60961484..63d24fc8516 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/CmdletControl.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/CmdletControl.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageButton.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageButton.xaml
index 18cc35d0fec..5d4078676e6 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageButton.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageButton.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageButtonCommon.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageButtonCommon.xaml
index f8ce60e8418..36a599399eb 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageButtonCommon.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageButtonCommon.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageToggleButton.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageToggleButton.xaml
index 347331124f3..6f8659bded0 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageToggleButton.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ImageButton/ImageToggleButton.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/MultipleSelectionControl.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/MultipleSelectionControl.xaml
index 9070f9bc78a..515bb076e5b 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/MultipleSelectionControl.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/MultipleSelectionControl.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/NotImportedCmdletControl.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/NotImportedCmdletControl.xaml
index 8743d95e74a..aed99f1bd90 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/NotImportedCmdletControl.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/NotImportedCmdletControl.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ParameterSetControl.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ParameterSetControl.xaml
index 5487cb59e2f..b991ced09b6 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ParameterSetControl.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ParameterSetControl.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ShowModuleControl.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ShowModuleControl.xaml
index 932dbbe885e..7a129e05ad8 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ShowModuleControl.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Controls/ShowModuleControl.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/ShowCommandSettings.settings b/src/Microsoft.Management.UI.Internal/ShowCommand/ShowCommandSettings.settings
index 6f6c457d258..53a4da1a5d7 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/ShowCommandSettings.settings
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/ShowCommandSettings.settings
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Microsoft.Management.UI.Internal.ShowCommand" GeneratedClassName="ShowCommandSettings">
   <Profiles />
   <Settings>
@@ -33,4 +33,4 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/MultipleSelectionDialog.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/MultipleSelectionDialog.xaml
index 0a6a3b72762..26991e87e25 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/MultipleSelectionDialog.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/MultipleSelectionDialog.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/ShowAllModulesWindow.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/ShowAllModulesWindow.xaml
index 2f21faeef22..edbac1f5605 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/ShowAllModulesWindow.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/ShowAllModulesWindow.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/ShowCommandWindow.xaml b/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/ShowCommandWindow.xaml
index d373f52a985..96258220f04 100644
--- a/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/ShowCommandWindow.xaml
+++ b/src/Microsoft.Management.UI.Internal/ShowCommand/Windows/ShowCommandWindow.xaml
@@ -1,4 +1,4 @@
-<!--=================================================================
+<!--=================================================================
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 ==================================================================-->
diff --git a/src/Microsoft.Management.UI.Internal/app.config b/src/Microsoft.Management.UI.Internal/app.config
index 42747cf7b50..a2f13686380 100644
--- a/src/Microsoft.Management.UI.Internal/app.config
+++ b/src/Microsoft.Management.UI.Internal/app.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
@@ -96,4 +96,4 @@
             </setting>
         </Microsoft.Management.UI.Internal.HelpWindow.HelpWindowSettings>
     </userSettings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/Microsoft.Management.UI.Internal/resources/public.UICultureResources.resx b/src/Microsoft.Management.UI.Internal/resources/public.UICultureResources.resx
index 32ae43c624c..7f5730b3f86 100644
--- a/src/Microsoft.Management.UI.Internal/resources/public.UICultureResources.resx
+++ b/src/Microsoft.Management.UI.Internal/resources/public.UICultureResources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
index b6e7c65535d..e3dc8b6256e 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's Microsoft.PowerShell.Commands.Diagnostics project</Description>
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 20e6b384819..a7d3354c36e 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's Microsoft.PowerShell.Commands.Management project</Description>
diff --git a/src/Microsoft.PowerShell.Commands.Management/resources/HotFixResources.resx b/src/Microsoft.PowerShell.Commands.Management/resources/HotFixResources.resx
index 9002dddc00c..a058ae71a11 100644
--- a/src/Microsoft.PowerShell.Commands.Management/resources/HotFixResources.resx
+++ b/src/Microsoft.PowerShell.Commands.Management/resources/HotFixResources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Management/resources/TransactionResources.resx b/src/Microsoft.PowerShell.Commands.Management/resources/TransactionResources.resx
index d319d696faf..9d92573d86d 100644
--- a/src/Microsoft.PowerShell.Commands.Management/resources/TransactionResources.resx
+++ b/src/Microsoft.PowerShell.Commands.Management/resources/TransactionResources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Management/resources/WmiResources.resx b/src/Microsoft.PowerShell.Commands.Management/resources/WmiResources.resx
index 9bed471652f..47f736405ea 100644
--- a/src/Microsoft.PowerShell.Commands.Management/resources/WmiResources.resx
+++ b/src/Microsoft.PowerShell.Commands.Management/resources/WmiResources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index ef2d475a0a2..1c1c7874387 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's Microsoft.PowerShell.Commands.Utility project</Description>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertFromStringData.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertFromStringData.resx
index cf223fb649f..285dea7301e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertFromStringData.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertFromStringData.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertFromStringResources.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertFromStringResources.resx
index 092305f1918..ae0b785d645 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertFromStringResources.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertFromStringResources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertStringResources.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertStringResources.resx
index f4994c36d50..9e65acdc23c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertStringResources.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/ConvertStringResources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/Debugger.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/Debugger.resx
index d53cadfb0ca..1c36e4c8af0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/Debugger.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/Debugger.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/EventingStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/EventingStrings.resx
index a74e7e99a54..2eff70b6267 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/EventingStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/EventingStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/FlashExtractStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/FlashExtractStrings.resx
index 7a9eb9f3c1f..824b56ec6bf 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/FlashExtractStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/FlashExtractStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/GetUptimeStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/GetUptimeStrings.resx
index 89b82e007c6..f59439da714 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/GetUptimeStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/GetUptimeStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/ImmutableStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/ImmutableStrings.resx
index d84c4ec460e..9ba7fddb0b5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/ImmutableStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/ImmutableStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/OutPrinterDisplayStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/OutPrinterDisplayStrings.resx
index 7247e24238c..0b4c01443f3 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/OutPrinterDisplayStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/OutPrinterDisplayStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/SortObjectStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/SortObjectStrings.resx
index ed72fc65f91..4e05f063ce1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/SortObjectStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/SortObjectStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/WriteErrorStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/WriteErrorStrings.resx
index 435fef2b837..13d2058e7b2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/WriteErrorStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/WriteErrorStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
index 156834ea6fc..44d4fe48751 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
+++ b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell Host</Description>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostUserInterfaceSecurityResources.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostUserInterfaceSecurityResources.resx
index b556e9a78f3..6c383d5052f 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostUserInterfaceSecurityResources.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostUserInterfaceSecurityResources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostUserInterfaceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostUserInterfaceStrings.resx
index f1f62ce4b2b..7a2f61022f5 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostUserInterfaceStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostUserInterfaceStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
index d174a6bfd5e..02eaca3954e 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ProgressNodeStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ProgressNodeStrings.resx
index 9dcb58999af..b4e9785add6 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ProgressNodeStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ProgressNodeStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/TranscriptStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/TranscriptStrings.resx
index 67e92dfbb94..c2a2826955c 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/TranscriptStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/TranscriptStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 346dc808d54..2e025805f4a 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's Microsoft.PowerShell.CoreCLR.Eventing project</Description>
diff --git a/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj b/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj
index 6685957fae8..a85b06d4f90 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj
+++ b/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\PowerShell.Common.props"/>
 
diff --git a/src/Microsoft.PowerShell.LocalAccounts/resources/Microsoft.PowerShell.LocalAccounts.Strings.resx b/src/Microsoft.PowerShell.LocalAccounts/resources/Microsoft.PowerShell.LocalAccounts.Strings.resx
index 0c6fa1de8f7..ff1c4a17427 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/resources/Microsoft.PowerShell.LocalAccounts.Strings.resx
+++ b/src/Microsoft.PowerShell.LocalAccounts/resources/Microsoft.PowerShell.LocalAccounts.Strings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 3d1e7d3e92e..96a91f1178f 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell SDK metapackage</Description>
diff --git a/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj b/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj
index b6dae104e39..41b798f6e6d 100644
--- a/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj
+++ b/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's Microsoft.PowerShell.Security project</Description>
diff --git a/src/Microsoft.PowerShell.Security/resources/CmsCommands.resx b/src/Microsoft.PowerShell.Security/resources/CmsCommands.resx
index 33eabae0556..9f47134f147 100644
--- a/src/Microsoft.PowerShell.Security/resources/CmsCommands.resx
+++ b/src/Microsoft.PowerShell.Security/resources/CmsCommands.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Security/resources/ExecutionPolicyCommands.resx b/src/Microsoft.PowerShell.Security/resources/ExecutionPolicyCommands.resx
index fc6eeb98c34..d1bb4f0b23c 100644
--- a/src/Microsoft.PowerShell.Security/resources/ExecutionPolicyCommands.resx
+++ b/src/Microsoft.PowerShell.Security/resources/ExecutionPolicyCommands.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.PowerShell.Security/resources/SignatureCommands.resx b/src/Microsoft.PowerShell.Security/resources/SignatureCommands.resx
index 1118e0c5d18..53f5371fc4c 100644
--- a/src/Microsoft.PowerShell.Security/resources/SignatureCommands.resx
+++ b/src/Microsoft.PowerShell.Security/resources/SignatureCommands.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 25b9d0df110..02720796dab 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's Microsoft.WSMan.Management project</Description>
diff --git a/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj b/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj
index 7ebc728020f..2a9439c0274 100644
--- a/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj
+++ b/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's Microsoft.WSMan.Runtime project</Description>
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Diagnostics.format.ps1xml b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Diagnostics.format.ps1xml
index aeab08d3a46..8e0c106f7dd 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Diagnostics.format.ps1xml
+++ b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Diagnostics.format.ps1xml
@@ -1,4 +1,4 @@
-<Configuration>
+<Configuration>
 
 
   <!-- ################ VIEW DEFINITIONS ################ -->
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Event.format.ps1xml b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Event.format.ps1xml
index d4e78a3d313..3d105bc7c31 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Event.format.ps1xml
+++ b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Event.format.ps1xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Configuration>
     <ViewDefinitions>
     <View>
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml
index dbe1d96dae0..95386960921 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml
+++ b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- *******************************************************************
 These sample files contain formatting information used by the
 PowerShell engine. Do not edit or change the contents of this file
diff --git a/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man b/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man
index 07cad54ffce..5d4dd473f4b 100644
--- a/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man
+++ b/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes'?>
+<?xml version='1.0' encoding='utf-8' standalone='yes'?>
 
 <!--Copyright 2008 Microsoft Corporation-->
 <!--DO NOT EDIT THIS FILE IN ECMANGEN.EXE
diff --git a/src/ResGen/ResGen.csproj b/src/ResGen/ResGen.csproj
index 71794f0790b..cb89ac9d875 100644
--- a/src/ResGen/ResGen.csproj
+++ b/src/ResGen/ResGen.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Generates C# typed bindings for .resx files</Description>
diff --git a/src/Schemas/PSMaml/ProviderHelp.xsd b/src/Schemas/PSMaml/ProviderHelp.xsd
index 19e042c6d43..418897fa849 100644
--- a/src/Schemas/PSMaml/ProviderHelp.xsd
+++ b/src/Schemas/PSMaml/ProviderHelp.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <schema targetNamespace="http://schemas.microsoft.com/powershell/provider/2008/09" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:provider="http://schemas.microsoft.com/powershell/provider/2008/09" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
 
   <import schemaLocation="developerCommand.xsd" namespace="http://schemas.microsoft.com/maml/dev/command/2004/10" />
diff --git a/src/Schemas/PSMaml/developerDscResource.xsd b/src/Schemas/PSMaml/developerDscResource.xsd
index f884e4d9991..c3903058dad 100644
--- a/src/Schemas/PSMaml/developerDscResource.xsd
+++ b/src/Schemas/PSMaml/developerDscResource.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <schema targetNamespace="http://schemas.microsoft.com/maml/dev/dscResource/2004/10" xmlns:doc="http://schemas.microsoft.com/maml/internal" xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dscResource="http://schemas.microsoft.com/maml/dev/dscResource/2004/10" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all" xml:lang="en">
   <!-- Schema documentation -->
   <annotation>
@@ -42,4 +42,4 @@
       <element ref="maml:description"/>            
     </sequence>
   </complexType>  
-</schema>
\ No newline at end of file
+</schema>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 9d0642ea53e..b3241d5deeb 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's System.Management.Automation project</Description>
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.xsd b/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.xsd
index b0c6bb81567..f96c261d9c0 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.xsd
+++ b/src/System.Management.Automation/cimSupport/cmdletization/xml/cmdlets-over-objects.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- ##################################################################
 Copyright (c) Microsoft Corporation.  All rights reserved.
 Licensed under the MIT License.
diff --git a/src/System.Management.Automation/resources/AuthorizationManagerBase.resx b/src/System.Management.Automation/resources/AuthorizationManagerBase.resx
index 814e97a523a..8f9d62fefec 100644
--- a/src/System.Management.Automation/resources/AuthorizationManagerBase.resx
+++ b/src/System.Management.Automation/resources/AuthorizationManagerBase.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/CimInstanceTypeAdapterResources.resx b/src/System.Management.Automation/resources/CimInstanceTypeAdapterResources.resx
index 0588ad6fbbd..52aede963c4 100644
--- a/src/System.Management.Automation/resources/CimInstanceTypeAdapterResources.resx
+++ b/src/System.Management.Automation/resources/CimInstanceTypeAdapterResources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/DescriptionsStrings.resx b/src/System.Management.Automation/resources/DescriptionsStrings.resx
index e548fa78e8b..dd8cb10c17e 100644
--- a/src/System.Management.Automation/resources/DescriptionsStrings.resx
+++ b/src/System.Management.Automation/resources/DescriptionsStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/ErrorCategoryStrings.resx b/src/System.Management.Automation/resources/ErrorCategoryStrings.resx
index 267b8a601da..f03bb8d7d54 100644
--- a/src/System.Management.Automation/resources/ErrorCategoryStrings.resx
+++ b/src/System.Management.Automation/resources/ErrorCategoryStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/ErrorPackageRemoting.resx b/src/System.Management.Automation/resources/ErrorPackageRemoting.resx
index 24896400861..add4b52ccf4 100644
--- a/src/System.Management.Automation/resources/ErrorPackageRemoting.resx
+++ b/src/System.Management.Automation/resources/ErrorPackageRemoting.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/HostInterfaceExceptionsStrings.resx b/src/System.Management.Automation/resources/HostInterfaceExceptionsStrings.resx
index eb774f83a01..4e4de9adaca 100644
--- a/src/System.Management.Automation/resources/HostInterfaceExceptionsStrings.resx
+++ b/src/System.Management.Automation/resources/HostInterfaceExceptionsStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/Logging.resx b/src/System.Management.Automation/resources/Logging.resx
index b8cb1b29476..c91871fe191 100644
--- a/src/System.Management.Automation/resources/Logging.resx
+++ b/src/System.Management.Automation/resources/Logging.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/MshHostRawUserInterfaceStrings.resx b/src/System.Management.Automation/resources/MshHostRawUserInterfaceStrings.resx
index 4345f7f37b3..a374f535a98 100644
--- a/src/System.Management.Automation/resources/MshHostRawUserInterfaceStrings.resx
+++ b/src/System.Management.Automation/resources/MshHostRawUserInterfaceStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/PSCommandStrings.resx b/src/System.Management.Automation/resources/PSCommandStrings.resx
index f06dfa91987..ba273e4ad20 100644
--- a/src/System.Management.Automation/resources/PSCommandStrings.resx
+++ b/src/System.Management.Automation/resources/PSCommandStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/ParserStrings.resx b/src/System.Management.Automation/resources/ParserStrings.resx
index 35adff9e63e..b0d84cc1136 100644
--- a/src/System.Management.Automation/resources/ParserStrings.resx
+++ b/src/System.Management.Automation/resources/ParserStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/ProviderBaseSecurity.resx b/src/System.Management.Automation/resources/ProviderBaseSecurity.resx
index a60bb350fd0..f2c066caa4a 100644
--- a/src/System.Management.Automation/resources/ProviderBaseSecurity.resx
+++ b/src/System.Management.Automation/resources/ProviderBaseSecurity.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/ProxyCommandStrings.resx b/src/System.Management.Automation/resources/ProxyCommandStrings.resx
index 66781be9a60..7c5450f9c50 100644
--- a/src/System.Management.Automation/resources/ProxyCommandStrings.resx
+++ b/src/System.Management.Automation/resources/ProxyCommandStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/System.Management.Automation/resources/SecuritySupportStrings.resx b/src/System.Management.Automation/resources/SecuritySupportStrings.resx
index 1c08d319a32..d263c3895b7 100644
--- a/src/System.Management.Automation/resources/SecuritySupportStrings.resx
+++ b/src/System.Management.Automation/resources/SecuritySupportStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
     Microsoft ResX Schema
diff --git a/src/TypeCatalogGen/TypeCatalogGen.csproj b/src/TypeCatalogGen/TypeCatalogGen.csproj
index fa8390c9970..0b703967717 100644
--- a/src/TypeCatalogGen/TypeCatalogGen.csproj
+++ b/src/TypeCatalogGen/TypeCatalogGen.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Generates CorePsTypeCatalog.cs given powershell.inc</Description>
diff --git a/src/powershell-unix/powershell-unix.csproj b/src/powershell-unix/powershell-unix.csproj
index b815c87dfaf..c113ceb8b30 100644
--- a/src/powershell-unix/powershell-unix.csproj
+++ b/src/powershell-unix/powershell-unix.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\PowerShell.Common.props"/>
 
diff --git a/src/powershell-win-core/powershell-win-core.csproj b/src/powershell-win-core/powershell-win-core.csproj
index 429d658b1b8..88e8b38d97a 100644
--- a/src/powershell-win-core/powershell-win-core.csproj
+++ b/src/powershell-win-core/powershell-win-core.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0">
+<Project ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
 
   <PropertyGroup>
diff --git a/test/hosting/hosting.tests.csproj b/test/hosting/hosting.tests.csproj
index 14797173ffb..0e459076c28 100644
--- a/test/hosting/hosting.tests.csproj
+++ b/test/hosting/hosting.tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
 
   <Import Project="../Test.Common.props"/>
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/scriptdsc/scriptdsc.psd1 b/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/scriptdsc/scriptdsc.psd1
index ae1da14c827..fdc5507ece8 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/scriptdsc/scriptdsc.psd1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/DSCResources/scriptdsc/scriptdsc.psd1
@@ -1,4 +1,4 @@
-#
+#
 # Module manifest for module 'scriptdsc'
 #
 # Generated by: brucepay
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_NoHeader.csv b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_NoHeader.csv
index 192b997de19..f867a6919d5 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_NoHeader.csv
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_NoHeader.csv
@@ -1,4 +1,4 @@
-data1,1,A
+data1,1,A
 data2,2,B
 data3,3,C
 data4,4,D
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_W3C_ELF.csv b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_W3C_ELF.csv
index e1f13f34063..dd9ec8de10a 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_W3C_ELF.csv
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_W3C_ELF.csv
@@ -1,4 +1,4 @@
-#Software: Microsoft Exchange Server
+#Software: Microsoft Exchange Server
 #Version: 15.0.0.0
 #Log-type: Transport Connectivity Log
 #Date: 2016-09-16T23:30:07.338Z
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_WithHeader.csv b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_WithHeader.csv
index 1517b022998..d7e8ce37f24 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_WithHeader.csv
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/TestImportCsv_WithHeader.csv
@@ -1,4 +1,4 @@
-# Test comment
+# Test comment
 Column1,Column2,Column 3
 data1,1,A
 data2,2,B
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/pesteralias.txt b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/pesteralias.txt
index 373c9b1d8d2..8eea2abb01d 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/pesteralias.txt
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/assets/pesteralias.txt
@@ -1,4 +1,4 @@
-# Alias File
+# Alias File
 # Exported by : alex
 # Date/Time : Thursday, 12 November 2015 21:55:08
 # Computer : archvm
diff --git a/test/powershell/engine/Api/assets/TestTypeFile.ps1xml b/test/powershell/engine/Api/assets/TestTypeFile.ps1xml
index 6e22c9cf3dc..f0c4d0d8f4f 100644
--- a/test/powershell/engine/Api/assets/TestTypeFile.ps1xml
+++ b/test/powershell/engine/Api/assets/TestTypeFile.ps1xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 
 <Types>
   <Type>
diff --git a/test/powershell/engine/Help/assets/CimCmdlets_fb6cc51d-c096-4b38-b78d-0fed6277096a_HelpInfo.xml b/test/powershell/engine/Help/assets/CimCmdlets_fb6cc51d-c096-4b38-b78d-0fed6277096a_HelpInfo.xml
index 06f6228f81b..6f21b823573 100644
--- a/test/powershell/engine/Help/assets/CimCmdlets_fb6cc51d-c096-4b38-b78d-0fed6277096a_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/CimCmdlets_fb6cc51d-c096-4b38-b78d-0fed6277096a_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855946</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>5.0.0.0</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Archive_eb74e8da-9ae2-482a-a648-e96550fb8733_HelpInfo.xml b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Archive_eb74e8da-9ae2-482a-a648-e96550fb8733_HelpInfo.xml
index 5940413491a..4fe306eae85 100644
--- a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Archive_eb74e8da-9ae2-482a-a648-e96550fb8733_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Archive_eb74e8da-9ae2-482a-a648-e96550fb8733_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855952</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>6.1.0.1</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Core_00000000-0000-0000-0000-000000000000_HelpInfo.xml b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Core_00000000-0000-0000-0000-000000000000_HelpInfo.xml
index 0bde5a496c9..95ef0630d94 100644
--- a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Core_00000000-0000-0000-0000-000000000000_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Core_00000000-0000-0000-0000-000000000000_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855953</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>6.0</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Diagnostics_ca046f10-ca64-4740-8ff9-2565dba61a4f_HelpInfo.xml b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Diagnostics_ca046f10-ca64-4740-8ff9-2565dba61a4f_HelpInfo.xml
index 3caa3197b7e..bc095388c8b 100644
--- a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Diagnostics_ca046f10-ca64-4740-8ff9-2565dba61a4f_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Diagnostics_ca046f10-ca64-4740-8ff9-2565dba61a4f_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855954</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>5.0.2.0</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Host_56d66100-99a0-4ffc-a12d-eee9a6718aef_HelpInfo.xml b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Host_56d66100-99a0-4ffc-a12d-eee9a6718aef_HelpInfo.xml
index cc8e90fa637..1322bd766ac 100644
--- a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Host_56d66100-99a0-4ffc-a12d-eee9a6718aef_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Host_56d66100-99a0-4ffc-a12d-eee9a6718aef_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855956</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>5.0.2.0</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/powershell/engine/Help/assets/Microsoft.PowerShell.LocalAccounts_8e362604-2c0b-448f-a414-a6a690a644e2_HelpInfo.xml b/test/powershell/engine/Help/assets/Microsoft.PowerShell.LocalAccounts_8e362604-2c0b-448f-a414-a6a690a644e2_HelpInfo.xml
index 72cf5b333e7..fb2c0e6e139 100644
--- a/test/powershell/engine/Help/assets/Microsoft.PowerShell.LocalAccounts_8e362604-2c0b-448f-a414-a6a690a644e2_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/Microsoft.PowerShell.LocalAccounts_8e362604-2c0b-448f-a414-a6a690a644e2_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?LinkId=717973</HelpContentURI>
   <SupportedUICultures>
diff --git a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Management_eefcb906-b326-4e99-9f54-8b4bb6ef3c6d_HelpInfo.xml b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Management_eefcb906-b326-4e99-9f54-8b4bb6ef3c6d_HelpInfo.xml
index feb9ab2610b..246b388bbbf 100644
--- a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Management_eefcb906-b326-4e99-9f54-8b4bb6ef3c6d_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Management_eefcb906-b326-4e99-9f54-8b4bb6ef3c6d_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855958</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>5.0.7.0</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Security_A94C8C7E-9810-47C0-B8AF-65089C13A35A_HelpInfo.xml b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Security_A94C8C7E-9810-47C0-B8AF-65089C13A35A_HelpInfo.xml
index 0ea9eeee58d..ac937114ed7 100644
--- a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Security_A94C8C7E-9810-47C0-B8AF-65089C13A35A_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Security_A94C8C7E-9810-47C0-B8AF-65089C13A35A_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855959</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>5.0.5.0</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_HelpInfo.xml b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_HelpInfo.xml
index 599d2c9c905..8cefe4f2d50 100644
--- a/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855960</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>5.0.4.0</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/powershell/engine/Help/assets/Microsoft.WSMan.Management_766204A6-330E-4263-A7AB-46C87AFC366C_HelpInfo.xml b/test/powershell/engine/Help/assets/Microsoft.WSMan.Management_766204A6-330E-4263-A7AB-46C87AFC366C_HelpInfo.xml
index 9c214908044..a00f492710d 100644
--- a/test/powershell/engine/Help/assets/Microsoft.WSMan.Management_766204A6-330E-4263-A7AB-46C87AFC366C_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/Microsoft.WSMan.Management_766204A6-330E-4263-A7AB-46C87AFC366C_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855961</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>5.0.4.0</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/powershell/engine/Help/assets/PackageManagement_4ae9fd46-338a-459c-8186-07f910774cb8_HelpInfo.xml b/test/powershell/engine/Help/assets/PackageManagement_4ae9fd46-338a-459c-8186-07f910774cb8_HelpInfo.xml
index 432f4f923cc..12e6c19f402 100644
--- a/test/powershell/engine/Help/assets/PackageManagement_4ae9fd46-338a-459c-8186-07f910774cb8_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/PackageManagement_4ae9fd46-338a-459c-8186-07f910774cb8_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855962</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>5.0.5.0</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/powershell/engine/Help/assets/PowershellGet_1d73a601-4a6c-43c5-ba3f-619b18bbb404_HelpInfo.xml b/test/powershell/engine/Help/assets/PowershellGet_1d73a601-4a6c-43c5-ba3f-619b18bbb404_HelpInfo.xml
index fc2f96b5d72..16a1fec8f37 100644
--- a/test/powershell/engine/Help/assets/PowershellGet_1d73a601-4a6c-43c5-ba3f-619b18bbb404_HelpInfo.xml
+++ b/test/powershell/engine/Help/assets/PowershellGet_1d73a601-4a6c-43c5-ba3f-619b18bbb404_HelpInfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
   <HelpContentURI>https://go.microsoft.com/fwlink/?linkid=855963</HelpContentURI>
   <SupportedUICultures>
@@ -7,4 +7,4 @@
       <UICultureVersion>5.0.11.0</UICultureVersion>
     </UICulture>
   </SupportedUICultures>
-</HelpInfo>
\ No newline at end of file
+</HelpInfo>
diff --git a/test/tools/TestExe/TestExe.csproj b/test/tools/TestExe/TestExe.csproj
index a57ff9b8e9d..8eec2019df3 100644
--- a/test/tools/TestExe/TestExe.csproj
+++ b/test/tools/TestExe/TestExe.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\Test.Common.props"/>
 
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 3da35830db7..c51c24fb5e1 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\Test.Common.props"/>
 
diff --git a/test/tools/WebListener/Views/Home/Index.cshtml b/test/tools/WebListener/Views/Home/Index.cshtml
index 6627e932d86..78155781884 100644
--- a/test/tools/WebListener/Views/Home/Index.cshtml
+++ b/test/tools/WebListener/Views/Home/Index.cshtml
@@ -1,4 +1,4 @@
-<h1>Available Tests</h1>
+<h1>Available Tests</h1>
 <ul>
     <li><a href="/">/</a> - This page</li>
     <li><a href="/Auth/Basic/">/Auth/Basic/</a> - Basic Authentication</li>
diff --git a/test/tools/WebListener/Views/Shared/Error.cshtml b/test/tools/WebListener/Views/Shared/Error.cshtml
index ec2ea6bd038..ac334e9942a 100644
--- a/test/tools/WebListener/Views/Shared/Error.cshtml
+++ b/test/tools/WebListener/Views/Shared/Error.cshtml
@@ -1,4 +1,4 @@
-@model ErrorViewModel
+@model ErrorViewModel
 @{
     ViewData["Title"] = "Error";
 }
diff --git a/test/tools/WebListener/Views/Shared/_Layout.cshtml b/test/tools/WebListener/Views/Shared/_Layout.cshtml
index 603b12341f4..7d460874112 100644
--- a/test/tools/WebListener/Views/Shared/_Layout.cshtml
+++ b/test/tools/WebListener/Views/Shared/_Layout.cshtml
@@ -1 +1 @@
-@RenderBody()
+@RenderBody()
diff --git a/test/tools/WebListener/Views/_ViewStart.cshtml b/test/tools/WebListener/Views/_ViewStart.cshtml
index a5f10045db9..820a2f6e02f 100644
--- a/test/tools/WebListener/Views/_ViewStart.cshtml
+++ b/test/tools/WebListener/Views/_ViewStart.cshtml
@@ -1,3 +1,3 @@
-@{
+@{
     Layout = "_Layout";
 }
diff --git a/test/tools/WebListener/appsettings.Development.json b/test/tools/WebListener/appsettings.Development.json
index fa8ce71a97a..723c096a87e 100644
--- a/test/tools/WebListener/appsettings.Development.json
+++ b/test/tools/WebListener/appsettings.Development.json
@@ -1,4 +1,4 @@
-{
+{
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
diff --git a/test/tools/WebListener/appsettings.json b/test/tools/WebListener/appsettings.json
index 5fff67bacc4..c33d178e289 100644
--- a/test/tools/WebListener/appsettings.json
+++ b/test/tools/WebListener/appsettings.json
@@ -1,4 +1,4 @@
-{
+{
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index ff75f65925c..919ccfef369 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
 
   <Import Project="../Test.Common.props" />
 
diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1
index cf68b0f28c5..c48b0d0efa0 100644
--- a/tools/packaging/packaging.strings.psd1
+++ b/tools/packaging/packaging.strings.psd1
@@ -1,4 +1,4 @@
-@{
+@{
     Description = @'
 PowerShell is an automation and configuration management platform.
 It consists of a cross-platform command-line shell and associated scripting language.