[Microsoft.Build.Utilities] Properly escape/unescape ItemSpec

With tests.

2 files changed, 15 insertions, 1 deletions

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskItem.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskItem.cs
index bbda9528245..03c018a54d9 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskItem.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskItem.cs
@@ -153,7 +153,7 @@ namespace Microsoft.Build.Utilities
 		
 		public string ItemSpec {
 			get { return MSBuildUtils.Unescape (itemSpec); }
-			set { itemSpec = MSBuildUtils.Escape (value); }
+			set { itemSpec = value; }
 		}
 
 		public int MetadataCount {
diff --git a/mcs/class/Microsoft.Build.Utilities/Test/Microsoft.Build.Utilities/TaskItemTest.cs b/mcs/class/Microsoft.Build.Utilities/Test/Microsoft.Build.Utilities/TaskItemTest.cs
index 8f23aaba4e9..79e2eff5f67 100644
--- a/mcs/class/Microsoft.Build.Utilities/Test/Microsoft.Build.Utilities/TaskItemTest.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Test/Microsoft.Build.Utilities/TaskItemTest.cs
@@ -285,5 +285,19 @@ namespace MonoTests.Microsoft.Build.Utilities {
 			item = new TaskItem ("lalala");
 			item.SetMetadata ("Identity", "some value");
 		}
+
+		[Test]
+		public void TestSetItemSpec ()
+		{
+			var itemSpec = "foo@2x.png";
+			var escapedItemSpec =  global::Microsoft.Build.BuildEngine.Utilities.Escape (itemSpec);
+
+			var item = new TaskItem ("foo");
+			item.ItemSpec = itemSpec;
+			Assert.AreEqual (itemSpec, item.ItemSpec, "#1");
+
+			item.ItemSpec = escapedItemSpec;
+			Assert.AreEqual (itemSpec, item.ItemSpec, "#2");
+		}
 	}
 }