Merge pull request #664 from symform/xbuild-AssignProjectConfiguration

Renamed target AssignProjectConfigurations to AssignProjectConfiguration...

diff --combined mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
index 6fec8df52c674c9d7cb091c23996f2c4d7939bd8,099723ae2d4dad83689e85a713f1ffaa936dad0b..345609f90a9e4e250867b32f7995f443edf03b46
--- 1/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
--- 2/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
@@@ -138,7 -138,6 +138,7 @@@
                <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">
                        {CandidateAssemblyFiles};
                        $(ReferencePath);
 +                      @(AdditionalReferencePath);
                        {HintPathFromItem};
                        {TargetFrameworkDirectory};
                        {PkgConfig};
@@@ -188,7 -187,7 +188,7 @@@
        </Target>
  
        <Target
-               Name="AssignProjectConfigurations"
+               Name="AssignProjectConfiguration"
                Condition="'@(ProjectReference)' != ''">
  
                <!-- assign configs if building a solution file -->
@@@ -212,7 -211,7 +212,7 @@@
                ProjectReferenceWithConfigurationNonExistent: Projects non-existent on disk -->
  
        <Target Name="SplitProjectReferencesByExistent"
-               DependsOnTargets="AssignProjectConfigurations">
+               DependsOnTargets="AssignProjectConfiguration">
  
                <CreateItem Include="@(ProjectReferenceWithConfiguration)" Condition="'@(ProjectReferenceWithConfiguration)' != ''">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfigurationExistent"
@@@ -690,6 -689,10 +690,6 @@@
                        <Output TaskParameter="Lines" ItemName="PreviousFileWrites"/>
                </ReadLinesFromFile>
  
 -              <RemoveDuplicates Inputs="@(PreviousFileWrites);@(FileWrites->'%(FullPath)')">
 -                      <Output TaskParameter="Filtered" ItemName="CombinedFileWrites"/>
 -              </RemoveDuplicates>
 -
                <!-- CopyLocal files: In case all the projects build to common output
                     directory, then other projects might depend on some of these
                     CopyLocal files, so delete only the ones under *this* project
@@@ -698,10 -701,6 +698,10 @@@
                        <Output TaskParameter="InPath" ItemName="FileWrites"/>
                </FindUnderPath>
  
 +              <RemoveDuplicates Inputs="@(PreviousFileWrites);@(FileWrites->'%(FullPath)')">
 +                      <Output TaskParameter="Filtered" ItemName="CombinedFileWrites"/>
 +              </RemoveDuplicates>
 +
                <WriteLinesToFile
                        File="$(IntermediateOutputPath)$(CleanFile)"
                        Lines="@(CombinedFileWrites)"
@@@ -738,7 -737,7 +738,7 @@@
        </Target>
  
        <Target Name="CleanReferencedProjects"
-               DependsOnTargets="AssignProjectConfigurations">
+               DependsOnTargets="AssignProjectConfiguration">
  
                <!-- If building from .sln.proj or from IDE, clean will get handled by them,
                     else we are building a project directly, from the command line, so

diff --combined mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
index d49e2102b7a6dfd2f1bfc72057ba86a7d469f3f4,2392afea0eb70d6f3674738e6e77a7667a624d82..6a2c6efe85dced063d88c5c0d0a5f862d9cee795
--- 1/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
--- 2/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
@@@ -145,7 -145,6 +145,7 @@@
                <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">
                        {CandidateAssemblyFiles};
                        $(ReferencePath);
 +                      @(AdditionalReferencePath);
                        {HintPathFromItem};
                        {TargetFrameworkDirectory};
                        {PkgConfig};
@@@ -197,7 -196,7 +197,7 @@@
        </Target>
  
        <Target
-               Name="AssignProjectConfigurations"
+               Name="AssignProjectConfiguration"
                Condition="'@(ProjectReference)' != ''">
  
                <!-- assign configs if building a solution file -->
@@@ -221,7 -220,7 +221,7 @@@
                ProjectReferenceWithConfigurationNonExistent: Projects non-existent on disk -->
  
        <Target Name="SplitProjectReferencesByExistent"
-               DependsOnTargets="AssignProjectConfigurations">
+               DependsOnTargets="AssignProjectConfiguration">
  
                <CreateItem Include="@(ProjectReferenceWithConfiguration)" Condition="'@(ProjectReferenceWithConfiguration)' != ''">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfigurationExistent"
