diff --git a/eng/WpfArcadeSdk/tools/Pbt.props b/eng/WpfArcadeSdk/tools/Pbt.props
index 4d10975e829..1e0fd8d82bb 100644
--- a/eng/WpfArcadeSdk/tools/Pbt.props
+++ b/eng/WpfArcadeSdk/tools/Pbt.props
@@ -35,7 +35,7 @@
             Project="../targets/Microsoft.NET.Sdk.WindowsDesktop.props"
             Condition="!Exists('$(LocalMicrosoftWinFXTargets)') And '$(InternalMarkupCompilation)'=='true'"/>
             
-    We need Microsoft.WinFx.props though, so that's imported here specifically. 
+    We need Microsoft.WinFX.props though, so that's imported here specifically. 
             
     The use of Microsoft.NET.Sdk.WindowsDesktop doesn't break the source-build promise. 
       - Microsoft.NET.Sdk.WindowsDesktop is built from sources
@@ -57,11 +57,11 @@
           Condition="Exists('$(LocalMicrosoftWinFXProps)') "/>
 
   <!-- 
-      Make sure WinFx.props exists when including - we sometimes include Pbt.props 
+      Make sure WinFX.props exists when including - we sometimes include Pbt.props 
       from non-WPF projects (for e.g., C++ .vxproj) where this is a meaningless idea 
       -->
   <Import Sdk="Microsoft.NET.Sdk.WindowsDesktop"
-        Project="../targets/Microsoft.WinFx.props"
+        Project="../targets/Microsoft.WinFX.props"
         Condition="!Exists('$(LocalMicrosoftWinFXProps)')  And 
-                   Exists('../targets/Microsoft.WinFx.props')"/>
+                   Exists('../targets/Microsoft.WinFX.props')"/>
 </Project>
diff --git a/eng/WpfArcadeSdk/tools/Pbt.targets b/eng/WpfArcadeSdk/tools/Pbt.targets
index 0816bd935d3..466bc6a577b 100644
--- a/eng/WpfArcadeSdk/tools/Pbt.targets
+++ b/eng/WpfArcadeSdk/tools/Pbt.targets
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- 
-      This should be defined before Microsoft.WinFx.targets in imported.
+      This should be defined before Microsoft.WinFX.targets in imported.
       It's OK if there is no DLL realized at this location - we just need to have the property define. 
       
       It is also OK for a DLL to NOT exist at the time <UsingTask> is encountered against this assembly path. 
@@ -51,7 +51,7 @@
       (a) PresentationBuildTasks.dll is built locally 
       (b) The TFM of the assembly matches the build toolset currently being used (netcore vs netframework)
       (c) The assembly is placed at $(_PresentationBuildTasksAssembly)
-      (d) This is all done prior to the first ever use of a task from within this assembly by Microsoft.WinFx.targets
+      (d) This is all done prior to the first ever use of a task from within this assembly by Microsoft.WinFX.targets
   -->
   <Target Name="EnsurePbtPath"
           Condition="'$(InternalMarkupCompilation)'=='true' And Exists('$(LocalMicrosoftWinFXTargets)')"
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props
index 19f8200fa41..dec46a78016 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props
@@ -24,6 +24,16 @@ Copyright (c) .NET Foundation. All rights reserved.
     <MicrosoftWindowsDesktopSdkPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\targets))</MicrosoftWindowsDesktopSdkPath>
   </PropertyGroup>
 
+  <!--
+    Workaround: https://github.com/microsoft/msbuild/issues/4948
+    Disable .NET Framework's inbox WinFX targets when using the SDK, since, we really don't use it's build logic
+    and is superseded by 'WindowsDesktop' SDK that provides it's own WinFX for both NETFX and CoreCLR targets.
+    Make it opt-out, just in case, if something fails or we don't want to use 'WindowsDesktop' SDK's version.
+  -->
+  <PropertyGroup>
+    <ImportFrameworkWinFXTargets Condition="'$(ImportFrameworkWinFXTargets)' == ''">false</ImportFrameworkWinFXTargets>
+  </PropertyGroup>
+
   <Import Project="$(MicrosoftWindowsDesktopSdkPath)\Microsoft.NET.Sdk.WindowsDesktop.props "/>
 
 </Project>
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
index b01491da6c9..7cc1c66bdbc 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
@@ -1,4 +1,5 @@
 <Project>
+
   <PropertyGroup>
     <_MicrosoftNetSdkWindowsDesktop>true</_MicrosoftNetSdkWindowsDesktop>
     <EnableDefaultPageItems Condition="'$(EnableDefaultPageItems)' == ''">true</EnableDefaultPageItems> 
@@ -16,16 +17,13 @@
     
     Irrespective of whether '$(TargetFrameworkIdentifier)' is '.NETCoreApp' or '.NETFramework', 
     the minimum value of $(_TargetFrameworkVersionValue) we will be testing for is '3.0'
-    
   -->
     <_WindowsDesktopSdkTargetFrameworkVersionFloor>3.0</_WindowsDesktopSdkTargetFrameworkVersionFloor>
-
     <!-- 
       Represents an undefined TFV value. This will be used in comparisons of _TargetFrameworkVersionValue (defined in Microsoft.NET.WindowsDesktop.targets)
       to identify when a TFV is undefined
     -->
     <_UndefinedTargetFrameworkVersion>0.0</_UndefinedTargetFrameworkVersion>
-    
     <!--
       Initial/Default value set to 'undefined'. Updated in Microsoft.NET.WindowsDesktop.targets
     --> 
@@ -49,8 +47,6 @@
           Condition="'$(EnableDefaultPageItems)' != 'false'" >
       <Generator>MSBuild:Compile</Generator>
     </Page>
