Merge pull request #2725 from dotnet-bot/from-tfs

Merge changes from TFS

Author: stephentoub

src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs

@@ -344,7 +344,10 @@ internal static ClassDataContract CreateClassDataContractForKeyValue(Type type,
 #if !NET_NATIVE
             return new ClassDataContract(type, ns, memberNames);
 #else
-            return (ClassDataContract)DataContract.GetDataContractFromGeneratedAssembly(type);
+            ClassDataContract cdc = (ClassDataContract)DataContract.GetDataContractFromGeneratedAssembly(type);
+            ClassDataContract cloned = cdc.Clone();
+            cloned.UpdateNamespaceAndMembers(type, ns, memberNames);
+            return cloned;
 #endif
         }
 
@@ -1437,6 +1440,38 @@ public int Compare(Member x, Member y)
 
                 internal static DataMemberConflictComparer Singleton = new DataMemberConflictComparer();
             }
+
+#if NET_NATIVE
+            internal ClassDataContractCriticalHelper Clone()
+            {
+                ClassDataContractCriticalHelper clonedHelper = new ClassDataContractCriticalHelper(this.UnderlyingType);
+
+                clonedHelper._baseContract = this._baseContract;
+                clonedHelper._childElementNamespaces = this._childElementNamespaces;
+                clonedHelper.ContractNamespaces = this.ContractNamespaces;
+                clonedHelper._hasDataContract = this._hasDataContract;
+                clonedHelper._isMethodChecked = this._isMethodChecked;
+                clonedHelper._isNonAttributedType = this._isNonAttributedType;
+                clonedHelper.IsReference = this.IsReference;
+                clonedHelper.IsValueType = this.IsValueType;
+                clonedHelper.MemberNames = this.MemberNames;
+                clonedHelper.MemberNamespaces = this.MemberNamespaces;
+                clonedHelper._members = this._members;
+                clonedHelper.Name = this.Name;
+                clonedHelper.Namespace = this.Namespace;
+                clonedHelper._onDeserialized = this._onDeserialized;
+                clonedHelper._onDeserializing = this._onDeserializing;
+                clonedHelper._onSerialized = this._onSerialized;
+                clonedHelper._onSerializing = this._onSerializing;
+                clonedHelper.StableName = this.StableName;
+                clonedHelper.TopLevelElementName = this.TopLevelElementName;
+                clonedHelper.TopLevelElementNamespace = this.TopLevelElementNamespace;
+                clonedHelper._xmlFormatReaderDelegate = this._xmlFormatReaderDelegate;
+                clonedHelper._xmlFormatWriterDelegate = this._xmlFormatWriterDelegate;
+
+                return clonedHelper;
+            }
+#endif
         }
 
 
@@ -1471,5 +1506,37 @@ internal Type ObjectType
             }
         }
 #endif
+
+#if NET_NATIVE
+        internal ClassDataContract Clone()
+        {
+            ClassDataContract clonedDc = new ClassDataContract(this.UnderlyingType);
+            clonedDc._helper = _helper.Clone();
+            clonedDc.ContractNamespaces = this.ContractNamespaces;
+            clonedDc.ChildElementNamespaces = this.ChildElementNamespaces;
+            clonedDc.MemberNames = this.MemberNames;
+            clonedDc.MemberNamespaces = this.MemberNamespaces;
+            clonedDc.XmlFormatWriterDelegate = this.XmlFormatWriterDelegate;
+            clonedDc.XmlFormatReaderDelegate = this.XmlFormatReaderDelegate;
+            return clonedDc;
+        }
+
+        internal void UpdateNamespaceAndMembers(Type type, XmlDictionaryString ns, string[] memberNames)
+        {
+            this.StableName = new XmlQualifiedName(GetStableName(type).Name, ns.Value);
+            this.Namespace = ns;
+            XmlDictionary dictionary = new XmlDictionary(1 + memberNames.Length);
+            this.Name = dictionary.Add(StableName.Name);
+            this.Namespace = ns;
+            this.ContractNamespaces = new XmlDictionaryString[] { ns };
+            this.MemberNames = new XmlDictionaryString[memberNames.Length];
+            this.MemberNamespaces = new XmlDictionaryString[memberNames.Length];
+            for (int i = 0; i < memberNames.Length; i++)
+            {
+                this.MemberNames[i] = dictionary.Add(memberNames[i]);
+                this.MemberNamespaces[i] = ns;
+            }
+        }
+#endif
     }
 }

src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/CollectionDataContract.cs

@@ -258,11 +258,7 @@ public DataContract ItemContract
             [SecuritySafeCritical]
             get
             {
-#if !NET_NATIVE
                 return _itemContract ?? _helper.ItemContract;
-#else
-                return _itemContract ?? DataContract.GetDataContractFromGeneratedAssembly(this.ItemType);
-#endif
             }
             /// <SecurityNote>
             /// Critical - sets the critical itemContract property
@@ -744,7 +740,11 @@ internal DataContract ItemContract
                         }
                         else
                         {
+#if NET_NATIVE
+                            _itemContract = DataContract.GetDataContractFromGeneratedAssembly(ItemType);
+#else
                             _itemContract = DataContract.GetDataContract(ItemType);
+#endif
                         }
                     }
                     return _itemContract;

src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonDataContract.cs

@@ -59,7 +59,14 @@ public static JsonReadWriteDelegates GetGeneratedReadWriteDelegates(DataContract
             // with the restructuring for multi-file, this is no longer true - instead
             // this has become a normal method
             JsonReadWriteDelegates result;
+#if NET_NATIVE
+            // The c passed in could be a clone which is different from the original key,
+            // We'll need to get the original key data contract from generated assembly.
+            DataContract keyDc = DataContract.GetDataContractFromGeneratedAssembly(c.UnderlyingType);
+            return JsonReadWriteDelegates.GetJsonDelegates().TryGetValue(keyDc, out result) ? result : null;
+#else
             return JsonReadWriteDelegates.GetJsonDelegates().TryGetValue(c, out result) ? result : null;
+#endif
         }
 
         internal static JsonReadWriteDelegates GetReadWriteDelegatesFromGeneratedAssembly(DataContract c)