From 8c101b8b19fa3c58a781957dff59b203f790d7fb Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Sun, 14 Jun 2020 09:26:08 +0530
Subject: [PATCH] Fixup new-lines making them easier to read

Only in WinFX and Desktop SDK props/targets
---
 .../Microsoft.NET.Sdk.WindowsDesktop.props    |  11 --
 .../Microsoft.NET.Sdk.WindowsDesktop.targets  |   4 -
 .../Microsoft.WinFX.targets                   | 119 ++----------------
 3 files changed, 11 insertions(+), 123 deletions(-)

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 1da0f3c6cbc..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
@@ -17,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
     --> 
@@ -50,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 
@@ -66,7 +61,6 @@
           Condition="'$(EnableDefaultApplicationDefinition)' != 'false' And '$(EnableDefaultPageItems)' != 'false'" />
   </ItemGroup>
 
-  
   <ItemGroup Condition="('$(DisableImplicitFrameworkReferences)' != 'true') And
                       ('$(TargetFrameworkIdentifier)' == '.NETCoreApp') And
                       ('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And
@@ -82,7 +76,6 @@
                         Condition="('$(UseWPF)' != 'true') And ('$(UseWindowsForms)' == 'true')"/>
   </ItemGroup>
   
-
   <!--
     Traditionally, Visual Studio has supplied these references for .NET Framework based
     WPF Projects: 
@@ -90,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: 
     
@@ -102,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. 
@@ -167,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+
     -->
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 7eadb44fe25..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,7 +23,6 @@
     <_TargetFrameworkVersionValue>$([MSBuild]::ValueOrDefault('$(_TargetFrameworkVersionWithoutV)', '$(_UndefinedTargetFrameworkVersion)'))</_TargetFrameworkVersionValue>
   </PropertyGroup>
   
-
   <ItemGroup Condition=" ('$(EnableDefaultItems)' == 'true') And ('$(UseWPF)' == 'true') And ('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And 
                          ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
 
@@ -33,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
@@ -42,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
@@ -80,7 +77,6 @@
       <Page Remove="@(Page)" />
       <Page Include="@(DeduplicatedPageItems)" />
     </ItemGroup>
-
   </Target>
 
   <!-- 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
index cd051de4072..7dc69801618 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
@@ -8,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.
@@ -18,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 -->
@@ -37,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;
@@ -71,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" />
@@ -128,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
@@ -194,9 +166,6 @@
     This target uses MarkupCompilePass1 task.
   -->
 
-
-
-
   <!--
   ================================================================
                                    MarkupCompilePass1
@@ -223,6 +192,7 @@
             <_IntellisenseOnlyCompile>false</_IntellisenseOnlyCompile>
             <_IntellisenseOnlyCompile Condition="'$(BuildingProject)' != 'true'">true</_IntellisenseOnlyCompile>
         </PropertyGroup>
+
         <MarkupCompilePass1
                Language="$(Language)"
                UICulture="$(UICulture)"
@@ -250,7 +220,6 @@
                IsRunningInVisualStudio="$(BuildingInsideVisualStudio)"
                OutputPath="$(IntermediateOutputPath)">
 
-
               <Output ItemName="GeneratedBaml" TaskParameter="GeneratedBamlFiles"/>
               <Output ItemName="GeneratedLocalizationFiles" TaskParameter="GeneratedLocalizationFiles" />
               <Output PropertyName="_RequireMCPass2ForMainAssembly" TaskParameter="RequirePass2ForMainAssembly" />
@@ -262,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
     ================================================================
@@ -291,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')" >
@@ -320,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'"/>
@@ -333,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
     ================================================================
@@ -357,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;
@@ -370,8 +325,6 @@
        </MarkupCompilePass2ForMainAssemblyDependsOn>
 
        <_CompileTargetNameForLocalType Condition="'$(_CompileTargetNameForLocalType)' == ''">_CompileTemporaryAssembly</_CompileTargetNameForLocalType>
-
-
   </PropertyGroup>
 
   <Target Name="_CompileTemporaryAssembly"  DependsOnTargets="BuildOnlySettings;ResolveKeySource;CoreCompile" />
@@ -380,18 +333,15 @@
   <Target Name="MarkupCompilePass2ForMainAssembly"
                Condition="'$(_RequireMCPass2ForMainAssembly)' == 'true' "
                DependsOnTargets="$(MarkupCompilePass2ForMainAssemblyDependsOn)" >
-
   </Target>
 
 
   <!--
-
                 ==========================================
                        GenerateTemporaryTargetAssembly
                 ==========================================
 
                 Name : GenerateTemporaryTargetAssembly
-
   -->
 
    <Target Name="GenerateTemporaryTargetAssembly"
@@ -411,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" >
@@ -437,13 +383,10 @@
 
          <Delete Files="@(AssemblyForLocalTypeReference)"
                      Condition="Exists('%(Fullpath)')" />
-
   </Target>
 
 
-
 <!--
-
     ================================================================
                                    SatelliteOnlyMarkupCompilePass2
     ================================================================
@@ -454,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'"
@@ -490,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
@@ -511,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>
 
 
@@ -551,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)' != ''" >
@@ -577,7 +506,6 @@
             CertificateThumbprint="$(_DeploymentResolvedManifestCertificateThumbprint)"
             TimestampUrl="$(ManifestTimestampUrl)"
             SigningTarget="@(ApplicationManifest)"/>