-
-
     <!-- 
       See https://github.com/dotnet/wpf/issues/685
       Visual Studio would prefer that we remove **/*.xaml instead of 
@@ -65,7 +61,6 @@
           Condition="'$(EnableDefaultApplicationDefinition)' != 'false' And '$(EnableDefaultPageItems)' != 'false'" />
   </ItemGroup>
 
-  
   <ItemGroup Condition="('$(DisableImplicitFrameworkReferences)' != 'true') And
                       ('$(TargetFrameworkIdentifier)' == '.NETCoreApp') And
                       ('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And
@@ -81,7 +76,6 @@
                         Condition="('$(UseWPF)' != 'true') And ('$(UseWindowsForms)' == 'true')"/>
   </ItemGroup>
   
-
   <!--
     Traditionally, Visual Studio has supplied these references for .NET Framework based
     WPF Projects: 
@@ -89,7 +83,6 @@
     .NET 3.x:   PresentationCore, PresentationFramework, WindowsBase 
     .NET 4.x:   PresentationCore, PresentationFramework, WindowsBase, System.Xaml 
 
-
     Microsoft.NET.WindowsDesktop.SDK will supply the following references to .NET Framework based 
     WPF Projects: 
     
@@ -101,12 +94,10 @@
     .NET 4.5+:  PresentationCore, PresentationFramework, WindowsBase, System.Xaml, 
                 UIAutomationClient, UIAutomationClientSideProviders, UIAutomationProvider, UIAutomationTypes
                 System.Windows.Controls.Ribbon
-
   -->
   <ItemGroup Condition="('$(TargetFrameworkIdentifier)' == '.NETFramework') And 
                         ('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And 
                         ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
-
     <!--
       The following 3 _WpfCommonNetFxReference items normally require Condition="'$(_TargetFrameworkVersionValue)' >= '3.0'", since
       they are supported on .NET Framework 3.0 and above. 
@@ -166,7 +157,6 @@
   <ItemGroup Condition="('$(UseWPF)' == 'true' Or '$(UseWindowsForms)' == 'true') And 
                         '$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)' And 
                         '$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)'">
-
     <!-- 
         Windows Forms and WPF are supported only on .NET Core 3.0+
     -->
@@ -205,5 +195,7 @@
     <SupportedTargetFramework Remove="@(_UnsupportedNETCoreAppTargetFramework);@(_UnsupportedNETStandardTargetFramework);@(_UnsupportedNETFrameworkTargetFramework)" />
   </ItemGroup>
 
-  <Import Project="Microsoft.WinFX.props" />
+  <!-- Import WPF Build tasks only when we don't import NETFX's WinFX targets -->
+  <Import Project="Microsoft.WinFX.props" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'" />
+
 </Project>
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
index 839a615f888..5f6244a98b7 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
@@ -23,8 +23,6 @@
     <_TargetFrameworkVersionValue>$([MSBuild]::ValueOrDefault('$(_TargetFrameworkVersionWithoutV)', '$(_UndefinedTargetFrameworkVersion)'))</_TargetFrameworkVersionValue>
   </PropertyGroup>
   
-  <Import Project="Microsoft.WinFX.targets" />
-
   <ItemGroup Condition=" ('$(EnableDefaultItems)' == 'true') And ('$(UseWPF)' == 'true') And ('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And 
                          ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
 
@@ -34,7 +32,6 @@
     -->
     <Page Remove="@(Resource);@(Content)"
           Condition="'$(EnableDefaultPageItems)' != 'false'" />
-
     <!--
         ApplicationDefinition must also be removed from Page.  Otherwise, PresentationBuildTasks will include the
         generated code for the ApplicationDefinition twice.  We cannot do this in all cases in the props file as
@@ -43,7 +40,6 @@
         in WPF.
     -->
     <Page Remove="@(ApplicationDefinition)" />
-    
     <!--
          The WindowsDesktop props file removes "**/*.xaml" from None if both EnableDefaultApplicationDefinition and 
          EnableDefaultPageItems are true.  This is done so that we remove any implicitly globbed XAML files from None
@@ -81,7 +77,6 @@
       <Page Remove="@(Page)" />
       <Page Include="@(DeduplicatedPageItems)" />
     </ItemGroup>
-
   </Target>
 
   <!-- 