@@@ -697,6 -696,10 +697,6 @@@
                        <Output TaskParameter="Lines" ItemName="PreviousFileWrites"/>
                </ReadLinesFromFile>
  
 -              <RemoveDuplicates Inputs="@(PreviousFileWrites);@(FileWrites->'%(FullPath)')">
 -                      <Output TaskParameter="Filtered" ItemName="CombinedFileWrites"/>
 -              </RemoveDuplicates>
 -
                <!-- CopyLocal files: In case all the projects build to common output
                     directory, then other projects might depend on some of these
                     CopyLocal files, so delete only the ones under *this* project
@@@ -705,10 -708,6 +705,10 @@@
                        <Output TaskParameter="InPath" ItemName="FileWrites"/>
                </FindUnderPath>
  
 +              <RemoveDuplicates Inputs="@(PreviousFileWrites);@(FileWrites->'%(FullPath)')">
 +                      <Output TaskParameter="Filtered" ItemName="CombinedFileWrites"/>
 +              </RemoveDuplicates>
 +
                <WriteLinesToFile
                        File="$(IntermediateOutputPath)$(CleanFile)"
                        Lines="@(CombinedFileWrites)"
@@@ -745,7 -744,7 +745,7 @@@
        </Target>
  
        <Target Name="CleanReferencedProjects"
-               DependsOnTargets="AssignProjectConfigurations">
+               DependsOnTargets="AssignProjectConfiguration">
  
                <!-- If building from .sln.proj or from IDE, clean will get handled by them,
                     else we are building a project directly, from the command line, so

diff --combined mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
index 862f75e2e21204acc68e574fb034572d6f14bd4e,793e3948f8bb6915b953dea50493b9ec58f62dbe..86d8fb0b4f508c8fd58d02e5c379c2106d99a000
--- 1/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
--- 2/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
@@@ -202,7 -202,6 +202,7 @@@
                <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">
                        {CandidateAssemblyFiles};
                        $(ReferencePath);
 +                      @(AdditionalReferencePath);
                        {HintPathFromItem};
                        {TargetFrameworkDirectory};
                        {PkgConfig};
@@@ -292,7 -291,7 +292,7 @@@
        </Target>
  
        <Target
-               Name="AssignProjectConfigurations"
+               Name="AssignProjectConfiguration"
                Condition="'@(ProjectReference)' != ''">
  
                <!-- assign configs if building a solution file -->
@@@ -316,7 -315,7 +316,7 @@@
                ProjectReferenceWithConfigurationNonExistent: Projects non-existent on disk -->
  
        <Target Name="SplitProjectReferencesByExistent"
-               DependsOnTargets="AssignProjectConfigurations">
+               DependsOnTargets="AssignProjectConfiguration">
  
                <CreateItem Include="@(ProjectReferenceWithConfiguration)" Condition="'@(ProjectReferenceWithConfiguration)' != ''">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfigurationExistent"
@@@ -795,6 -794,10 +795,6 @@@
                        <Output TaskParameter="Lines" ItemName="PreviousFileWrites"/>
                </ReadLinesFromFile>
  
 -              <RemoveDuplicates Inputs="@(PreviousFileWrites);@(FileWrites->'%(FullPath)')">
 -                      <Output TaskParameter="Filtered" ItemName="CombinedFileWrites"/>
 -              </RemoveDuplicates>
 -
                <!-- CopyLocal files: In case all the projects build to common output
                     directory, then other projects might depend on some of these
                     CopyLocal files, so delete only the ones under *this* project
@@@ -803,10 -806,6 +803,10 @@@
                        <Output TaskParameter="InPath" ItemName="FileWrites"/>
                </FindUnderPath>
  
 +              <RemoveDuplicates Inputs="@(PreviousFileWrites);@(FileWrites->'%(FullPath)')">
 +                      <Output TaskParameter="Filtered" ItemName="CombinedFileWrites"/>
 +              </RemoveDuplicates>
 +
                <WriteLinesToFile
                        File="$(IntermediateOutputPath)$(CleanFile)"
                        Lines="@(CombinedFileWrites)"
@@@ -843,7 -842,7 +843,7 @@@
        </Target>
  
        <Target Name="CleanReferencedProjects"
-               DependsOnTargets="AssignProjectConfigurations">
+               DependsOnTargets="AssignProjectConfiguration">
  
                <!-- If building from .sln.proj or from IDE, clean will get handled by them,
                     else we are building a project directly, from the command line, so