Author: spouliot
Date: 2005-04-25 12:24:47 -0400 (Mon, 25 Apr 2005)
New Revision: 43549

Modified:
   trunk/mcs/class/corlib/System/ActivationContext.cs
   trunk/mcs/class/corlib/System/AppDomainManager.cs
   trunk/mcs/class/corlib/System/ApplicationId.cs
   trunk/mcs/class/corlib/System/ApplicationIdentity.cs
   trunk/mcs/class/corlib/System/ChangeLog
   trunk/mcs/class/corlib/System/Exception.cs
Log:
2005-04-25  Sebastien Pouliot  <[EMAIL PROTECTED]>

        * ActivationContext.cs: Updated for beta2.
        * AppDomainManager.cs: Updated for beta2.
        * ApplicationId.cs: Updated for beta2.
        * ApplicationIdentity.cs: Updated for beta2.
        * Exception.cs: Now use Assembly.UnprotectedGetName () as Exception 
        doesn't leak the code base from the returned AssemblyName.



Modified: trunk/mcs/class/corlib/System/ActivationContext.cs
===================================================================
--- trunk/mcs/class/corlib/System/ActivationContext.cs  2005-04-25 15:29:19 UTC 
(rev 43548)
+++ trunk/mcs/class/corlib/System/ActivationContext.cs  2005-04-25 16:24:47 UTC 
(rev 43549)
@@ -4,7 +4,7 @@
 // Author:
 //     Sebastien Pouliot  <[EMAIL PROTECTED]>
 //
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -28,13 +28,17 @@
 
 #if NET_2_0
 
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+
 namespace System {
 
-       public sealed class ActivationContext : IDisposable {
+       [Serializable]
+       [ComVisible (false)]
+       public sealed class ActivationContext : IDisposable, ISerializable {
 
-               [Serializable]
                public enum ContextForm {
-                       Loose = 1,
+                       Loose,
                        StoreBounded
                }
 
@@ -103,6 +107,13 @@
                                _disposed = true;
                        }
                }
+
+               [MonoTODO]
+               void ISerializable.GetObjectData (SerializationInfo info, 
StreamingContext context)
+               {
+                       if (info == null)
+                               throw new ArgumentNullException ("info");
+               }
        }
 }
 

Modified: trunk/mcs/class/corlib/System/AppDomainManager.cs
===================================================================
--- trunk/mcs/class/corlib/System/AppDomainManager.cs   2005-04-25 15:29:19 UTC 
(rev 43548)
+++ trunk/mcs/class/corlib/System/AppDomainManager.cs   2005-04-25 16:24:47 UTC 
(rev 43549)
@@ -83,7 +83,7 @@
                        AppDomain ad = CreateDomainHelper (friendlyName, 
securityInfo, appDomainInfo);
 
                        // supply app domain policy ?
-                       if ((HostSecurityManager.Flags & 
HostSecurityManagerFlags.HostPolicyLevel) == 
HostSecurityManagerFlags.HostPolicyLevel) {
+                       if ((HostSecurityManager.Flags & 
HostSecurityManagerOptions.HostPolicyLevel) == 
HostSecurityManagerOptions.HostPolicyLevel) {
                                PolicyLevel pl = 
HostSecurityManager.DomainPolicy;
                                if (pl != null) {
                                        ad.SetAppDomainPolicy (pl);

Modified: trunk/mcs/class/corlib/System/ApplicationId.cs
===================================================================
--- trunk/mcs/class/corlib/System/ApplicationId.cs      2005-04-25 15:29:19 UTC 
(rev 43548)
+++ trunk/mcs/class/corlib/System/ApplicationId.cs      2005-04-25 16:24:47 UTC 
(rev 43549)
@@ -4,7 +4,7 @@
 // Author:
 //     Sebastien Pouliot  <[EMAIL PROTECTED]>
 //
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -28,11 +28,13 @@
 
 #if NET_2_0
 
+using System.Runtime.InteropServices;
 using System.Text;
 
 namespace System {
 
        [Serializable]
+       [ComVisible (true)]
        public sealed class ApplicationId {
 
                private byte[] _token;

Modified: trunk/mcs/class/corlib/System/ApplicationIdentity.cs
===================================================================
--- trunk/mcs/class/corlib/System/ApplicationIdentity.cs        2005-04-25 
15:29:19 UTC (rev 43548)
+++ trunk/mcs/class/corlib/System/ApplicationIdentity.cs        2005-04-25 
16:24:47 UTC (rev 43549)
@@ -28,9 +28,14 @@
 
 #if NET_2_0
 
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+
 namespace System {
 
-       public sealed class ApplicationIdentity {
+       [Serializable]
+       [ComVisible (false)]
+       public sealed class ApplicationIdentity: ISerializable {
 
                private string _fullName;
                private string _codeBase;
@@ -46,7 +51,7 @@
                                _fullName = applicationIdentityFullName;
                }
 
-               [MonoTODO ("URL but where does it comes from? manifest ?")]
+               [MonoTODO ("URL for deployment manifest")]
                public string CodeBase {
                        get { return _codeBase; }
                }
@@ -59,6 +64,13 @@
                {
                        return _fullName;
                }
+
+               [MonoTODO]
+               void ISerializable.GetObjectData (SerializationInfo info, 
StreamingContext context)
+               {
+                       if (info == null)
+                               throw new ArgumentNullException ("info");
+               }
        }
 }
 

Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog     2005-04-25 15:29:19 UTC (rev 
43548)
+++ trunk/mcs/class/corlib/System/ChangeLog     2005-04-25 16:24:47 UTC (rev 
43549)
@@ -1,3 +1,12 @@
+2005-04-25  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * ActivationContext.cs: Updated for beta2.
+       * AppDomainManager.cs: Updated for beta2.
+       * ApplicationId.cs: Updated for beta2.
+       * ApplicationIdentity.cs: Updated for beta2.
+       * Exception.cs: Now use Assembly.UnprotectedGetName () as Exception 
+       doesn't leak the code base from the returned AssemblyName.
+
 2005-04-25  Martin Baulig  <[EMAIL PROTECTED]>
 
        * Environment.cs (Environment.Version): Changed to 2.0.50215.

Modified: trunk/mcs/class/corlib/System/Exception.cs
===================================================================
--- trunk/mcs/class/corlib/System/Exception.cs  2005-04-25 15:29:19 UTC (rev 
43548)
+++ trunk/mcs/class/corlib/System/Exception.cs  2005-04-25 16:24:47 UTC (rev 
43549)
@@ -133,7 +133,7 @@
                                                if (st != null) {
                                                        MethodBase method = 
sf.GetMethod ();
                                                        if (method != null) {
-                                                               source = 
method.DeclaringType.Assembly.GetName ().Name;
+                                                               source = 
method.DeclaringType.Assembly.UnprotectedGetName ().Name;
                                                        }
                                                }
                                        }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to