@@ -109,4 +104,8 @@
                   ('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And ('$(_TargetFrameworkVersionValue)' &lt; '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
     <NetSdkWarning ResourceName="WindowsDesktopFrameworkRequiresVersion30" />
   </Target>
+
+  <!-- Import WPF Build logic only when we don't import NETFX's WinFX targets -->
+  <Import Project="Microsoft.WinFX.targets" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'" />
+
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs
index 76a0aa297a8..7f1b9a95204 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs
@@ -480,14 +480,14 @@ private void Initialize(FileUnit sourceFile)
                 // Prime the output directory
                 if (TargetPath.Length > 0)
                 {
-                    // check for ending '\'
-                    if (!TargetPath.EndsWith(ESCAPED_BACKSLASH, StringComparison.Ordinal))
+                    // check for ending Path.DirectorySeparatorChar
+                    if (!TargetPath.EndsWith(string.Empty + Path.DirectorySeparatorChar, StringComparison.Ordinal))
                     {
-                        TargetPath += ESCAPED_BACKSLASH;
+                        TargetPath += Path.DirectorySeparatorChar;
                     }
                 }
 
-                int pathEndIndex = SourceFileInfo.RelativeSourceFilePath.LastIndexOf(ESCAPED_BACKSLASH, StringComparison.Ordinal);
+                int pathEndIndex = SourceFileInfo.RelativeSourceFilePath.LastIndexOf(string.Empty + Path.DirectorySeparatorChar, StringComparison.Ordinal);
                 string targetPath = TargetPath + SourceFileInfo.RelativeSourceFilePath.Substring(0, pathEndIndex + 1);
 
                 // Create if not already exists
@@ -1573,7 +1573,7 @@ private string ParentFolderPrefix
                 {
                     string relPath = TargetPath.Substring(SourceFileInfo.SourcePath.Length);
                     relPath += SourceFileInfo.RelativeSourceFilePath;
-                    string[] dirs = relPath.Split(new Char[] { ESCAPED_BACKSLASH_CHAR });
+                    string[] dirs = relPath.Split(new Char[] { Path.DirectorySeparatorChar });
                     for (int i = 1; i < dirs.Length; i++)
                     {
                         parentFolderPrefix += PARENTFOLDER;
@@ -3515,8 +3515,6 @@ internal string SubClass
         private const string            VER = "V";
         private const string            COMPONENT = "component";
         private const char              COMPONENT_DELIMITER = ';';
-        private const string            ESCAPED_BACKSLASH = "\\";
-        private const char              ESCAPED_BACKSLASH_CHAR = '\\';
         private const string            FORWARDSLASH = "/";
         private const string            URISCHEME_PACK = "pack";
         private const string            PARENTFOLDER = @"..\";
@@ -3534,4 +3532,3 @@ internal string SubClass
 #endregion Private Data
     }
 }
-
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/CompilerWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/CompilerWrapper.cs
index 990552a8d0d..d47c9af6ff0 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/CompilerWrapper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/CompilerWrapper.cs
@@ -40,7 +40,7 @@ internal class CompilerWrapper : MarshalByRefObject
         internal CompilerWrapper()
         {
             _mc = new MarkupCompiler();
-            _sourceDir = Directory.GetCurrentDirectory() + "\\";
+            _sourceDir = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar;
             _nErrors = 0;
         }
 
@@ -408,7 +408,7 @@ private string GetResolvedFilePath(string filePath, ref string newSourceDir)
                 // and put the deepest directory that file is in as the new
                 // SourceDir.
                 //
-                int pathEndIndex = fullFilePath.LastIndexOf("\\", StringComparison.Ordinal);
+                int pathEndIndex = fullFilePath.LastIndexOf(string.Empty + Path.DirectorySeparatorChar, StringComparison.Ordinal);
 
                 newSourceDir = fullFilePath.Substring(0, pathEndIndex + 1);
                 newRelativeFilePath = fullFilePath.Substring(pathEndIndex + 1);
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/IncrementalCompileAnalyzer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/IncrementalCompileAnalyzer.cs
index c314b4210d6..02a483aa596 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/IncrementalCompileAnalyzer.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/IncrementalCompileAnalyzer.cs
@@ -478,7 +478,7 @@ private void RecompileContentFiles()
             {
                 if (ListIsNotEmpty(_mcPass1.ContentFiles))
                 {
-                    string curDir = Directory.GetCurrentDirectory() + "\\";
+                    string curDir = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar;
 
                     int count = _mcPass1.ContentFiles.Length;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/TaskHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/TaskHelper.cs
index d58cf8c4de7..1bd2f580399 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/TaskHelper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/TaskHelper.cs
@@ -80,7 +80,6 @@ internal static string CreateFullFilePath(string thePath, string rootPath)
 
             // get rid of '..' and '.' if any
             thePath = Path.GetFullPath(thePath);
-
             return thePath;
         }
 
@@ -100,7 +99,7 @@ internal static string GetRootRelativePath(string path1, string path2)
             string fullpath1;
             string fullpath2;
 
-            string sourceDir = Directory.GetCurrentDirectory() + "\\";
+            string sourceDir = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar;
 
             // make sure path1 and Path2 are both full path
             // so that they can be compared on right base.
@@ -235,4 +234,3 @@ internal static CompilerWrapper CreateCompilerWrapper(bool fInSeparateDomain, re
 
     #endregion TaskHelper class
 }
-
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFx.props b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.props
similarity index 99%
rename from src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFx.props
rename to src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.props
index a73f7b23e5f..5c12af7b9c8 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFx.props
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.props
@@ -1,4 +1,5 @@
 <Project>
+
   <PropertyGroup>
     <_PresentationBuildTasksTfm Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp2.1</_PresentationBuildTasksTfm>
     <_PresentationBuildTasksTfm Condition="'$(MSBuildRuntimeType)' != 'Core'">net472</_PresentationBuildTasksTfm>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFx.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
similarity index 99%
rename from src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFx.targets
rename to src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
index 04ec174a95d..7dc69801618 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFx.targets
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
@@ -1,4 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
   <PropertyGroup>
     <AlwaysCompileMarkupFilesInSeparateDomain Condition="'$(BuildingInsideVisualStudio)' == 'true' and '$(AlwaysCompileMarkupFilesInSeparateDomain)' == ''">true</AlwaysCompileMarkupFilesInSeparateDomain>
     <AlwaysCompileMarkupFilesInSeparateDomain Condition="'$(AlwaysCompileMarkupFilesInSeparateDomain)' == '' ">true</AlwaysCompileMarkupFilesInSeparateDomain>
@@ -7,7 +8,6 @@
   
   <!-- Some Default Settings -->
   <PropertyGroup>
-
       <!--
           XamlDebuggingInformation property controls whether or not to put line number information in the
           generated binary file for a Xaml markup file.
@@ -17,17 +17,14 @@
       If XamlDebuggingInformation property is not explicitly set, and the current build is for debug,
           Set true to XamlDebuggingInformation, if the build is not for Debug, keep the empty setting for
           XamlDebuggingInformation, it means not to put line number information in the generated binary file.
-
       -->
       <XamlDebuggingInformation Condition="'$(XamlDebuggingInformation)' == '' and '$(ConfigurationName)' == 'Debug'">true</XamlDebuggingInformation>
 
-
       <HostInBrowser Condition="'$(HostInBrowser)'==''">false</HostInBrowser>
       <Version Condition="'$(Version)'==''">1.0.0.0</Version>
       <DeploymentType Condition="'$(DeploymentType)'==''">Installed</DeploymentType>
       <RunAfterInstall Condition="'$(RunAfterInstall)'==''">true</RunAfterInstall>
       <GeneratedFileExtension>.g$(DefaultLanguageSourceExtension)</GeneratedFileExtension>
-
       <OSVersion Condition="'$(OSVersion)' == ''">5.1.2600.0</OSVersion>
 
       <!-- Initialize some Local-Type_Ref related properties -->
@@ -36,32 +33,24 @@
   </PropertyGroup>
 
   <PropertyGroup>
-
       <IsApplication Condition="'$(OutputType)'=='exe'">true</IsApplication>
       <IsApplication Condition="'$(OutputType)'=='winexe'">true</IsApplication>
       <IsLibrary Condition="'$(OutputType)'=='library'">true</IsLibrary>
       <IsLibrary Condition="'$(OutputType)'=='module'">true</IsLibrary>
-
   </PropertyGroup>
 
-
   <PropertyGroup>
-
       <!--
           Inject AssignWinFXEmbeddedResource target at right stage.
       -->
-
       <PrepareResourceNamesDependsOn>
                     AssignWinFXEmbeddedResource;
                     $(PrepareResourceNamesDependsOn)
       </PrepareResourceNamesDependsOn>
-
   </PropertyGroup>
 
-
   <!-- Common Application and Library Property settings -->
   <PropertyGroup>
-
       <PrepareResourcesDependsOn>
                 MarkupCompilePass1;
                 AfterMarkupCompilePass1;
@@ -70,38 +59,32 @@
                 MainResourcesGeneration;
                 $(PrepareResourcesDependsOn)
       </PrepareResourcesDependsOn>
-
   </PropertyGroup>
 
-
   <PropertyGroup>
         <!-- Add Markup compilation to the CoreCompileDependsOn so that the IDE inproc compilers (particularly VB)
              can "see" the generated source files. -->
-
       <CoreCompileDependsOn Condition="'$(BuildingInsideVisualStudio)' == 'true' ">
           DesignTimeMarkupCompilation;
           $(CoreCompileDependsOn)
       </CoreCompileDependsOn>
-
   </PropertyGroup>
 
-  <Target Name="DesignTimeMarkupCompilation">
 
+  <Target Name="DesignTimeMarkupCompilation">
         <!-- Only if we are not actually performing a compile i.e. we are in design mode -->
         <CallTarget Condition="'$(BuildingProject)' != 'true' Or $(DesignTimeBuild) == 'true'"
                 Targets="MarkupCompilePass1" />
   </Target>
 
-    <!--  WinFX specific ItemGroup  -->
 
+    <!--  WinFX specific ItemGroup  -->
 
     <ItemGroup Condition="'$(BuildingInsideVisualStudio)'=='true'">
-
          <!--
             Add WinFX specific Item names to AvailableItemName item, so that they can show up
             in a drop-down menu for Build Action field of the properties window in VisualStudio.
          -->
-
          <AvailableItemName Include="ApplicationDefinition" />
          <AvailableItemName Include="Page" />
          <AvailableItemName Include="Resource" />
@@ -127,52 +110,42 @@
   <Target Name="PrepareResourcesForSatelliteAssemblies"
           Condition="'$(UICulture)' != ''"
           DependsOnTargets="$(PrepareResourcesForSatelliteAssembliesDependsOn)" >
-
   </Target>
 
 
   <PropertyGroup>
-
     <!--
          Hook up AfterCompileWinFX to that it runs
          where AfterCompile would have run
     -->
-
     <CompileDependsOn>
         $(CompileDependsOn);
         _AfterCompileWinFXInternal
     </CompileDependsOn>
-
-
     <!--
          Any targets that _AfterCompileWinFXInternal depends on.
 
          After the xaml file is compiled, the build system needs to generate a final .loc file
          for localization support. MergeLocalizationDirectives target does this.
 
-
          If UICulture is set, it needs to do below extra work before generating the .loc file:
 
              1. Calls the MarkupCompilePass2 for those xaml file which reference local types.
              2. Generate the .resources for given culture from .baml and other resource files.
 
          Target PrepareResourcesForSatelliteAssemblies is for this.
-
     -->
-
     <_AfterCompileWinFXInternalDependsOn>
         PrepareResourcesForSatelliteAssemblies;
         MergeLocalizationDirectives;
         AfterCompileWinFX
     </_AfterCompileWinFXInternalDependsOn>
-
   </PropertyGroup>
 
-
   <!-- Work that we want to be done after the "Compile" target in Microsoft.Common.targets -->
-
   <Target Name="_AfterCompileWinFXInternal" DependsOnTargets="$(_AfterCompileWinFXInternalDependsOn)" />
 
+
   <!--
     ===========================================================================================
                                         Extensibility Points
@@ -193,9 +166,6 @@
     This target uses MarkupCompilePass1 task.
   -->
 
-
-
-
   <!--
   ================================================================
                                    MarkupCompilePass1
@@ -222,6 +192,7 @@
             <_IntellisenseOnlyCompile>false</_IntellisenseOnlyCompile>
             <_IntellisenseOnlyCompile Condition="'$(BuildingProject)' != 'true'">true</_IntellisenseOnlyCompile>
         </PropertyGroup>
+
         <MarkupCompilePass1
                Language="$(Language)"
                UICulture="$(UICulture)"
@@ -249,7 +220,6 @@
                IsRunningInVisualStudio="$(BuildingInsideVisualStudio)"
                OutputPath="$(IntermediateOutputPath)">
 
-
               <Output ItemName="GeneratedBaml" TaskParameter="GeneratedBamlFiles"/>
               <Output ItemName="GeneratedLocalizationFiles" TaskParameter="GeneratedLocalizationFiles" />
               <Output PropertyName="_RequireMCPass2ForMainAssembly" TaskParameter="RequirePass2ForMainAssembly" />
@@ -261,24 +231,19 @@
 
               <Output ItemName="_GeneratedCodeFiles"
                       TaskParameter="GeneratedCodeFiles" />
-
-
         </MarkupCompilePass1>
 
-
         <Message Text="(out) GeneratedBamlFiles: '@(GeneratedBaml)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
         <Message Text="(out) SourceCodeFiles: '@(Compile)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
         <Message Text="(Out) GeneratedCodeFiles: '@(_GeneratedCodeFiles)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
         <Message Text="(out) GeneratedLocalizationFiles: @(GeneratedLocalizationFiles)" Condition="'$(MSBuildTargetsVerbose)'=='true'" />
 
         <Message Text="(out) _RequireMCPass2ForMainAssembly : '$(_RequireMCPass2ForMainAssembly)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
-
         <Message Text="(out) _RequireMCPass2ForSatelliteAssemblyOnly : '$(_RequireMCPass2ForSatelliteAssemblyOnly)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
-
   </Target>
 
-  <!--
 
+  <!--
     ================================================================
                                    MarkupCompilePass2
     ================================================================
@@ -290,7 +255,6 @@
 
     If MarkupCompilePass1 task is not invoked, that means there is no any Xaml input file change since last build,
     and then it is not required to run this MarkupCompilePass2 either.
-
   -->
   <Target Name="MarkupCompilePass2"
           Condition="Exists('$(IntermediateOutputPath)$(AssemblyName)_MarkupCompile.lref')" >
@@ -319,7 +283,6 @@
                If MarupCompilePass2 is for Main Assembly as well, output the Baml files into GeneratedBaml, FileClassifier task will be invoked later.
           -->
 
-
             <Output ItemName="GeneratedBamlWithLocalType"
                     TaskParameter="GeneratedBaml"
                     Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
@@ -332,20 +295,15 @@
                     TaskParameter="GeneratedBaml"
                     Condition="'$(_RequireMCPass2ForSatelliteAssemblyOnly)' == 'true'" />
 
-
             <!-- Put the generated files in item FileWrites so that they can be cleaned up appropriately in a next Rebuild -->
-
             <Output ItemName="FileWrites" TaskParameter="GeneratedBaml" />
-
         </MarkupCompilePass2>
 
         <Message Text="(out) After MarkupCompilePass2, SatelliteEmbeddedFiles: '@(SatelliteEmbeddedFiles)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
         <Message Text="(out) GeneratedBamlWithLocalType: '@(GeneratedBamlWithLocalType)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
-
   </Target>
 
  <!--
-
     ================================================================
                                    MarkupCompilePass2ForMainAssembly
     ================================================================
@@ -356,11 +314,9 @@
         It is possible when UICulture is not set, or the xaml file has explicitly set Localizable metadata to false.
 
         Condition: _RequireMCPass2ForMainAssembly == true
-
   -->
 
   <PropertyGroup>
-
        <MarkupCompilePass2ForMainAssemblyDependsOn>
                      GenerateTemporaryTargetAssembly;
                      MarkupCompilePass2;
@@ -369,8 +325,6 @@
        </MarkupCompilePass2ForMainAssemblyDependsOn>
 
        <_CompileTargetNameForLocalType Condition="'$(_CompileTargetNameForLocalType)' == ''">_CompileTemporaryAssembly</_CompileTargetNameForLocalType>
-
-
   </PropertyGroup>
 
   <Target Name="_CompileTemporaryAssembly"  DependsOnTargets="BuildOnlySettings;ResolveKeySource;CoreCompile" />
@@ -379,18 +333,15 @@
   <Target Name="MarkupCompilePass2ForMainAssembly"
                Condition="'$(_RequireMCPass2ForMainAssembly)' == 'true' "
                DependsOnTargets="$(MarkupCompilePass2ForMainAssemblyDependsOn)" >
-
   </Target>
 
 
   <!--
-
                 ==========================================
                        GenerateTemporaryTargetAssembly
                 ==========================================
 
                 Name : GenerateTemporaryTargetAssembly
-
   -->
 
    <Target Name="GenerateTemporaryTargetAssembly"
@@ -410,24 +361,20 @@
                 CompileTargetName="$(_CompileTargetNameForLocalType)"
                 GenerateTemporaryTargetAssemblyDebuggingInformation="$(GenerateTemporaryTargetAssemblyDebuggingInformation)"
                  >
-
        </GenerateTemporaryTargetAssembly>
 
        <CreateItem Include="$(IntermediateOutputPath)$(TargetFileName)" >
                <Output TaskParameter="Include" ItemName="AssemblyForLocalTypeReference" />
        </CreateItem>
-
   </Target>
 
 
   <!--
-
                  ===========================================
                           CleanupTemporaryTargetAssembly
                  ===========================================
 
                 Name : CleanupTemporaryTargetAssembly
-
   -->
 
   <Target Name="CleanupTemporaryTargetAssembly" >
@@ -436,13 +383,10 @@
 
          <Delete Files="@(AssemblyForLocalTypeReference)"
                      Condition="Exists('%(Fullpath)')" />
-
   </Target>
 
 
-
 <!--
-
     ================================================================
                                    SatelliteOnlyMarkupCompilePass2
     ================================================================
@@ -453,16 +397,13 @@
          to be embedded into main assembly.
 
         Condition: _RequireMCPass2ForSatelliteAssemblyOnly == true
-
   -->
 
-
   <Target Name="AddIntermediateAssemblyToReferenceList" >
 
           <CreateItem Include="@(IntermediateAssembly)" >
                <Output TaskParameter="Include" ItemName="AssemblyForLocalTypeReference" />
           </CreateItem>
-
   </Target>
 
   <Target Name="SatelliteOnlyMarkupCompilePass2"  Condition="'$(_RequireMCPass2ForSatelliteAssemblyOnly)' == 'true'"
@@ -489,18 +430,14 @@
              SignDeploymentManifest
      </GenerateManifestsDependsOn>
 
-
      <GenerateManifests Condition="'$(GenerateManifests)' == ''" >true</GenerateManifests>
      <GenerateClickOnceManifests Condition="'$(GenerateClickOnceManifests)' == ''">$(GenerateManifests)</GenerateClickOnceManifests>
-
      <!--
          If 'install' is not set in project file, set it to false here.
          But if 'install' is set in project, don't change it now. Later
          the PropertyValidation target will check if it is correct or not.
      -->
-
      <Install Condition="'$(Install)'==''">false</Install>
-
      <!--
          The valid values for TargetZone are :
               Internet, Intranet, LocalMachine, Custom
@@ -510,19 +447,14 @@
          If this property is not set in project, for HostInBrowser,
          we set default value 'Internet' here.
      -->
-
      <TargetZone Condition="'$(TargetZone)' == ''">Internet</TargetZone>
-
-
      <!--
         Overwrite below properties which have been set in Microsoft.Common.targets.
      -->
-
      <TargetUrl Condition="'$(TargetUrl)' != ''">$(TargetUrl)/$(TargetDeployManifestFileName)</TargetUrl>
      <StartURL Condition="'$(StartURL)'==''">$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetDeployManifestFileName)</StartURL>
      <StartArguments Condition="'$(StartArguments)' == ''">-debug  "$(StartURL)"</StartArguments>
      <StartArguments Condition="'$(DebugSecurityZoneURL)' != ''">$(StartArguments) -DebugSecurityZoneURL "$(DebugSecurityZoneURL)"</StartArguments>
-
   </PropertyGroup>
 
 
@@ -550,8 +482,6 @@
 
       <Error Condition=" '$(PlatformTarget)' != '' and '$(PlatformTarget)' != 'AnyCpu' "
              Text="Cannot build a platform-specific XAML Browser Application. If HostInBrowser property is set to 'True', either do not set the PlatformTarget property or set it to 'AnyCpu'." />
-
-
   </Target>
 
   <Target Name="SplashScreenValidation" Condition="'@(SplashScreen)' != ''" >
@@ -576,7 +506,6 @@
             CertificateThumbprint="$(_DeploymentResolvedManifestCertificateThumbprint)"
             TimestampUrl="$(ManifestTimestampUrl)"
             SigningTarget="@(ApplicationManifest)"/>
-
   </Target>
 
 
@@ -594,7 +523,6 @@
             CertificateThumbprint="$(_DeploymentResolvedManifestCertificateThumbprint)"
             TimestampUrl="$(ManifestTimestampUrl)"
             SigningTarget="@(DeployManifest)"/>
-
   </Target>
 
 
@@ -604,7 +532,6 @@
       ================================================================
 
      Classify baml and image files into different groups for Main assembly and satellite assembly respectively.
-
   -->
   <Target Name="FileClassification">
 
@@ -622,12 +549,10 @@
           <Output ItemName="SatelliteEmbeddedFiles" TaskParameter="SatelliteEmbeddedFiles" />
           <Output ItemName="WinFXEmbeddedResource" TaskParameter="CLREmbeddedResource" />
           <Output ItemName="WinFXEmbeddedResource" TaskParameter="CLRSatelliteEmbeddedResource" />
-
       </FileClassifier>
 
         <Message Text="(out) EmbeddedFiles: '@(MainEmbeddedFiles)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
         <Message Text="(out) SatelliteEmbeddedFiles: '@(SatelliteEmbeddedFiles)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
-
   </Target>
 
   <!--
@@ -638,7 +563,6 @@
   -->
 
   <PropertyGroup>
-
      <!--
           If the UICulture is not set, resources will be embedded into main assembly.
           keep $(AssemblyName).g.resources as resource name for this scenario.
@@ -650,16 +574,10 @@
               $(AssemblyName).g for localizable resources,
               $(AssemblyName).unlocalizable.g for unlocalizable resources
       -->
-
-
      <_ResourceNameInMainAssembly Condition="'$(UICulture)' == ''">$(AssemblyName).g.resources</_ResourceNameInMainAssembly>
-
      <_ResourceNameInMainAssembly Condition="'$(UICulture)' != ''">$(AssemblyName).unlocalizable.g.resources</_ResourceNameInMainAssembly>
-
-
   </PropertyGroup>
 
-
   <Target Name="MainResourcesGeneration" Inputs="@(MainEmbeddedFiles)" Outputs="$(IntermediateOutputPath)$(_ResourceNameInMainAssembly)" Condition="'@(MainEmbeddedFiles)' != ''">
 
     <!--
@@ -677,7 +595,6 @@
 
           <!-- Put the generated files in item FileWrites so that they can be cleaned up appropriately in a next Rebuild -->
           <Output ItemName="FileWrites" TaskParameter="OutputResourcesFile" />
-
     </ResourcesGenerator>
 
     <ItemGroup>
@@ -688,11 +605,10 @@
                 <OutputResource>$(IntermediateOutputPath)$(_ResourceNameInMainAssembly)</OutputResource>
           </EmbeddedResource>
     </ItemGroup>
-
   </Target>
 
-  <!--
 
+  <!--
        ================================================================
                                    SatelliteResourceGeneration
        ================================================================
@@ -729,14 +645,12 @@
 
             <!-- Put the generated files in item FileWrites so that they can be cleaned up appropriately in a next Rebuild -->
             <Output ItemName="FileWrites" TaskParameter="OutputResourcesFile" />
-
-
       </ResourcesGenerator>
 
       <Message Text="(out) _SatelliteResourceFile is '@(_SatelliteResourceFile)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
-
   </Target>
 
+
   <!--
       This target should always run after SatelliteResourceGeneration, so that it
       can generate the correct Item which contains right Culture attribute even for
@@ -756,7 +670,6 @@
                 <OutputResource>@(_SatelliteResourceFile)</OutputResource>
           </EmbeddedResource>
       </ItemGroup>
-
   </Target>
 
 
@@ -788,7 +701,6 @@
          at build time after Xaml file is compiled, (for some case, it is generated after the main dll is compiled).
 
         So overwrite this target, copy the content from Microsoft.Common.targets and inject the part for our UICulture support.
-
     -->
 
     <!--
@@ -810,7 +722,6 @@
             Condition="'@(ResxWithCulture)' != ''">
 
            <Output ItemName="SatelliteDllsProjectOutputGroupOutputIntermediate" TaskParameter="Include" />
-
         </CreateItem>
 
         <!--  This task is WinFX specific. -->
@@ -821,7 +732,6 @@
             Condition="'$(UICulture)' != ''">
 
            <Output ItemName="SatelliteDllsProjectOutputGroupOutputIntermediate" TaskParameter="Include" />
-
         </CreateItem>
 
         <!-- End of WinFX specific -->
@@ -832,7 +742,6 @@
             Condition="'@(NonResxWithCulture)' != ''">
 
             <Output ItemName="SatelliteDllsProjectOutputGroupOutputIntermediate" TaskParameter="Include" />
-
         </CreateItem>
 
         <CreateItem Include="$(IntermediateOutputPath)">
@@ -843,7 +752,6 @@
         <CreateItem Include="@(SatelliteDllsProjectOutputGroupOutputIntermediate->'%(FullPath)')">
             <Output ItemName="SatelliteDllsProjectOutputGroupOutput" TaskParameter="Include"/>
         </CreateItem>
-
     </Target>
 
 
@@ -852,7 +760,6 @@
           Condition="'@(Page)' != '' or '@(ApplicationDefinition)' != ''">
 
        <UidManager MarkupFiles="@(Page);@(ApplicationDefinition)" Task="Check" />
-
   </Target>
 
   <Target Name="UpdateUid"
@@ -862,26 +769,25 @@
                                @(ApplicationDefinition)"
                   IntermediateDirectory ="$(IntermediateOutputPath)"
                   Task="Update" />
-
   </Target>
 
   <Target Name="RemoveUid"
           Condition="'@(Page)' != '' or '@(ApplicationDefinition)' != ''">
+
       <UidManager MarkupFiles="@(Page);
                                @(ApplicationDefinition)"
 
                   IntermediateDirectory ="$(IntermediateOutputPath)"
                   Task="Remove" />
-
   </Target>
 
+
   <!--
       ================================================================
                                   MergeLocalizationDirectives
       ================================================================
 
       Merge localization comments of single bamls into one file for the whole assembly.
-
   -->
   <Target Name="MergeLocalizationDirectives"
           Condition="'@(GeneratedLocalizationFiles)' !=''"
@@ -890,7 +796,6 @@
   >
        <MergeLocalizationDirectives GeneratedLocalizationFiles="@(GeneratedLocalizationFiles)"
                                     OutputFile="$(IntermediateOutputPath)$(AssemblyName).loc"/>
-
        <!--
           Add the merged loc file into _NoneWithTargetPath so that it will be copied to the
           output directory
@@ -900,13 +805,12 @@
                    AdditionalMetadata="CopyToOutputDirectory=PreserveNewest; TargetPath=$(AssemblyName).loc" >
            <Output ItemName="_NoneWithTargetPath" TaskParameter="Include"/>
            <Output ItemName="FileWrites" TaskParameter="Include"/>
-
        </CreateItem>
-
   </Target>
 
   <!-- End of other targets -->
 
+
   <!--
      This is similar to AssignTargetPaths target in Microsoft.Common.targets.
      But it handles only the generated WinFXEmbeddedResource item type.
@@ -930,9 +834,8 @@
         <EmbeddedResource Include="@(_Temporary)" />
         <_Temporary Remove="@(_Temporary)" />
     </ItemGroup>
-
   </Target>
-  <!-- End of the project file, Do not add any more propeties, items, targets etc. -->
 
+  <!-- End of the project file, Do not add any more propeties, items, targets etc. -->
 
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs
index 6ccf685c2dd..6a37386e63f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs
@@ -74,7 +74,7 @@ public sealed class MarkupCompilePass1 : Task
         public MarkupCompilePass1( ) : base(SR.SharedResourceManager)
         {
             // set the source directory
-            _sourceDir = Directory.GetCurrentDirectory() + "\\";
+            _sourceDir = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar;
 
             _outputType = SharedStrings.WinExe;
 
@@ -276,10 +276,10 @@ public string OutputPath
                 // Get the relative path based on sourceDir
                 _outputDir= TaskHelper.CreateFullFilePath(filePath, SourceDir);
 
-                // Make sure OutputDir always ends with '\\'.
-                if (!_outputDir.EndsWith("\\", StringComparison.Ordinal))
+                // Make sure OutputDir always ends with Path.DirectorySeparatorChar
+                if (!_outputDir.EndsWith(string.Empty + Path.DirectorySeparatorChar, StringComparison.Ordinal))
                 {
-                    _outputDir += "\\";
+                    _outputDir += Path.DirectorySeparatorChar;
                 }
             }
         }
