Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@@ -1111,6 +1111,7 @@ public class AssemblyNameTest {
[Test]
[Category ("AndroidNotWorking")] // Accessing assemblies by asm.Location is not supported
[Category ("StaticLinkedAotNotWorking")] // Can't find .dll files when bundled in .exe
public void GetAssemblyName_CodeBase ()
{
Assembly execAssembly = Assembly.GetExecutingAssembly ();

View File

@@ -264,14 +264,9 @@ namespace MonoTests.System.Reflection
public void Corlib_test ()
{
Assembly corlib_test = Assembly.GetExecutingAssembly ();
#if MONODROID || FULL_AOT_DESKTOP || __WATCHOS__
Assert.IsNull (corlib_test.EntryPoint, "EntryPoint");
Assert.IsNull (corlib_test.Evidence, "Evidence");
#elif MOBILE
Assert.IsNotNull (corlib_test.EntryPoint, "EntryPoint");
#if MOBILE
Assert.IsNull (corlib_test.Evidence, "Evidence");
#else
Assert.IsNull (corlib_test.EntryPoint, "EntryPoint");
Assert.IsNotNull (corlib_test.Evidence, "Evidence");
#endif
Assert.IsFalse (corlib_test.GlobalAssemblyCache, "GlobalAssemblyCache");
@@ -322,6 +317,7 @@ namespace MonoTests.System.Reflection
[Test]
[Category ("AndroidNotWorking")] // Assemblies in Xamarin.Android cannot be accessed as FileStream
[Category ("StaticLinkedAotNotWorking")] // Can't find .dll files when bundled in .exe
public void GetFiles_False ()
{
Assembly corlib = typeof (int).Assembly;
@@ -335,6 +331,7 @@ namespace MonoTests.System.Reflection
[Test]
[Category ("AndroidNotWorking")] // Assemblies in Xamarin.Android cannot be accessed as FileStream
[Category ("StaticLinkedAotNotWorking")] // Can't find .dll files when bundled in .exe
public void GetFiles_True ()
{
Assembly corlib = typeof (int).Assembly;

View File

@@ -431,8 +431,10 @@ namespace MonoTests.System.Reflection
Assert.IsFalse (lvi.IsPinned, "#3-1");
if (/* mcs */ lvi.LocalType == typeof (byte*) || /* csc */ lvi.LocalType == typeof (byte).MakeByRefType ()) {
foundPinnedBytePointer = true;
Assert.IsTrue (lvi.IsPinned, "#3-2");
// We have three locals. There's b the byte[], there's a byte* and there's a byte&.
// mcs emits a byte* for the latter type.
// We need to find one such pinned byte pointer. Therefore we're folding with logical or
foundPinnedBytePointer = foundPinnedBytePointer || lvi.IsPinned;
}
}
}