diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
index 2b51517e7c3..771f6780eb2 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
@@ -40,7 +40,6 @@
       <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 -->
@@ -55,7 +54,6 @@
       <IsLibrary Condition="'$(OutputType)'=='module'">true</IsLibrary>
   </PropertyGroup>
 
-
   <PropertyGroup>
       <!--
           Inject AssignWinFXEmbeddedResource target at right stage.
@@ -66,7 +64,6 @@
       </PrepareResourceNamesDependsOn>
   </PropertyGroup>
 
-
   <!-- Common Application and Library Property settings -->
   <PropertyGroup>
       <PrepareResourcesDependsOn>
@@ -79,7 +76,6 @@
       </PrepareResourcesDependsOn>
   </PropertyGroup>
 
-
   <PropertyGroup>
         <!-- Add Markup compilation to the CoreCompileDependsOn so that the IDE inproc compilers (particularly VB)
              can "see" the generated source files. -->
@@ -89,14 +85,15 @@
       </CoreCompileDependsOn>
   </PropertyGroup>
 
+
   <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'">
          <!--
@@ -128,7 +125,6 @@
   <Target Name="PrepareResourcesForSatelliteAssemblies"
           Condition="'$(UICulture)' != ''"
           DependsOnTargets="$(PrepareResourcesForSatelliteAssembliesDependsOn)" >
-
   </Target>
 
 