@@ -1080,7 +1080,7 @@ private string GetResolvedFilePath(string filePath, ref string newSourceDir)
                 // and put the deepest directory that file is in as the new
                 // SourceDir.
                 //
-                int pathEndIndex = fullFilePath.LastIndexOf("\\", StringComparison.Ordinal);
+                int pathEndIndex = fullFilePath.LastIndexOf(string.Empty + Path.DirectorySeparatorChar, StringComparison.Ordinal);
 
                 newSourceDir = fullFilePath.Substring(0, pathEndIndex + 1);
                 newRelativeFilePath = TaskHelper.GetRootRelativePath(newSourceDir, fullFilePath);
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs
index d60f0615809..e0765943adb 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs
@@ -43,7 +43,6 @@ namespace Microsoft.Build.Tasks.Windows
     /// </summary>
     public sealed class MarkupCompilePass2  : Task
     {
-
         //------------------------------------------------------
         //
         //  Constructors
@@ -58,7 +57,7 @@ public sealed class MarkupCompilePass2  : Task
         public MarkupCompilePass2( ) : base(SR.SharedResourceManager)
         {
             // set the source directory
-            _sourceDir = Directory.GetCurrentDirectory() + "\\";
+            _sourceDir = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar;
 
             _outputType = SharedStrings.WinExe;
 
@@ -253,10 +252,10 @@ public string OutputPath
                 // Get the relative path based on sourceDir
                 _outputPath= TaskHelper.CreateFullFilePath(filePath, SourceDir);
 
-                // Make sure OutputDir always ends with '\\'.
-                if (!_outputPath.EndsWith("\\", StringComparison.Ordinal))
+                // Make sure OutputDir always ends with Path.DirectorySeparatorChar
+                if (!_outputPath.EndsWith(string.Empty + Path.DirectorySeparatorChar, StringComparison.Ordinal))
                 {
-                    _outputPath += "\\";
+                    _outputPath += Path.DirectorySeparatorChar;
                 }
             }
         }
