2005-12-02 Alp Toker <alp@atoker.com>

  * AppDomain.cs: ReflectionOnlyPreBindAssemblyResolve renamed to
  ReflectionOnlyAssemblyResolve in 2.0 final

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

diff --git a/mcs/class/corlib/System/AppDomain.cs b/mcs/class/corlib/System/AppDomain.cs
index 9a72a7f32570fd16132dac659671d90f0e3ca1ed..77479c76ffeff11cbb4562d1bddf9c7b31ee7dc6 100644 (file)
--- a/mcs/class/corlib/System/AppDomain.cs
+++ b/mcs/class/corlib/System/AppDomain.cs
@@ -822,7 +822,7 @@ namespace System {
                private Assembly DoAssemblyResolve (string name, bool refonly)
                {
 #if NET_2_0
-                       if (refonly && ReflectionOnlyPreBindAssemblyResolve == null)
+                       if (refonly && ReflectionOnlyAssemblyResolve == null)
                                return null;
 #endif
                        if (AssemblyResolve == null)
@@ -847,7 +847,7 @@ namespace System {
                        try {
                                
 #if NET_2_0
-                               Delegate [] invocation_list = refonly ? ReflectionOnlyPreBindAssemblyResolve.GetInvocationList () : 
+                               Delegate [] invocation_list = refonly ? ReflectionOnlyAssemblyResolve.GetInvocationList () : 
                                        AssemblyResolve.GetInvocationList ();
 #else
                                Delegate [] invocation_list = AssemblyResolve.GetInvocationList ();
@@ -987,7 +987,7 @@ namespace System {
 
 #if NET_2_0
 
-               public event ResolveEventHandler ReflectionOnlyPreBindAssemblyResolve;
+               public event ResolveEventHandler ReflectionOnlyAssemblyResolve;
                
                private ActivationContext _activation;
                private ApplicationIdentity _applicationIdentity;

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 00708a5f31a2f9e473d28598fcb74df66841ea17..d95a096c8f5f77238a9cc09dea26c50d508d293b 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-02  Alp Toker  <alp@atoker.com>
+
+       * AppDomain.cs: ReflectionOnlyPreBindAssemblyResolve renamed to
+       ReflectionOnlyAssemblyResolve in 2.0 final
+
 2005-12-01  Alp Toker  <alp@atoker.com>
 
        * String.cs: Add static and non-static Equals(... StringComparison) for