diff options
| author | Martin Baulig <martin.baulig@xamarin.com> | 2013-07-02 18:49:31 +0400 |
|---|---|---|
| committer | Martin Baulig <martin.baulig@xamarin.com> | 2013-07-02 18:49:31 +0400 |
| commit | 21dacdc57e3f08c1fbcdc840f127a90b7bff193e (patch) | |
| tree | 6b300fed5469deff2c7b7b3b3b27cb0243db2945 /mcs | |
| parent | abe99070fa299aad056e4def242ed278a1d1a5f1 (diff) | |
| parent | f8a1598eb1a0524e187a6c80b3a91d3a087102e6 (diff) | |
Merge pull request #664 from symform/xbuild-AssignProjectConfiguration
Renamed target AssignProjectConfigurations to AssignProjectConfiguration...
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets | 6 | ||||
| -rw-r--r-- | mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets | 6 | ||||
| -rw-r--r-- | mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets index 6fec8df52c6..345609f90a9 100644 --- a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets @@ -188,7 +188,7 @@ </Target> <Target - Name="AssignProjectConfigurations" + Name="AssignProjectConfiguration" Condition="'@(ProjectReference)' != ''"> <!-- assign configs if building a solution file --> @@ -212,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" @@ -738,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 --git a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets index d49e2102b7a..6a2c6efe85d 100644 --- a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets +++ b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets @@ -197,7 +197,7 @@ </Target> <Target - Name="AssignProjectConfigurations" + Name="AssignProjectConfiguration" Condition="'@(ProjectReference)' != ''"> <!-- assign configs if building a solution file --> @@ -221,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" @@ -745,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 --git a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets index 862f75e2e21..86d8fb0b4f5 100644 --- a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets @@ -292,7 +292,7 @@ </Target> <Target - Name="AssignProjectConfigurations" + Name="AssignProjectConfiguration" Condition="'@(ProjectReference)' != ''"> <!-- assign configs if building a solution file --> @@ -316,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" @@ -843,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 |