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

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System.XML/Makefile
View File

@@ -17,8 +17,6 @@ RESOURCE_STRINGS = \
../../../external/referencesource/System.Xml/System.Xml.txt \
../../../external/referencesource/System.Data.SqlXml/System.Xml.Utils.txt
PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monotouch_watch monodroid xammac mobile mobile_static, $(PROFILE))
LIB_REFS = System
LIB_MCS_FLAGS = -r:$(corlib) -nowarn:219,414,649,1717 -unsafe -d:ASYNC
@@ -27,7 +25,7 @@ LIB_MCS_FLAGS += -d:AGCLR -d:NET_2_1_HACK -d:DISABLE_XSLT_COMPILER -d:DISABLE_XS
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 -r:System.Data.dll -r:System.Core.dll
ifndef PROFILE_ANY_MOBILE
ifndef MOBILE_PROFILE
FINAL_MCS_FLAGS = -r:System.Configuration.dll -d:CONFIGURATION_DEP
endif
@@ -81,7 +79,7 @@ system_xml_library_deps := \
$(bare_libdir)/System.dll \
$(bare_libdir)/System.Xml.dll
ifndef PROFILE_ANY_MOBILE
ifndef MOBILE_PROFILE
system_xml_library_deps += $(the_libdir_base)System.Configuration.dll
endif

7
mcs/class/System.XML/ReferenceSources/LocalAppContextSwitches.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace System
{
static class LocalAppContextSwitches {
public const bool IgnoreEmptyKeySequences = false;
public const bool DontThrowOnInvalidSurrogatePairs = false;
}
}

11
mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
View File

@@ -646,8 +646,15 @@ namespace System.Xml.Serialization
{
if (memberValue == null) return null;
Type type = memberValue.GetType();
foreach (XmlTypeMapElementInfo elem in _itemInfo)
if (elem.TypeData.Type == type) return elem;
XmlTypeMapElementInfo bestMatch = null;
foreach (XmlTypeMapElementInfo elem in _itemInfo) {
if (elem.TypeData.Type == type)
return elem;
if (elem.TypeData.Type.IsAssignableFrom (type) &&
(bestMatch == null || elem.TypeData.Type.IsAssignableFrom (bestMatch.TypeData.Type)))
bestMatch = elem;
}
return bestMatch;
}
return null;
}

1
mcs/class/System.XML/System.Xml.dll.sources
View File

@@ -2,6 +2,7 @@ Assembly/AssemblyInfo.cs
../../build/common/Consts.cs
../../build/common/SR.cs
ReferenceSources/Res.cs
ReferenceSources/LocalAppContextSwitches.cs
ReferenceSources/ThisAssembly.cs
../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/GenerateHelper.cs
../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/IteratorDescriptor.cs

7
mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTestClasses.cs
View File

@@ -711,6 +711,13 @@ namespace MonoTests.System.Xml.TestClasses
public object data;
}
public class SubclassTestList
{
[XmlElement ("a", typeof (SimpleClass))]
[XmlElement ("b", typeof (SubclassTestBase))]
public List<object> Items;
}
public class DictionaryWithIndexer : DictionaryBase
{
public TimeSpan this[int index]

2
mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs.REMOVED.git-id
View File

@@ -1 +1 @@
4e51eceae03b32f848de53e915a039f8bb497709
bdd08aa7c69f5101ca4b85479f374d3da2f89b16

3
mcs/class/System.XML/mobile_System.Xml.dll.sources
View File

@@ -1,9 +1,9 @@
Assembly/AssemblyInfo.cs
../../build/common/Consts.cs
../../build/common/Locale.cs
../../build/common/MonoTODOAttribute.cs
../../build/common/SR.cs
ReferenceSources/Res.cs
ReferenceSources/LocalAppContextSwitches.cs
ReferenceSources/ThisAssembly.cs
ReferenceSources/TypeScope.cs
ReferenceSources/Wsdl.cs
@@ -108,7 +108,6 @@ ReferenceSources/CodeDom.cs
../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltCompileContext.cs
../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltDebugger.cs
../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltOutput.cs
../../../external/referencesource/System.Xml/InternalApis/NDP_Common/inc/Win8Helpers.cs
../../../external/referencesource/System.Xml/misc/HResults.cs
../../../external/referencesource/System.Xml/misc/InvariantComparer.cs
../../../external/referencesource/System.Xml/misc/PrivilegedConfigurationManager.cs

1
mcs/class/System.XML/monotouch_tv_System.Xml.dll.sources Normal file
View File

@@ -0,0 +1 @@
#include mobile_System.Xml.dll.sources

1
mcs/class/System.XML/monotouch_tv_runtime_System.Xml.dll.sources Normal file
View File

@@ -0,0 +1 @@
#include mobile_System.Xml.dll.sources

1
mcs/class/System.XML/monotouch_watch_runtime_System.Xml.dll.sources Normal file
View File

@@ -0,0 +1 @@
#include mobile_System.Xml.dll.sources