@@ -141,22 +137,18 @@
         $(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;
@@ -165,11 +157,10 @@
     </_AfterCompileWinFXInternalDependsOn>
   </PropertyGroup>
 
-
   <!-- Work that we want to be done after the "Compile" target in Microsoft.Common.targets -->
-
   <Target Name="_AfterCompileWinFXInternal" DependsOnTargets="$(_AfterCompileWinFXInternalDependsOn)" />
 
+
   <!--
     ===========================================================================================
                                         Extensibility Points
@@ -190,9 +181,6 @@
     This target uses MarkupCompilePass1 task.
   -->
 
-
-
-
   <!--
   ================================================================
                                    MarkupCompilePass1
@@ -259,7 +247,6 @@
 
               <Output ItemName="_GeneratedCodeFiles"
                       TaskParameter="GeneratedCodeFiles" />
-
         </MarkupCompilePass1>
 
         <Message Text="(out) GeneratedBamlFiles: '@(GeneratedBaml)'" Condition="'$(MSBuildTargetsVerbose)'=='true'"/>
@@ -268,13 +255,11 @@
         <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
     ================================================================
@@ -286,7 +271,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')" >
@@ -306,7 +290,7 @@
                XamlDebuggingInformation="$(XamlDebuggingInformation)"
                GeneratedBaml=""
                OutputPath="$(IntermediateOutputPath)"
-               ContinueOnError="false" 
+               ContinueOnError="false"
                SupportCustomOutputPaths="$(IncludePackageReferencesDuringMarkupCompilation)">
 
           <!--
@@ -330,16 +314,13 @@
 
             <!-- 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
     ================================================================
@@ -350,7 +331,6 @@
         It is possible when UICulture is not set, or the xaml file has explicitly set Localizable metadata to false.
 
         Condition: _RequireMCPass2ForMainAssembly == true
-
   -->
 
   <PropertyGroup>
@@ -362,12 +342,10 @@
        </MarkupCompilePass2ForMainAssemblyDependsOn>
 
         <_CompileTargetNameForLocalType Condition="'$(_CompileTargetNameForLocalType)' == ''">_CompileTemporaryAssembly</_CompileTargetNameForLocalType>
-
         <!-- The updated .NET 5.0.2 GenerateTemporaryTargetAssembly behavior that supports source generators is off by default. -->
         <IncludePackageReferencesDuringMarkupCompilation Condition="'$(IncludePackageReferencesDuringMarkupCompilation)' == ''">true</IncludePackageReferencesDuringMarkupCompilation>
         <_ResolveProjectReferencesTargetName Condition="'$(IncludePackageReferencesDuringMarkupCompilation)' != 'false'">ResolveProjectReferences</_ResolveProjectReferencesTargetName>
         <_CompileTemporaryAssemblyDependsOn>BuildOnlySettings;ResolveKeySource;$(_ResolveProjectReferencesTargetName);CoreCompile</_CompileTemporaryAssemblyDependsOn>
-
   </PropertyGroup>
 
   <Target Name="_CompileTemporaryAssembly"  DependsOnTargets="$(_CompileTemporaryAssemblyDependsOn)" Returns="$(IntermediateOutputPath)$(TargetFileName)"/>
@@ -376,17 +354,15 @@
   <Target Name="MarkupCompilePass2ForMainAssembly"
                Condition="'$(_RequireMCPass2ForMainAssembly)' == 'true' "
                DependsOnTargets="$(MarkupCompilePass2ForMainAssemblyDependsOn)" >
-
   </Target>
 
-  <!--
 
+  <!--
                 ==========================================
                        GenerateTemporaryTargetAssembly
                 ==========================================
 
                 Name : GenerateTemporaryTargetAssembly
-
   -->
   <Target Name="GenerateTemporaryTargetAssembly" Condition="'$(_RequireMCPass2ForMainAssembly)' == 'true'">
 
@@ -401,9 +377,10 @@
        </PropertyGroup>
 
       <!-- Collect the generated NuGet files from the parent project required to support PackageReferences. -->
-      <!--  
-          Note that MSBuildProjectExtensionsPath defaults to BaseIntermediateOutputPath (Microsoft.Common.props) 
-          unless it it set prior to importing the .NET SDK. In the WPF temp project, MSBuildProjectExtensionsPath 
+
+      <!--
+          Note that MSBuildProjectExtensionsPath defaults to BaseIntermediateOutputPath (Microsoft.Common.props)
+          unless it it set prior to importing the .NET SDK. In the WPF temp project, MSBuildProjectExtensionsPath
           cannot be defined before the .NET SDK is imported, and always defaults to BaseIntermediateOutputPath.
       -->
 
@@ -425,7 +402,7 @@
         <_DestGeneratedNuGetPropsAndTargets Include="$(BaseIntermediateOutputPath)project.assets.json"/>
         <_DestGeneratedNuGetPropsAndTargets Include="$(BaseIntermediateOutputPath)project.nuget.cache"/>
       </ItemGroup>
-         
+
       <!-- Copy the renamed outer project NuGet props/targets files to the MSBuildProjectExtensionsPath used by NuGet. -->
       <Copy Condition="'$(IncludePackageReferencesDuringMarkupCompilation)' != 'false'"
             SourceFiles="@(_SourceGeneratedNuGetPropsAndTargets)"
@@ -478,7 +455,6 @@
                  >
 
           <Output TaskParameter="TemporaryAssemblyForLocalTypeReference" PropertyName="_AssemblyForLocalTypeReference" />
-
        </GenerateTemporaryTargetAssembly>
 
        <CreateItem Include="$(_AssemblyForLocalTypeReference)">
@@ -490,17 +466,15 @@
            Condition="'$(IncludePackageReferencesDuringMarkupCompilation)' != 'false'
             and '$(GenerateTemporaryTargetAssemblyDebuggingInformation)' != 'true'"
             Files="@(_DestGeneratedNuGetPropsAndTargets)" />
-
    </Target>
 
-  <!--
 
+  <!--
                  ===========================================
                           CleanupTemporaryTargetAssembly
                  ===========================================
 
                 Name : CleanupTemporaryTargetAssembly
-
   -->
 
   <Target Name="CleanupTemporaryTargetAssembly" >
@@ -509,13 +483,10 @@
 
          <Delete Files="@(AssemblyForLocalTypeReference)"
                      Condition="Exists('%(Fullpath)')" />
-
   </Target>
 
 
-
 <!--
-
     ================================================================
                                    SatelliteOnlyMarkupCompilePass2
     ================================================================
@@ -526,16 +497,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'"
@@ -564,14 +532,12 @@
 
      <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
@@ -582,8 +548,6 @@
          we set default value 'Internet' here.
      -->
      <TargetZone Condition="'$(TargetZone)' == ''">Internet</TargetZone>
-
-
      <!--
         Overwrite below properties which have been set in Microsoft.Common.targets.
      -->
@@ -591,7 +555,6 @@
      <StartURL Condition="'$(StartURL)'==''">$(MSBuildProjectDirectory)\bin\$(Configuration)\$(TargetDeployManifestFileName)</StartURL>
      <StartArguments Condition="'$(StartArguments)' == ''">-debug  "$(StartURL)"</StartArguments>
      <StartArguments Condition="'$(DebugSecurityZoneURL)' != ''">$(StartArguments) -DebugSecurityZoneURL "$(DebugSecurityZoneURL)"</StartArguments>
-
   </PropertyGroup>
 
 
@@ -619,7 +582,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)' != ''" >
@@ -644,7 +606,6 @@
             CertificateThumbprint="$(_DeploymentResolvedManifestCertificateThumbprint)"
             TimestampUrl="$(ManifestTimestampUrl)"
             SigningTarget="@(ApplicationManifest)"/>