@@ -546,7 +545,7 @@ private string GetResolvedFilePath(string filePath, ref string newSourceDir)
                 // and put the deepest directory that file is in as the new
                 // SourceDir.
                 //
-                int pathEndIndex = fullFilePath.LastIndexOf("\\", StringComparison.Ordinal);
+                int pathEndIndex = fullFilePath.LastIndexOf(string.Empty + Path.DirectorySeparatorChar, StringComparison.Ordinal);
 
                 newSourceDir = fullFilePath.Substring(0, pathEndIndex + 1);
                 newRelativeFilePath = TaskHelper.GetRootRelativePath(newSourceDir, fullFilePath);
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
index 6fa459c1954..174a845ad89 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
@@ -41,12 +41,12 @@
 
 
   <!-- 
-    Incorporate Microsoft.WinFx.targets in nuget packages under 
+    Incorporate Microsoft.WinFX.targets in nuget packages under 
     content\targets\ 
   -->
   <ItemGroup>
-    <PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFx.props" SubFolder="root\targets" />
-    <PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFx.targets" SubFolder="root\targets" />
+    <PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFX.props" SubFolder="root\targets" />
+    <PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFX.targets" SubFolder="root\targets" />
   </ItemGroup>
 
   <!--
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
index 2207505cef1..2c5483bd979 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
@@ -1426,7 +1426,7 @@
   </ItemGroup>
 
   <!-- 
