Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions
--- a/mcs/class/corlib/Test/System.Resources/ResourceManagerTest.cs
+++ b/mcs/class/corlib/Test/System.Resources/ResourceManagerTest.cs
@ -785,6 +785,7 @@ namespace MonoTests.System.Resources
 		}

 		[Test]
+		[Category ("SatelliteAssembliesNotWorking")]
 		public void TestSatellites ()
 		{
 			ResourceManager manager = new ResourceManager("Resources", GetType ().Assembly);