diff options
author | pjbeaman <pj.beaman@xamarin.com> | 2015-11-05 22:28:06 +0300 |
---|---|---|
committer | pjbeaman <pj.beaman@xamarin.com> | 2015-11-05 22:28:06 +0300 |
commit | 6dd2d0d52b8bc4262d67833f44bc1537c3d17a9e (patch) | |
tree | e2a42ca2672555e92432d58d65c8de2e4380bfbb | |
parent | ce72e1ff2487b9e72f637644fa06682f2ad0010c (diff) | |
parent | e39caabfc47a14ee04659a696f758853fd3f0039 (diff) |
Merge pull request #2202 from mono/revert-2090-mono-4.2.0-branch-bug25480mono-4.2.1.102
Revert 8862921b8611220f5d744f5b7f5d7e064a9769b6
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 fe7150eee1c..8cd12c087d7 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> (StringComparer.OrdinalIgnoreCase); + this.projects = new Dictionary <string, Project> (); 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 3c27732bf4f..fdf43ccd488 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' or '$(BuildingInsideVisualStudio)' == 'true'"> + Condition="'$(BuildingSolutionFile)' == 'true'"> <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/> </AssignProjectConfiguration> <!-- Else, just --> - <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'"> + <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != '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 36f12559863..d420c093660 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' or '$(BuildingInsideVisualStudio)' == 'true'"> + Condition="'$(BuildingSolutionFile)' == 'true'"> <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/> </AssignProjectConfiguration> <!-- Else, just --> - <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'"> + <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != '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 079b8e092a2..31fd0bc580a 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' or '$(BuildingInsideVisualStudio)' == 'true'"> + Condition="'$(BuildingSolutionFile)' == 'true'"> <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/> </AssignProjectConfiguration> <!-- Else, just --> - <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'"> + <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != '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 c3f560a5f0e..5e5a5679eba 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' or '$(BuildingInsideVisualStudio)' == 'true'"> + Condition="'$(BuildingSolutionFile)' == 'true'"> <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/> </AssignProjectConfiguration> <!-- Else, just --> - <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'"> + <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != '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 47b6b7f36e0..832b54fbefc 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' or '$(BuildingInsideVisualStudio)' == 'true'"> + Condition="'$(BuildingSolutionFile)' == 'true'"> <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/> </AssignProjectConfiguration> <!-- Else, just --> - <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'"> + <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'"> <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/> </CreateItem> |