diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2015-10-29 22:53:58 +0300 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2015-10-29 22:53:58 +0300 |
| commit | 8862921b8611220f5d744f5b7f5d7e064a9769b6 (patch) | |
| tree | 2a2e7babec385f4662e7b8d7a78ed2dfb900a099 | |
| parent | 7c0dc31b21f725b0fc5ad53306a9d093ff59e022 (diff) | |
| parent | 3b2029216ecc1ba6386d96e4b9aded2621a01323 (diff) | |
Merge pull request #2090 from DavidKarlas/mono-4.2.0-branch-bug25480mono-4.2.1.91
[C6SR1] Bug 25480 - OutputPath property is not set for this project
6 files changed, 11 insertions, 11 deletions
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs index 8cd12c087d7..fe7150eee1c 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs @@ -93,7 +93,7 @@ namespace Microsoft.Build.BuildEngine { { this.binPath = binPath; this.buildEnabled = true; - this.projects = new Dictionary <string, Project> (); + this.projects = new Dictionary <string, Project> (StringComparer.OrdinalIgnoreCase); this.eventSource = new EventSource (); this.loggers = new List <ILogger> (); this.buildStarted = false; diff --git a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets index fdf43ccd488..3c27732bf4f 100644 --- a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets @@ -328,13 +328,13 @@ <AssignProjectConfiguration ProjectReferences = "@(ProjectReference)" SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)" - Condition="'$(BuildingSolutionFile)' == 'true'"> + Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'"> <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/> </AssignProjectConfiguration> <!-- Else, just --> - <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'"> + <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'"> <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/> </CreateItem> diff --git a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets index d420c093660..36f12559863 100644 --- a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets @@ -313,13 +313,13 @@ <AssignProjectConfiguration ProjectReferences = "@(ProjectReference)" SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)" - Condition="'$(BuildingSolutionFile)' == 'true'"> + Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'"> <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/> </AssignProjectConfiguration> <!-- Else, just --> - <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'"> + <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'"> <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/> </CreateItem> diff --git a/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets index 31fd0bc580a..079b8e092a2 100644 --- a/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets @@ -194,13 +194,13 @@ <AssignProjectConfiguration ProjectReferences = "@(ProjectReference)" SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)" - Condition="'$(BuildingSolutionFile)' == 'true'"> + Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'"> <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/> </AssignProjectConfiguration> <!-- Else, just --> - <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'"> + <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'"> <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/> </CreateItem> diff --git a/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets b/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets index 5e5a5679eba..c3f560a5f0e 100644 --- a/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets @@ -224,13 +224,13 @@ <AssignProjectConfiguration ProjectReferences = "@(ProjectReference)" SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)" - Condition="'$(BuildingSolutionFile)' == 'true'"> + Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'"> <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/> </AssignProjectConfiguration> <!-- Else, just --> - <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'"> + <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'"> <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/> </CreateItem> diff --git a/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets index 832b54fbefc..47b6b7f36e0 100644 --- a/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets @@ -328,13 +328,13 @@ <AssignProjectConfiguration ProjectReferences = "@(ProjectReference)" SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)" - Condition="'$(BuildingSolutionFile)' == 'true'"> + Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'"> <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/> </AssignProjectConfiguration> <!-- Else, just --> - <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'"> + <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'"> <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/> </CreateItem> |