diff options
| author | Maxim Lipnin <v-maxlip@microsoft.com> | 2019-09-24 12:35:15 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-09-24 12:35:15 +0300 |
| commit | 9988ebc7f2cf61216d9f27a07074046357440079 (patch) | |
| tree | 6d8c5e851d73a514f39294ef440fc9128ca868ff /sdks/ios | |
| parent | 7e6d863686af20509f4a0dc7cd4fca351e295347 (diff) | |
[System.Xml] Fix deserialization issue (#16965)
[This ](https://github.com/mono/mono/pull/11194/files#diff-ae54d9565e735005686191de0f19ed50R431-R435)change in `XmlTypeMapElementInfo.GetElement` introduced the logic for handling the case of derived types deserialization.
For some cases (like https://github.com/mono/mono/issues/16918) it breaks existing functionality because it returns wrong element for given element name after searching withing derived types collection.
Unfortunately, what I can do here is just reverting the related changes.
Fixes https://github.com/mono/mono/issues/16918
Diffstat (limited to 'sdks/ios')
| -rw-r--r-- | sdks/ios/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sdks/ios/Makefile b/sdks/ios/Makefile index 79988045170..378e0e0f5f6 100644 --- a/sdks/ios/Makefile +++ b/sdks/ios/Makefile @@ -24,6 +24,7 @@ TEST_SUITES = \ System.Json \ System.ComponentModel.DataAnnotations \ System.Security \ + System.Xml \ System.Xml.Linq \ System.ServiceModel.Web \ Mono.Data.Tds \ @@ -33,7 +34,6 @@ TEST_SUITES = \ TEST_SUITES_COMPILING = \ System \ System.Net.Http \ - System.Xml \ Mono.CSharp # Not compiling in monotouch profile @@ -215,7 +215,7 @@ Mono.Data.Tds_ASSEMBLIES = $(BCL_DIR)/Mono.Data.Tds.dll $(TESTDIR)/monotouch_Mon Mono.Data.Tds_ARGS = $(NUNIT) monotouch_Mono.Data.Tds_test.dll System.Security_ASSEMBLIES = $(BCL_DIR)/System.Security.dll $(TESTDIR)/monotouch_System.Security_test.dll System.Security_ARGS = $(NUNIT) monotouch_System.Security_test.dll -System.Xml_ASSEMBLIES = $(BCL_DIR)/System.Xml.dll $(TESTDIR)/monotouch_System.Xml_test.dll +System.Xml_ASSEMBLIES = $(BCL_DIR)/System.Data.dll $(TESTDIR)/monotouch_System.Xml_test.dll System.Xml_ARGS = $(NUNIT) monotouch_System.Xml_test.dll System.Xml.Linq_ASSEMBLIES = $(BCL_DIR)/System.Xml.Linq.dll $(TESTDIR)/monotouch_System.Xml.Linq_test.dll System.Xml.Linq_ARGS = $(NUNIT) monotouch_System.Xml.Linq_test.dll |