Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
--- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectCollectionTest.cs
+++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectCollectionTest.cs
@@ -40,15 +40,13 @@ namespace MonoTests.Microsoft.Build.Evaluation
 	public class ProjectCollectionTest
 	{
 		[Test]
-#if NET_4_0
-		// BXC #20961
-		[Category ("NotWorking")]
-#endif
 		public void GlobalProperties ()
 		{
 			var g = ProjectCollection.GlobalProjectCollection;
 			Assert.AreEqual (0, g.GlobalProperties.Count, "#1");
+			#if NET_4_5
 			Assert.IsTrue (g.GlobalProperties.IsReadOnly, "#2");
+			#endif
 		}
 		
 		[Test]