-    Need Microsoft.WinFx.targets to embed *.compositefont 
+    Need Microsoft.WinFX.targets to embed *.compositefont 
     files using MainResourcesGeneration target
   -->
   <PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/IErrorPage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/IErrorPage.cs
index 4293c68db57..1883c0b3946 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/IErrorPage.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Interop/IErrorPage.cs
@@ -48,8 +48,8 @@ public interface IErrorPage
         DispatcherOperationCallback RefreshCallback { get; set;}
 
         /// <summary>
-        /// Callback when user clicks GetWinFx button
+        /// Callback when user clicks GetWinFX button
         /// </summary>
         DispatcherOperationCallback GetWinFxCallback { get; set;}
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs
index 97576ae062c..015e7941b15 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs
@@ -1571,7 +1571,7 @@ private Type GetCustomConverter(
                 return converterType;
             }
 
-            // Reflect for per property type converter , but skip if WinFx props
+            // Reflect for per property type converter , but skip if WinFX props
             Assembly ownerAsm = ownerType.Assembly;
 #if PBTCOMPILER
             if (XamlTypeMapper.AssemblyPF != ownerAsm &&
@@ -1975,5 +1975,3 @@ public override string ToString()
 
 
 }
-
-
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlTypeMapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlTypeMapper.cs
index c8eaa39b56c..412881e8822 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlTypeMapper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlTypeMapper.cs
@@ -2479,7 +2479,7 @@ internal TypeAndSerializer GetTypeAndSerializer (
 #if PBTCOMPILER
         private static bool IsFriendAssembly(Assembly assembly)
         {
-            // WinFx assemblies can never be friends of compiled assemblies, so just bail out.
+            // WinFX assemblies can never be friends of compiled assemblies, so just bail out.
             if (assembly == XamlTypeMapper.AssemblyPF ||
                 assembly == XamlTypeMapper.AssemblyPC ||
                 assembly == XamlTypeMapper.AssemblyWB)
@@ -4463,7 +4463,3 @@ internal static NamespaceMapEntry[] GetDefaultNamespaceMaps()
     }
 #endregion XmlParserDefaults Class
 }
