You've already forked linux-packaging-mono
Imported Upstream version 3.10.0
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
@ -53,11 +53,9 @@ using System.Runtime.InteropServices;
|
||||
|
||||
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
|
||||
|
||||
#if !TARGET_JVM
|
||||
[assembly: CLSCompliant (true)]
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile ("../msfinal.pub")]
|
||||
#endif
|
||||
|
||||
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
|
||||
[assembly: ComVisible (true)]
|
||||
|
@ -499,7 +499,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
|
||||
object objReturn =
|
||||
FormatterServices.GetUninitializedObject(type);
|
||||
|
||||
#if NET_2_0 && !TARGET_JVM
|
||||
#if NET_2_0
|
||||
objMgr.RaiseOnDeserializingEvent (objReturn);
|
||||
#endif
|
||||
if(objReturn is ISerializable)
|
||||
|
@ -84,7 +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 && !TARGET_JVM
|
||||
#if NET_2_0
|
||||
SerializationObjectManager _manager;
|
||||
#endif
|
||||
|
||||
@ -106,7 +106,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
|
||||
_xmlWriter.Formatting = Formatting.Indented;
|
||||
_surrogateSelector = selector;
|
||||
_context = context;
|
||||
#if NET_2_0 && !TARGET_JVM
|
||||
#if NET_2_0
|
||||
_manager = new SerializationObjectManager (_context);
|
||||
#endif
|
||||
}
|
||||
@ -207,7 +207,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
|
||||
Thread.CurrentThread.CurrentCulture = savedCi;
|
||||
}
|
||||
|
||||
#if NET_2_0 && !TARGET_JVM
|
||||
#if NET_2_0
|
||||
_manager.RaiseOnSerializedEvent ();
|
||||
#endif
|
||||
}
|
||||
@ -373,7 +373,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
|
||||
}
|
||||
if(currentObject is ISerializable || surrogate != null) needsSerializationInfo = true;
|
||||
|
||||
#if NET_2_0 && !TARGET_JVM
|
||||
#if NET_2_0
|
||||
_manager.RegisterObject (currentObject);
|
||||
#endif
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
#include System.Runtime.Serialization.Formatters.Soap.dll.sources
|
Reference in New Issue
Block a user