Author: dick
Date: 2007-05-03 12:21:18 -0400 (Thu, 03 May 2007)
New Revision: 76625
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/ChangeLog
trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/ProxyAttribute.cs
trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
trunk/mcs/class/corlib/System.Runtime.Remoting.Services/ChangeLog
trunk/mcs/class/corlib/System.Runtime.Remoting.Services/EnterpriseServicesHelper.cs
trunk/mcs/class/corlib/System.Runtime.Remoting.Services/ITrackingHandler.cs
trunk/mcs/class/corlib/System.Runtime.Remoting.Services/TrackingServices.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ChangeLog
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterTypeStyle.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/IFieldInfo.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ISoapMessage.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalRM.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalST.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapFault.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapMessage.cs
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/TypeFilterLevel.cs
trunk/mcs/class/corlib/System.Text/ChangeLog
trunk/mcs/class/corlib/System.Text/Encoding.cs
trunk/mcs/class/corlib/System.Text/UTF7Encoding.cs
trunk/mcs/class/corlib/System.Text/UnicodeEncoding.cs
Log:
2007-05-03 Dick Porter <[EMAIL PROTECTED]>
* ProxyAttribute.cs:
* RealProxy.cs: Update to 2.0 profile
2007-05-03 Dick Porter <[EMAIL PROTECTED]>
* ITrackingHandler.cs:
* EnterpriseServicesHelper.cs:
* TrackingServices.cs: Update to 2.0 profile
2007-05-03 Dick Porter <[EMAIL PROTECTED]>
* IFieldInfo.cs:
* ISoapMessage.cs:
* InternalRM.cs:
* InternalST.cs:
* ServerFault.cs:
* SoapFault.cs:
* SoapMessage.cs:
* FormatterAssemblyStyle.cs:
* FormatterTypeStyle.cs:
* TypeFilterLevel.cs: Update to 2.0 profile
2007-05-03 Dick Porter <[EMAIL PROTECTED]>
* BinaryFormatter.cs: Update to 2.0 profile
2007-05-03 Dick Porter <[EMAIL PROTECTED]>
* Encoding.cs:
* UnicodeEncoding.cs:
* UTF7Encoding.cs: Update to 2.0 profile
Modified: trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/ChangeLog
2007-05-03 14:44:30 UTC (rev 76624)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/ChangeLog
2007-05-03 16:21:18 UTC (rev 76625)
@@ -1,3 +1,8 @@
+2007-05-03 Dick Porter <[EMAIL PROTECTED]>
+
+ * ProxyAttribute.cs:
+ * RealProxy.cs: Update to 2.0 profile
+
2006-07-15 Jonathan Chambers <[EMAIL PROTECTED]>
* RealProxy.cs: Indicate that all fields need keep in sync
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/ProxyAttribute.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/ProxyAttribute.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/ProxyAttribute.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -35,9 +35,16 @@
using System.Runtime.Remoting.Contexts;
using System.Runtime.Remoting.Channels;
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
+
namespace System.Runtime.Remoting.Proxies {
[AttributeUsage (AttributeTargets.Class)]
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public class ProxyAttribute : Attribute, IContextAttribute
{
public ProxyAttribute ()
@@ -55,11 +62,17 @@
return RemotingServices.GetRealProxy
(RemotingServices.GetProxyForRemoteObject (objref, serverType));
}
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public void GetPropertiesForNewContext
(IConstructionCallMessage msg)
{
// Nothing to add
}
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public bool IsContextOK (Context ctx, IConstructionCallMessage
msg)
{
return true;
Modified: trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -41,6 +41,9 @@
using System.Runtime.CompilerServices;
using System.Runtime.Serialization;
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
namespace System.Runtime.Remoting.Proxies
{
@@ -50,6 +53,9 @@
bool _custom_type_info;
}
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public abstract class RealProxy {
// other classes visible to the runtime
// derive from this class so keep these locals
@@ -244,6 +250,9 @@
}
[MonoTODO]
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public IConstructionReturnMessage
InitializeServerObject(IConstructionCallMessage ctorMsg)
{
throw new NotImplementedException();
Modified: trunk/mcs/class/corlib/System.Runtime.Remoting.Services/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Services/ChangeLog
2007-05-03 14:44:30 UTC (rev 76624)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Services/ChangeLog
2007-05-03 16:21:18 UTC (rev 76625)
@@ -1,3 +1,9 @@
+2007-05-03 Dick Porter <[EMAIL PROTECTED]>
+
+ * ITrackingHandler.cs:
+ * EnterpriseServicesHelper.cs:
+ * TrackingServices.cs: Update to 2.0 profile
+
2005-08-18 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* TrackingServices.cs: Properly generate an array from the
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Services/EnterpriseServicesHelper.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Remoting.Services/EnterpriseServicesHelper.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Remoting.Services/EnterpriseServicesHelper.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -34,14 +34,24 @@
using System.Runtime.Remoting.Activation;
using System.Runtime.Remoting.Proxies;
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
+
namespace System.Runtime.Remoting.Services
{
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public sealed class EnterpriseServicesHelper
{
public EnterpriseServicesHelper ()
{
}
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public static IConstructionReturnMessage
CreateConstructionReturnMessage (IConstructionCallMessage ctorMsg,
MarshalByRefObject retObj)
{
return new ConstructionResponse (retObj, null, ctorMsg);
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Services/ITrackingHandler.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Services/ITrackingHandler.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Services/ITrackingHandler.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -31,7 +31,14 @@
using System.Runtime.Remoting;
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
+
namespace System.Runtime.Remoting.Services {
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public interface ITrackingHandler
{
void DisconnectedObject (object obj);
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting.Services/TrackingServices.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting.Services/TrackingServices.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting.Services/TrackingServices.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -35,7 +35,14 @@
using System.Collections;
using System.Runtime.Remoting;
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
+
namespace System.Runtime.Remoting.Services {
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public class TrackingServices {
static ArrayList _handlers = new ArrayList();
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ChangeLog
2007-05-03 14:44:30 UTC (rev 76624)
+++ trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ChangeLog
2007-05-03 16:21:18 UTC (rev 76625)
@@ -1,3 +1,16 @@
+2007-05-03 Dick Porter <[EMAIL PROTECTED]>
+
+ * IFieldInfo.cs:
+ * ISoapMessage.cs:
+ * InternalRM.cs:
+ * InternalST.cs:
+ * ServerFault.cs:
+ * SoapFault.cs:
+ * SoapMessage.cs:
+ * FormatterAssemblyStyle.cs:
+ * FormatterTypeStyle.cs:
+ * TypeFilterLevel.cs: Update to 2.0 profile
+
2004-06-15 Gert Driesen <[EMAIL PROTECTED]>
* SoapMessage.cs: fixed serialization compatibility with MS.NET
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -32,12 +32,19 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
namespace System.Runtime.Serialization.Formatters {
/// <summary>
/// </summary>
+#if NET_2_0
+ [ComVisible (true)]
+ [Serializable]
+#endif
public enum FormatterAssemblyStyle {
/// <summary>
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterTypeStyle.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterTypeStyle.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterTypeStyle.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -32,12 +32,19 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
namespace System.Runtime.Serialization.Formatters {
/// <summary>
/// </summary>
+#if NET_2_0
+ [ComVisible (true)]
+ [Serializable]
+#endif
public enum FormatterTypeStyle {
/// <summary>
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/IFieldInfo.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/IFieldInfo.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/IFieldInfo.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -6,34 +6,41 @@
//
// (C) David Dawkins
//
-
-//
-// Copyright (C) 2004 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
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+//
+// Copyright (C) 2004 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
+
namespace System.Runtime.Serialization.Formatters {
/// <summary>
/// Interface for querying field information on serialized
objects.</summary>
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public interface IFieldInfo {
/// <summary>
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ISoapMessage.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ISoapMessage.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ISoapMessage.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -6,36 +6,43 @@
//
// (C) David Dawkins
//
-
-//
-// Copyright (C) 2004 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
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+//
+// Copyright (C) 2004 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
using System.Runtime.Remoting.Messaging;
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
+
namespace System.Runtime.Serialization.Formatters {
/// <summary>
/// Interface for making SOAP method calls</summary>
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public interface ISoapMessage {
/// <summary>
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalRM.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalRM.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalRM.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -30,13 +30,39 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0
+using System.Runtime.InteropServices;
+using System.Diagnostics;
+#endif
+
namespace System.Runtime.Serialization.Formatters
{
//LAMESPEC: Use of this class??
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public sealed class InternalRM
{
- private InternalRM ()
+#if NET_2_0
+ public
+#else
+ private
+#endif
+ InternalRM ()
{
}
+
+#if NET_2_0
+ [Conditional ("_LOGGING")]
+ public static void InfoSoap (params object[] messages)
+ {
+ throw new NotImplementedException ();
+ }
+
+ public static bool SoapCheckEnabled ()
+ {
+ throw new NotImplementedException ();
+ }
+#endif
}
}
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalST.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalST.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalST.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -30,13 +30,59 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0
+using System.Runtime.InteropServices;
+using System.Diagnostics;
+using System.Reflection;
+#endif
+
namespace System.Runtime.Serialization.Formatters
{
//LAMESPEC: Use of this class??
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public sealed class InternalST
{
private InternalST ()
{
}
+
+#if NET_2_0
+ [Conditional ("_LOGGING")]
+ public static void InfoSoap (params object[] messages)
+ {
+ throw new NotImplementedException ();
+ }
+
+ public static Assembly LoadAssemblyFromString (string
assemblyString)
+ {
+ throw new NotImplementedException ();
+ }
+
+ public static void SerializationSetValue (FieldInfo fi,
+ object target,
+ object value)
+ {
+ throw new NotImplementedException ();
+ }
+
+ [Conditional ("SER_LOGGING")]
+ public static void Soap (params object[] messages)
+ {
+ throw new NotImplementedException ();
+ }
+
+ [Conditional ("_DEBUG")]
+ public static void SoapAssert (bool condition, string message)
+ {
+ throw new NotImplementedException ();
+ }
+
+ public static bool SoapCheckEnabled ()
+ {
+ throw new NotImplementedException ();
+ }
+#endif
}
}
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -6,38 +6,45 @@
//
// 2002 (C) Copyright, Ximian, Inc.
//
-
-//
-// Copyright (C) 2004 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
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
+//
+// Copyright (C) 2004 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
using System.Runtime.Remoting.Metadata;
using System.Runtime.Serialization;
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
+
namespace System.Runtime.Serialization.Formatters {
- [Serializable]
+ [Serializable]
[SoapType()]
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public sealed class ServerFault
{
string exceptionType;
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapFault.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapFault.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++ trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapFault.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -6,38 +6,45 @@
//
// 2002 (C) Copyright, Ximian, Inc.
//
-
-//
-// Copyright (C) 2004 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
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
+//
+// Copyright (C) 2004 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
using System.Runtime.Remoting.Metadata;
using System.Runtime.Serialization;
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
+
namespace System.Runtime.Serialization.Formatters {
- [Serializable]
+ [Serializable]
[SoapType()]
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public sealed class SoapFault : ISerializable
{
string code;
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapMessage.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapMessage.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapMessage.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -6,37 +6,44 @@
//
// 2002 (C) Copyright, Ximian, Inc.
//
-
-//
-// Copyright (C) 2004 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
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+//
+// Copyright (C) 2004 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
using System;
using System.Runtime.Remoting.Messaging;
using System.Runtime.Serialization.Formatters;
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
+
namespace System.Runtime.Serialization.Formatters {
[Serializable]
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public class SoapMessage : ISoapMessage
{
private Header[] headers;
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/TypeFilterLevel.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/TypeFilterLevel.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters/TypeFilterLevel.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -32,8 +32,15 @@
#if NET_1_1
+#if NET_2_0
+using System.Runtime.InteropServices;
+#endif
+
namespace System.Runtime.Serialization.Formatters
{
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public enum TypeFilterLevel
{
Low = 2,
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.cs
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.cs
2007-05-03 16:21:18 UTC (rev 76625)
@@ -36,6 +36,9 @@
namespace System.Runtime.Serialization.Formatters.Binary {
+#if NET_2_0
+ [ComVisible (true)]
+#endif
public sealed class BinaryFormatter : IRemotingFormatter, IFormatter
{
#if NET_2_0
@@ -115,7 +118,9 @@
}
#if NET_1_1
+#if !NET_2_0
[System.Runtime.InteropServices.ComVisible (false)]
+#endif
public TypeFilterLevel FilterLevel
{
get { return filter_level; }
Modified:
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
2007-05-03 14:44:30 UTC (rev 76624)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
2007-05-03 16:21:18 UTC (rev 76625)
@@ -1,3 +1,7 @@
+2007-05-03 Dick Porter <[EMAIL PROTECTED]>
+
+ * BinaryFormatter.cs: Update to 2.0 profile
+
2006-12-25 Robert Jordan <[EMAIL PROTECTED]>
* binary_serialization_format.htm: Update the NET_2_0 format.
Modified: trunk/mcs/class/corlib/System.Text/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Text/ChangeLog 2007-05-03 14:44:30 UTC
(rev 76624)
+++ trunk/mcs/class/corlib/System.Text/ChangeLog 2007-05-03 16:21:18 UTC
(rev 76625)
@@ -1,3 +1,9 @@
+2007-05-03 Dick Porter <[EMAIL PROTECTED]>
+
+ * Encoding.cs:
+ * UnicodeEncoding.cs:
+ * UTF7Encoding.cs: Update to 2.0 profile
+
2007-02-01 Gert Driesen <[EMAIL PROTECTED]>
* Encoding.cs: Enabled ArgumentException in GetEncoding (string) again.
Modified: trunk/mcs/class/corlib/System.Text/Encoding.cs
===================================================================
--- trunk/mcs/class/corlib/System.Text/Encoding.cs 2007-05-03 14:44:30 UTC
(rev 76624)
+++ trunk/mcs/class/corlib/System.Text/Encoding.cs 2007-05-03 16:21:18 UTC
(rev 76625)
@@ -602,11 +602,13 @@
return encoding_infos;
}
+ [ComVisible (false)]
public bool IsAlwaysNormalized ()
{
return IsAlwaysNormalized (NormalizationForm.FormC);
}
+ [ComVisible (false)]
public virtual bool IsAlwaysNormalized (NormalizationForm form)
{
// umm, ASCIIEncoding should have overriden this method, no?
Modified: trunk/mcs/class/corlib/System.Text/UTF7Encoding.cs
===================================================================
--- trunk/mcs/class/corlib/System.Text/UTF7Encoding.cs 2007-05-03 14:44:30 UTC
(rev 76624)
+++ trunk/mcs/class/corlib/System.Text/UTF7Encoding.cs 2007-05-03 16:21:18 UTC
(rev 76625)
@@ -110,13 +110,14 @@
}
#if NET_2_0
+ [ComVisible (false)]
public override int GetHashCode ()
{
int basis = base.GetHashCode ();
return allowOptionals ? -basis : basis;
}
- [ComVisible(true)]
+ [ComVisible(false)]
public override bool Equals (object other)
{
UTF7Encoding e = other as UTF7Encoding;
@@ -677,46 +678,46 @@
// a bunch of practically missing implementations (but should just work)
[CLSCompliantAttribute (false)]
- [ComVisible(true)]
+ [ComVisible(false)]
public override unsafe int GetByteCount (char *chars, int count)
{
return base.GetByteCount (chars, count);
}
- [ComVisible(true)]
+ [ComVisible(false)]
public override int GetByteCount (string s)
{
return base.GetByteCount (s);
}
- [ComVisible(true)]
+ [ComVisible(false)]
[CLSCompliantAttribute (false)]
public override unsafe int GetBytes (char *chars, int charCount, byte*
bytes, int byteCount)
{
return base.GetBytes (chars, charCount, bytes, byteCount);
}
- [ComVisible(true)]
+ [ComVisible(false)]
public override int GetBytes (string s, int charIndex, int charCount,
byte [] bytes, int byteIndex)
{
return base.GetBytes (s, charIndex, charCount, bytes,
byteIndex);
}
- [ComVisible(true)]
+ [ComVisible(false)]
[CLSCompliantAttribute (false)]
public override unsafe int GetCharCount (byte *bytes, int count)
{
return base.GetCharCount (bytes, count);
}
- [ComVisible(true)]
+ [ComVisible(false)]
[CLSCompliantAttribute (false)]
public override unsafe int GetChars (byte* bytes, int byteCount, char*
chars, int charCount)
{
return base.GetChars (bytes, byteCount, chars, charCount);
}
- [ComVisible(true)]
+ [ComVisible(false)]
public override string GetString (byte [] bytes, int index, int count)
{
return base.GetString (bytes, index, count);
Modified: trunk/mcs/class/corlib/System.Text/UnicodeEncoding.cs
===================================================================
--- trunk/mcs/class/corlib/System.Text/UnicodeEncoding.cs 2007-05-03
14:44:30 UTC (rev 76624)
+++ trunk/mcs/class/corlib/System.Text/UnicodeEncoding.cs 2007-05-03
16:21:18 UTC (rev 76625)
@@ -355,6 +355,12 @@
return count;
}
+ [ComVisible (false)]
+ public override Encoder GetEncoder ()
+ {
+ return(base.GetEncoder ());
+ }
+
// Get the maximum number of bytes needed to encode a
// specified number of characters.
public override int GetMaxByteCount (int charCount)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
