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

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapReader.cs
View File

@@ -499,9 +499,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
object objReturn =
FormatterServices.GetUninitializedObject(type);
#if NET_2_0
objMgr.RaiseOnDeserializingEvent (objReturn);
#endif
if(objReturn is ISerializable)
NeedsSerializationInfo = true;

8
mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapWriter.cs
View File

@@ -84,9 +84,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
private FormatterAssemblyStyle _assemblyFormat = FormatterAssemblyStyle.Full;
private FormatterTypeStyle _typeFormat = FormatterTypeStyle.TypesWhenNeeded;
private static string defaultMessageNamespace;
#if NET_2_0
SerializationObjectManager _manager;
#endif
#endregion
@@ -106,9 +104,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
_xmlWriter.Formatting = Formatting.Indented;
_surrogateSelector = selector;
_context = context;
#if NET_2_0
_manager = new SerializationObjectManager (_context);
#endif
}
static SoapWriter()
@@ -207,9 +203,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
Thread.CurrentThread.CurrentCulture = savedCi;
}
#if NET_2_0
_manager.RaiseOnSerializedEvent ();
#endif
}
void Serialize_inner (object objGraph, Header[] headers, FormatterTypeStyle typeFormat, FormatterAssemblyStyle assemblyFormat)
@@ -373,9 +367,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
}
if(currentObject is ISerializable || surrogate != null) needsSerializationInfo = true;
#if NET_2_0
_manager.RegisterObject (currentObject);
#endif
if(needsSerializationInfo)
{

2
mcs/class/System.Runtime.Serialization.Formatters.Soap/Test/SerializationCallbackTest.cs
View File

@@ -4,7 +4,6 @@
// Author: Robert Jordan (robertj@gmx.net)
//
#if NET_2_0
using System;
using System.Diagnostics;
@@ -238,4 +237,3 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Soap
}
}
#endif