-
   </Target>
 
 
@@ -595,7 +523,6 @@
             CertificateThumbprint="$(_DeploymentResolvedManifestCertificateThumbprint)"
             TimestampUrl="$(ManifestTimestampUrl)"
             SigningTarget="@(DeployManifest)"/>
-
   </Target>
 
 
@@ -605,7 +532,6 @@
       ================================================================
 
      Classify baml and image files into different groups for Main assembly and satellite assembly respectively.
-
   -->
   <Target Name="FileClassification">
 
@@ -623,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>
 
   <!--
@@ -639,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.
@@ -651,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)' != ''">
 
     <!--
@@ -678,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>
@@ -689,11 +605,10 @@
                 <OutputResource>$(IntermediateOutputPath)$(_ResourceNameInMainAssembly)</OutputResource>
           </EmbeddedResource>
     </ItemGroup>
-
   </Target>
 
-  <!--
 
+  <!--
        ================================================================
                                    SatelliteResourceGeneration
        ================================================================
@@ -730,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
@@ -757,7 +670,6 @@
                 <OutputResource>@(_SatelliteResourceFile)</OutputResource>
           </EmbeddedResource>
       </ItemGroup>
-
   </Target>
 
 
@@ -789,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.
-
     -->
 
     <!--
@@ -811,7 +722,6 @@
             Condition="'@(ResxWithCulture)' != ''">
 
            <Output ItemName="SatelliteDllsProjectOutputGroupOutputIntermediate" TaskParameter="Include" />
-
         </CreateItem>
 
         <!--  This task is WinFX specific. -->
@@ -822,7 +732,6 @@
             Condition="'$(UICulture)' != ''">
 
            <Output ItemName="SatelliteDllsProjectOutputGroupOutputIntermediate" TaskParameter="Include" />
-
         </CreateItem>
 
         <!-- End of WinFX specific -->
@@ -833,7 +742,6 @@
             Condition="'@(NonResxWithCulture)' != ''">
 
             <Output ItemName="SatelliteDllsProjectOutputGroupOutputIntermediate" TaskParameter="Include" />
-
         </CreateItem>
 
         <CreateItem Include="$(IntermediateOutputPath)">
@@ -844,7 +752,6 @@
         <CreateItem Include="@(SatelliteDllsProjectOutputGroupOutputIntermediate->'%(FullPath)')">
             <Output ItemName="SatelliteDllsProjectOutputGroupOutput" TaskParameter="Include"/>
         </CreateItem>
-
     </Target>
 
 
@@ -853,7 +760,6 @@
           Condition="'@(Page)' != '' or '@(ApplicationDefinition)' != ''">
 
        <UidManager MarkupFiles="@(Page);@(ApplicationDefinition)" Task="Check" />
-
   </Target>
 
   <Target Name="UpdateUid"
@@ -863,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)' !=''"
@@ -891,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
@@ -901,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.
@@ -931,8 +834,8 @@
         <EmbeddedResource Include="@(_Temporary)" />
         <_Temporary Remove="@(_Temporary)" />
     </ItemGroup>
-
   </Target>
+
   <!-- End of the project file, Do not add any more propeties, items, targets etc. -->
 
 </Project>