diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2014-02-11 12:27:43 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2014-02-11 12:28:01 +0400 |
commit | 0e37c07da3e62dd8aa17090d729d875c185538f9 (patch) | |
tree | 4a8666294e6b6a8a98f2d511d22e35a11bd5b3e2 /main/src | |
parent | 138ad2f7b71abfb2d97f73331d073b4a55158749 (diff) |
[Core] Added unit tests
Added unit test for bug 17316 - Monodevelop overwrites conditional references
Also simplified a bit the fix.
Diffstat (limited to 'main/src')
-rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs index 9f9e857213..0055641f4e 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs @@ -1230,7 +1230,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild // Remove old items Dictionary<string,ItemInfo> oldItems = new Dictionary<string, ItemInfo> (); foreach (MSBuildItem item in msproject.GetAllItems ()) - oldItems [item.Name + "<" + item.Include + (!String.IsNullOrEmpty(item.Condition) ? "<"+item.Condition: String.Empty)] = new ItemInfo () { Item=item }; + oldItems [item.Name + "<" + item.Include + "<" + item.Condition] = new ItemInfo () { Item=item }; // Add the new items foreach (object ob in ((SolutionEntityItem)Item).Items.Concat (((SolutionEntityItem)Item).WildcardItems)) @@ -1603,7 +1603,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild MSBuildItem AddOrGetBuildItem (MSBuildProject msproject, Dictionary<string,ItemInfo> oldItems, string name, string include, string condition) { ItemInfo itemInfo; - string key = name + "<" + include + (!String.IsNullOrEmpty(condition) ? "<" + condition : String.Empty); + string key = name + "<" + include + "<" + condition; if (oldItems.TryGetValue (key, out itemInfo)) { if (!itemInfo.Added) { itemInfo.Added = true; |