mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.4.0.137

Browse Source 
Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
View File

@@ -527,8 +527,7 @@ namespace MonoTests.System.Reflection
AssemblyBuilder ab = AppDomain.CurrentDomain
.DefineDynamicAssembly (assemblyName,
AssemblyBuilderAccess.Save,
TempFolder,
AppDomain.CurrentDomain.Evidence);
TempFolder);
ab.Save (Path.GetFileName (assemblyFileName));
using (FileStream fs = File.OpenRead (assemblyFileName)) {
@@ -623,8 +622,7 @@ namespace MonoTests.System.Reflection
AssemblyBuilder ab = AppDomain.CurrentDomain
.DefineDynamicAssembly (assemblyName,
AssemblyBuilderAccess.Save,
Path.GetDirectoryName (assemblyFileName),
AppDomain.CurrentDomain.Evidence);
Path.GetDirectoryName (assemblyFileName));
ab.Save (Path.GetFileName (assemblyFileName));
using (FileStream fs = File.OpenRead (assemblyFileName)) {
@@ -664,8 +662,7 @@ namespace MonoTests.System.Reflection
AssemblyBuilder ab = AppDomain.CurrentDomain
.DefineDynamicAssembly (assemblyName,
AssemblyBuilderAccess.Save,
TempFolder,
AppDomain.CurrentDomain.Evidence);
TempFolder);
ab.AddResourceFile ("read", "readme.txt");
ab.Save (Path.GetFileName (assemblyFileNameA));
@@ -930,8 +927,7 @@ namespace MonoTests.System.Reflection
setup.ApplicationBase = baseDirectory;
setup.ApplicationName = "testdomain";
AppDomain ad = AppDomain.CreateDomain ("testdomain",
AppDomain.CurrentDomain.Evidence, setup);
AppDomain ad = AppDomain.CreateDomain ("testdomain", null, setup);
if (assemblyResolver) {
Assembly ea = Assembly.GetExecutingAssembly ();
@@ -1025,8 +1021,7 @@ namespace MonoTests.System.Reflection
AssemblyBuilder ab = AppDomain.CurrentDomain
.DefineDynamicAssembly (assemblyName,
AssemblyBuilderAccess.Save,
Path.GetDirectoryName (assemblyFileName),
AppDomain.CurrentDomain.Evidence);
Path.GetDirectoryName (assemblyFileName));
ab.Save (Path.GetFileName (assemblyFileName));
Assembly assembly;
@@ -1040,7 +1035,7 @@ namespace MonoTests.System.Reflection
Assert.AreEqual (string.Empty, assembly.Location, "#1");
assembly = Assembly.LoadFrom (assemblyFileName, AppDomain.CurrentDomain.Evidence);
assembly = Assembly.LoadFrom (assemblyFileName);
Assert.IsFalse (assembly.Location == string.Empty, "#2");
Assert.AreEqual (Path.GetFileName (assemblyFileName), Path.GetFileName(assembly.Location), "#3");
// note: we cannot check if directory names match, as MS.NET seems to
@@ -1050,7 +1045,7 @@ namespace MonoTests.System.Reflection
public void bug78465 (string assemblyFileName)
{
Assembly assembly = Assembly.LoadFrom (assemblyFileName, AppDomain.CurrentDomain.Evidence);
Assembly assembly = Assembly.LoadFrom (assemblyFileName);
Assert.IsFalse (assembly.Location == string.Empty, "#2");
Assert.AreEqual (Path.GetFileName (assemblyFileName), Path.GetFileName (assembly.Location), "#3");
// note: we cannot check if directory names match, as MS.NET seems to
@@ -1066,12 +1061,11 @@ namespace MonoTests.System.Reflection
AssemblyBuilder ab = AppDomain.CurrentDomain
.DefineDynamicAssembly (assemblyName,
AssemblyBuilderAccess.Save,
Path.GetDirectoryName (assemblyFileName),
AppDomain.CurrentDomain.Evidence);
Path.GetDirectoryName (assemblyFileName));
ab.AddResourceFile ("read", "readme.txt");
ab.Save (Path.GetFileName (assemblyFileName));
Assembly assembly = Assembly.LoadFrom (assemblyFileName, AppDomain.CurrentDomain.Evidence);
Assembly assembly = Assembly.LoadFrom (assemblyFileName);
Assert.IsTrue (assembly.Location != string.Empty, "#B1");
string[] resNames = assembly.GetManifestResourceNames ();
Assert.IsNotNull (resNames, "#B2");

4
mcs/class/corlib/Test/System.Reflection/FieldInfoTest.cs
View File

@@ -1371,7 +1371,9 @@ namespace MonoTests.System.Reflection
Assert.AreEqual ("B", fields.str);
}
#if !DISABLE_REMOTING
[Test]
[Category ("Remoting")]
public void GetValueContextBoundObject ()
{
var instance = new CBOTest ();
@@ -1394,6 +1396,7 @@ namespace MonoTests.System.Reflection
}
[Test]
[Category ("Remoting")]
public void SetValueContextBoundObject ()
{
var instance = new CBOTest ();
@@ -1419,6 +1422,7 @@ namespace MonoTests.System.Reflection
Assert.AreEqual (s2, "This is a string", "s2");
}
#endif
class CBOTest : ContextBoundObject {
public double d1 = 14.0;