Merge pull request #1183 from Unity-Technologies/add-mising-codedom-unityaot

Compile ProcessImportedType in IDataContractSurrogate for unityaot

Author: Joshua Peterson

mcs/class/Facades/System.Runtime.Serialization.Xml/DataContractSerializerExtensions.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if !NO_CODEDOM
+#if !NO_CODEDOM || UNITY_AOT
 using System.CodeDom;
 #endif
 using System.Collections.ObjectModel;
@@ -73,7 +73,7 @@ public Type GetReferencedTypeOnImport(string typeName, string typeNamespace, obj
                 throw NotImplemented.ByDesign;
             }
 
-#if !NO_CODEDOM
+#if !NO_CODEDOM || UNITY_AOT
             public CodeTypeDeclaration ProcessImportedType(CodeTypeDeclaration typeDeclaration, CodeCompileUnit compileUnit)
             {
                 throw NotImplemented.ByDesign;

mcs/class/System/System.CodeDom/CodeCompileUnit.cs

@@ -0,0 +1,7 @@
+#if UNITY_AOT
+
+public class CodeCompileUnit
+{
+}
+
+#endif

mcs/class/System/System.CodeDom/CodeTypeDeclaration.cs

@@ -0,0 +1,7 @@
+#if UNITY_AOT
+
+public class CodeTypeDeclaration
+{
+}
+
+#endif

mcs/class/System/unityaot_System.dll.sources

@@ -2,3 +2,5 @@
 ../System.Web/System.Web/HttpUtility.cs
 ../System.Web/System.Web.Util/Helpers.cs
 ../System.Web/System.Web.Util/HttpEncoder.cs
+System.CodeDom/CodeCompileUnit.cs
+System.CodeDom/CodeTypeDeclaration.cs

mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/IDataContractSurrogate.cs

@@ -17,7 +17,7 @@ public interface IDataContractSurrogate
         object GetCustomDataToExport(Type clrType, Type dataContractType);
         void GetKnownCustomDataTypes(Collection<Type> customDataTypes);
         Type GetReferencedTypeOnImport(string typeName, string typeNamespace, object customData);
-#if !NO_CODEDOM
+#if !NO_CODEDOM || UNITY_AOT
         CodeTypeDeclaration ProcessImportedType(CodeTypeDeclaration typeDeclaration, CodeCompileUnit compileUnit);
 #endif
     }
@@ -70,11 +70,11 @@ internal static Type GetReferencedTypeOnImport(IDataContractSurrogate surrogate,
                 return null;
             return surrogate.GetReferencedTypeOnImport(typeName, typeNamespace, customData);
         }
-#if !NO_CODEDOM
+#if !NO_CODEDOM || UNITY_AOT
         internal static CodeTypeDeclaration ProcessImportedType(IDataContractSurrogate surrogate, CodeTypeDeclaration typeDeclaration, CodeCompileUnit compileUnit)
         {
             return surrogate.ProcessImportedType(typeDeclaration, compileUnit);
         }
 #endif
     }
-}
+}