2010-03-26 Rodrigo Kumpera <rkumpera@novell.com>

	* AssemblyBuilder.cs: Implement v4 GetReferencedAssemblies
	and GetLoadedModules.

2010-03-26 Rodrigo Kumpera  <rkumpera@novell.com>

	* AssemblyBuilderTest.cs: Test GetReferencedAssemblies
	and GetLoadedModules.

svn path=/trunk/mcs/; revision=154311

diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
index 2d5b6ea4817ec68903ebc9b0fbdf8a0812195386..7a69bc9910c7aeb8863e1ea03d89a7a3fb9e3259 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
@@ -1246,6 +1246,18 @@ namespace System.Reflection.Emit
                        }
                        return modules;
                }
+
+               [MonoTODO ("This always returns an empty array")]
+               public override AssemblyName[] GetReferencedAssemblies () {
+                       return GetReferencedAssemblies (this);
+               }
+
+               public override Module[] GetLoadedModules (bool getResourceModules)
+               {
+                       return GetModules (getResourceModules);
+               }
+
+
 #endif
        }
 }

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index 3e9bd24475ad3f7eba5c154191f694dff811cc14..56c976d1737187a4091975140907d9fec6cb43b0 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,6 +1,11 @@
+2010-03-26 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * AssemblyBuilder.cs: Implement v4 GetReferencedAssemblies
+       and GetLoadedModules.
+
 2010-03-25 Rodrigo Kumpera  <rkumpera@novell.com>
 
-       * AssemblyBuilder.cs: Implement v4 GetModule(s).
+       * AssemblyBuilder.cs: Implement v4 GetModules().
 
 2010-03-25 Rodrigo Kumpera  <rkumpera@novell.com>
 

diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
index 08943319ac7710bd27caca772f77c3c73f00753d..2f8ea09ee9415890d523188eccce8b91243b04af 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
@@ -1745,6 +1745,22 @@ public class AssemblyBuilderTest
                Assert.AreSame (modB, ab.GetModules () [1], "#3");
        }
 
+       [Test]
+       [Category ("NotDotNet")] // MS returns the real deal
+       public void GetReferencedAssemblies_Trivial ()
+       {
+               Assert.IsNotNull (ab.GetReferencedAssemblies (), "#1");
+       }
+       
+       [Test]
+       public void GetLoadedModules ()
+       {
+               var res = ab.GetLoadedModules (true);
+               Assert.IsNotNull (res, "#1");
+               Assert.AreEqual (1, res.Length, "#2");
+               Assert.AreEqual (mb, res [0], "#3");
+       }
+
        [ExpectedException (typeof (TypeLoadException))]
        public void GetCustomAttributes_NotCreated ()
        {

diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/Test/System.Reflection.Emit/ChangeLog
index a6e1ecd323f90c59cf0d30bdf56ddb670c316e31..a95db33e1417a6a60429967c13d0a033fccda93c 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-26 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * AssemblyBuilderTest.cs: Test GetReferencedAssemblies
+       and GetLoadedModules.
+
 2010-03-25 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * AssemblyBuilderTest.cs: Add test for v4 GetModule(s).