Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -1 +1 @@
7279f715f7b56052c864f30e9d57bc1123818ad0
7479bc775b28da65130781710df3ce18d64e9e33

View File

@@ -1,4 +1,3 @@
#if NET_4_0
//
// CollectionStressTestHelper.cs
//
@@ -126,4 +125,3 @@ namespace MonoTests.System.Collections.Concurrent
}
}
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
// ConcurrentDictionaryTests.cs
//
// Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -368,4 +367,3 @@ namespace MonoTests.System.Collections.Concurrent
}
}
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
// ConcurrentQueueTest.cs
//
// Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -270,4 +269,3 @@ namespace MonoTests.System.Collections.Concurrent
}
}
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
// ConcurrentStackTests.cs
//
// Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -303,4 +302,3 @@ namespace MonoTests.System.Collections.Concurrent
}
}
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
// ParallelConcurrentQueueTests.cs
//
// Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -56,4 +55,3 @@ namespace MonoTests.System.Collections.Concurrent
}
}
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
// ParallelConcurrentStackTests.cs
//
// Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -59,4 +58,3 @@ namespace MonoTests.System.Collections.Concurrent
}
}
}
#endif

View File

@@ -24,7 +24,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#if NET_4_0
using System;
using System.Collections.Generic;
@@ -93,4 +92,3 @@ namespace MonoTests.System.Collections.Concurrent
}
}
}
#endif

View File

@@ -95,25 +95,6 @@ namespace MonoTests.System.Collections.Generic
}
#if !NET_4_0 // FIXME: the blob contains the 2.0 mscorlib version
[Test] // bug #80929
public void SerializeDefault ()
{
Comparer<int> c = Comparer<int>.Default;
BinaryFormatter bf = new BinaryFormatter ();
MemoryStream ms = new MemoryStream ();
bf.Serialize (ms, c);
byte [] buffer = new byte [ms.Length];
ms.Position = 0;
ms.Read (buffer, 0, buffer.Length);
Assert.AreEqual (_serializedDefault, buffer);
}
#endif
[Test]
public void DeserializeDefault ()

View File

@@ -342,28 +342,6 @@ namespace MonoTests.System.Collections.Generic {
Assert.AreEqual (- (l.Count + 1), l.BinarySearch (int.MaxValue));
}
#if !NET_4_0 // FIXME: the blob contains the 2.0 mscorlib version
[Test]
public void SerializeTest ()
{
List <int> list = new List <int> ();
list.Add (5);
list.Add (0);
list.Add (7);
BinaryFormatter bf = new BinaryFormatter ();
MemoryStream ms = new MemoryStream ();
bf.Serialize (ms, list);
byte [] buffer = new byte [ms.Length];
ms.Position = 0;
ms.Read (buffer, 0, buffer.Length);
Assert.AreEqual (_serializedList, buffer);
}
#endif
[Test]
public void DeserializeTest ()

View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_0
using System.Collections;
using NUnit.Framework;
@@ -52,4 +51,3 @@ namespace MonoTests.System.Collections
}
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
#define CONTRACTS_FULL
#define DEBUG
@@ -174,4 +173,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
}
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
#define CONTRACTS_FULL
#define DEBUG
@@ -45,4 +44,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
#define CONTRACTS_FULL
#define DEBUG
@@ -126,4 +125,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
#define CONTRACTS_FULL
#define DEBUG
@@ -255,4 +254,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
#define CONTRACTS_FULL
#define DEBUG
@@ -73,4 +72,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
#define CONTRACTS_FULL
#define DEBUG
@@ -123,4 +122,3 @@ namespace MonoTests.System.Diagnostics.Contracts {
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
using System;
using System.Collections.Generic;
@@ -15,4 +14,3 @@ namespace MonoTests.System.Diagnostics.Contracts.Helpers {
}
#endif

View File

@@ -1,4 +1,3 @@
#if NET_4_0
using System;
using System.Collections.Generic;
@@ -41,4 +40,3 @@ namespace MonoTests.System.Diagnostics.Contracts.Helpers {
}
}
#endif

View File

@@ -74,7 +74,6 @@ namespace MonoCasTests.System.Diagnostics {
Check (sf, true);
}
#if !RUN_ONDOTNET || NET_4_0 // Disabled because .net 2 fails to load dll with "Failure decoding embedded permission set object" due to "/" path
[Test]
[FileIOPermission (SecurityAction.Deny, PathDiscovery = "/")]
[ExpectedException (typeof (SecurityException))]
@@ -186,7 +185,6 @@ namespace MonoCasTests.System.Diagnostics {
StackFrame sf = new StackFrame ("mono.cs", 1, 1);
Check (sf, true);
}
#endif
[Test]
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]

Some files were not shown because too many files have changed in this diff Show More