-
   </Target>
 
 
@@ -662,7 +623,6 @@
             CertificateThumbprint="$(_DeploymentResolvedManifestCertificateThumbprint)"
             TimestampUrl="$(ManifestTimestampUrl)"
             SigningTarget="@(DeployManifest)"/>
-
   </Target>
 
 
@@ -672,7 +632,6 @@
       ================================================================
 
      Classify baml and image files into different groups for Main assembly and satellite assembly respectively.
-
   -->
   <Target Name="FileClassification">
 
@@ -690,12 +649,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>
 
   <!--
@@ -721,7 +678,6 @@
      <_ResourceNameInMainAssembly Condition="'$(UICulture)' != ''">$(AssemblyName).unlocalizable.g.resources</_ResourceNameInMainAssembly>
   </PropertyGroup>
 
-
   <Target Name="MainResourcesGeneration" Inputs="@(MainEmbeddedFiles)" Outputs="$(IntermediateOutputPath)$(_ResourceNameInMainAssembly)" Condition="'@(MainEmbeddedFiles)' != ''">
 
     <!--
@@ -739,7 +695,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>
@@ -750,11 +705,10 @@
                 <OutputResource>$(IntermediateOutputPath)$(_ResourceNameInMainAssembly)</OutputResource>
           </EmbeddedResource>
     </ItemGroup>
-
   </Target>
 
-  <!--
 
+  <!--
        ================================================================
                                    SatelliteResourceGeneration
        ================================================================
@@ -791,13 +745,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
@@ -817,7 +770,6 @@
                 <OutputResource>@(_SatelliteResourceFile)</OutputResource>
           </EmbeddedResource>
       </ItemGroup>
-
   </Target>
 
 
@@ -849,7 +801,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.
-
     -->
 
     <!--
@@ -871,7 +822,6 @@
             Condition="'@(ResxWithCulture)' != ''">
 
            <Output ItemName="SatelliteDllsProjectOutputGroupOutputIntermediate" TaskParameter="Include" />
-
         </CreateItem>
 
         <!--  This task is WinFX specific. -->
@@ -882,7 +832,6 @@
             Condition="'$(UICulture)' != ''">
 
            <Output ItemName="SatelliteDllsProjectOutputGroupOutputIntermediate" TaskParameter="Include" />
-
         </CreateItem>
 
         <!-- End of WinFX specific -->
@@ -893,7 +842,6 @@
             Condition="'@(NonResxWithCulture)' != ''">
 
             <Output ItemName="SatelliteDllsProjectOutputGroupOutputIntermediate" TaskParameter="Include" />
-
         </CreateItem>
 
         <CreateItem Include="$(IntermediateOutputPath)">
@@ -904,7 +852,6 @@
         <CreateItem Include="@(SatelliteDllsProjectOutputGroupOutputIntermediate->'%(FullPath)')">
             <Output ItemName="SatelliteDllsProjectOutputGroupOutput" TaskParameter="Include"/>
         </CreateItem>
-
     </Target>
 
 
@@ -913,7 +860,6 @@
           Condition="'@(Page)' != '' or '@(ApplicationDefinition)' != ''">
 
        <UidManager MarkupFiles="@(Page);@(ApplicationDefinition)" Task="Check" />
-
   </Target>
 
   <Target Name="UpdateUid"
@@ -923,26 +869,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)' !=''"
@@ -951,7 +896,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
@@ -962,11 +906,11 @@
            <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.
@@ -990,10 +934,8 @@
         <EmbeddedResource Include="@(_Temporary)" />
         <_Temporary Remove="@(_Temporary)" />
     </ItemGroup>
-
   </Target>
 
   <!-- End of the project file, Do not add any more propeties, items, targets etc. -->
 
 </Project>
-