-
-
-
-
diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Markup/ReflectionHelper.cs b/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Markup/ReflectionHelper.cs
index d2d536460bf..1589ae70064 100644
--- a/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Markup/ReflectionHelper.cs
+++ b/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Markup/ReflectionHelper.cs
@@ -457,7 +457,7 @@ private static Assembly LoadAssemblyHelper(string assemblyGivenName, string asse
                     {
                         // assemblyPath is set, Load the assembly from this specified place.
                         // the path must be full file path which contains directory, file name and extension.
-                        Debug.Assert(!assemblyPath.EndsWith("\\", StringComparison.Ordinal), "the assembly path should be a full file path containing file extension");
+                        Debug.Assert(!assemblyPath.EndsWith(string.Empty + Path.DirectorySeparatorChar, StringComparison.Ordinal), "the assembly path should be a full file path containing file extension");
 
                         // LoadFile will only override your request only if it is in the GAC
                         retassem = Assembly.LoadFile(assemblyPath);
diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/Tracing/mcwpf/mcwpf.csproj b/src/Microsoft.DotNet.Wpf/src/Shared/Tracing/mcwpf/mcwpf.csproj
index 3d02acc1f10..12b668b6bbe 100644
--- a/src/Microsoft.DotNet.Wpf/src/Shared/Tracing/mcwpf/mcwpf.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Shared/Tracing/mcwpf/mcwpf.csproj
@@ -7,8 +7,8 @@
   <PropertyGroup>
     <AllowCrossTargeting>true</AllowCrossTargeting>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <CrossTargetWinFxRefsVersion>v3.5</CrossTargetWinFxRefsVersion>
-    <CrossTargetWinFxToolsVersion>v3.5</CrossTargetWinFxToolsVersion>
+    <CrossTargetWinFXRefsVersion>v3.5</CrossTargetWinFXRefsVersion>
+    <CrossTargetWinFXToolsVersion>v3.5</CrossTargetWinFXToolsVersion>
   </PropertyGroup>
   
   <!-- Imports -->
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/CodeQuality_Approved.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/CodeQuality_Approved.cs
index 5958a960cde..2b280027ba4 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/CodeQuality_Approved.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/MS/Internal/Automation/CodeQuality_Approved.cs
@@ -289,7 +289,7 @@
 [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.Condition.TrueCondition")]
 [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.Condition.FalseCondition")]
 [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.TextPattern.TextChangedEvent")]
-// Reviewed by WinFx team and this case is OK
+// Reviewed by WinFX team and this case is OK
 [module: SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue", Scope = "type", Target = "System.Windows.Automation.Text.FlowDirections")]
 // Reviewed by atgarch and these enums are OK
 [module: SuppressMessage("Microsoft.Naming", "CA1714:FlagsEnumsShouldHavePluralNames", Scope = "type", Target = "System.Windows.Automation.TreeScope")]
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs
index e58940e319f..966ebccd0d2 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs
@@ -115,10 +115,10 @@ public void Close()
         /// call may return sometime after the window is ready for user input.  The calling code
         /// should not rely on this call to understand exactly when the window has become idle. 
         /// 
-        /// For now this method works reliably for both WinFx and Win32 Windows that are starting
-        /// up.  However, if called at other times on WinFx Windows (e.g. during a long layout) 
+        /// For now this method works reliably for both WinFX and Win32 Windows that are starting
+        /// up.  However, if called at other times on WinFX Windows (e.g. during a long layout) 
         /// WaitForInputIdle may return true before the Window is actually idle.  Additional work
-        /// needs to be done to detect when WinFx Windows are idle.
+        /// needs to be done to detect when WinFX Windows are idle.
         /// </remarks>
         /// <param name="milliseconds">The amount of time, in milliseconds, to wait for the 
         /// associated process to become idle. The maximum is the largest possible value of a 
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/System/Windows/Automation/Provider/IWindowProvider.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/System/Windows/Automation/Provider/IWindowProvider.cs
index fa1eea21ad8..35161ec1f86 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/System/Windows/Automation/Provider/IWindowProvider.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/System/Windows/Automation/Provider/IWindowProvider.cs
@@ -46,10 +46,10 @@ public interface IWindowProvider
         /// call may return sometime after the window is ready for user input.  The calling code
         /// should not rely on this call to understand exactly when the window has become idle. 
         /// 
-        /// For now this method works reliably for both WinFx and Win32 Windows that are starting
-        /// up.  However, if called at other times on WinFx Windows (e.g. during a long layout) 
+        /// For now this method works reliably for both WinFX and Win32 Windows that are starting
+        /// up.  However, if called at other times on WinFX Windows (e.g. during a long layout) 
         /// WaitForInputIdle may return true before the Window is actually idle.  Additional work
-        /// needs to be done to detect when WinFx Windows are idle.
+        /// needs to be done to detect when WinFX Windows are idle.
         /// </remarks>
         /// <param name="milliseconds">The amount of time, in milliseconds, to wait for the 
         /// associated process to become idle. The maximum is the largest possible value of a 
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/MS/Internal/Automation/CodeQuality_Approved.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/MS/Internal/Automation/CodeQuality_Approved.cs
index e0fe1eef9c0..454c8efd75a 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/MS/Internal/Automation/CodeQuality_Approved.cs
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/MS/Internal/Automation/CodeQuality_Approved.cs
@@ -425,7 +425,7 @@
 [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.TransformPatternIdentifiers.CanRotateProperty" )]
 [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.TransformPatternIdentifiers.CanResizeProperty" )]
 [module: SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Scope = "member", Target = "System.Windows.Automation.TextPatternIdentifiers.TextChangedEvent")]
-// Reviewed by WinFx team and this case is OK
+// Reviewed by WinFX team and this case is OK
 [module: SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue", Scope = "type", Target = "System.Windows.Automation.Text.FlowDirections")]
 // Reviewed by atgarch and these enums are OK
 [module: SuppressMessage("Microsoft.Naming", "CA1714:FlagsEnumsShouldHavePluralNames", Scope = "type", Target = "System.Windows.Automation.TreeScope")]
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/Compoundfile/ContainerUtilities.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/Compoundfile/ContainerUtilities.cs
index f231b989c1d..b86b49bcf86 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/Compoundfile/ContainerUtilities.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/Compoundfile/ContainerUtilities.cs
@@ -44,7 +44,7 @@ static internal class ContainerUtilities
 
         /// Used by ConvertBackSlashPathToStringArrayPath and 
         ///     ConvertStringArrayPathToBackSlashPath to separate path elements.
-        static readonly internal char PathSeparator = '\\';
+        static readonly internal char PathSeparator = Path.DirectorySeparatorChar;
         static private readonly char[] _PathSeparatorArray = new char[] { PathSeparator };
         static readonly internal string PathSeparatorAsString = new string(ContainerUtilities.PathSeparator, 1);