Fix NetNative build issue with MERGE_DCJS directives

khdang · khdang · commit 082f3aa5c9ee · 2015-06-18T18:11:18.000-07:00
diff --git a/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
@@ -71,7 +71,7 @@
     <Compile Include="$(RuntimeSerializationSources)\KnownTypeDataContractResolver.cs" />
     <Compile Include="$(RuntimeSerializationSources)\XmlObjectSerializerReadContextComplex.cs" Condition="$(NetNative) Or $(MergeDcjs)" />
     <Compile Include="$(RuntimeSerializationSources)\XmlObjectSerializerWriteContextComplex.cs" Condition="$(NetNative) Or $(MergeDcjs)" />
-    <Compile Include="$(RuntimeSerializationSources)\BitFlagsGenerator.cs" Condition="$(MergeDcjs)" />
+    <Compile Include="$(RuntimeSerializationSources)\BitFlagsGenerator.cs" Condition="!$(NetNative) And $(MergeDcjs)" />
     <Compile Include="$(XmlSources)\ArrayHelper.cs" />
     <Compile Include="$(XmlSources)\IStreamProvider.cs" />
     <Compile Include="$(XmlSources)\IXmlDictionary.cs" />
@@ -139,7 +139,7 @@
     <Compile Include="$(JsonSources)\IXmlJsonWriterInitializer.cs" Condition="$(NetNative) Or $(MergeDcjs)" />
     <Compile Include="$(JsonSources)\ByteArrayHelperWithString.cs" Condition="$(NetNative) Or $(MergeDcjs)" />
     <Compile Include="$(JsonSources)\JsonEncodingStreamWrapper.cs" Condition="$(NetNative) Or $(MergeDcjs)" />
-    <Compile Include="$(JsonSources)\JsonFormatGeneratorStatics.cs" Condition="$(MergeDcjs)" />
+    <Compile Include="$(JsonSources)\JsonFormatGeneratorStatics.cs" Condition="!$(NetNative) And $(MergeDcjs)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Runtime.Serialization.Primitives\src\System.Runtime.Serialization.Primitives.csproj">
diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs
@@ -1449,7 +1449,7 @@ public int Compare(DataMember x, DataMember y)
             internal static DataMemberComparer Singleton = new DataMemberComparer();
         }
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
         /// <summary>
         ///  Get object type for Xml/JsonFormmatReaderGenerator
         /// </summary>
diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/CodeGenerator.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/CodeGenerator.cs
@@ -79,7 +79,7 @@ private static MethodInfo ArraySetValue
             }
         }
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
         [SecurityCritical]
         private static MethodInfo s_objectToString;
         private static MethodInfo ObjectToString
@@ -150,7 +150,7 @@ private static Module SerializationModule
         private enum CodeGenTrace { None, Save, Tron };
         private CodeGenTrace _codeGenTrace;
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
         private LocalBuilder _stringFormatArray;
 #endif
 
@@ -1648,7 +1648,7 @@ internal void IfNotIsEmptyString(LocalBuilder strLocal)
             If(Cmp.NotEqualTo);
         }
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
         internal void BeginWhileCondition()
         {
             Label startWhile = DefineLabel();
diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContract.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContract.cs
@@ -103,7 +103,7 @@ internal static DataContract GetDataContractFromGeneratedAssembly(Type type)
         }
 #endif
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
         internal MethodInfo ParseMethod
         {
             get { return _helper.ParseMethod; }
@@ -529,7 +529,7 @@ internal class DataContractCriticalHelper
             private XmlDictionaryString _name;
             private XmlDictionaryString _ns;
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
             private MethodInfo _parseMethod;
             private bool _parseMethodSet;
 #endif
@@ -1162,7 +1162,7 @@ internal virtual bool IsPrimitive
                 get { return false; }
             }
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
             internal MethodInfo ParseMethod
             {
                 get
@@ -2206,7 +2206,7 @@ internal static bool IsAssemblyFriendOfSerializationAssembly(Assembly assembly,
             return false;
         }
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
         internal static string SanitizeTypeName(string typeName)
         {
             return typeName.Replace('.', '_');
diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Globals.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Globals.cs
@@ -1087,7 +1087,7 @@ internal static bool IsDBNullValue(object o)
         public const string KeyLocalName = "Key";
         public const string ValueLocalName = "Value";
         public const string MscorlibAssemblyName = "0";
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
         public const string ParseMethodName = "Parse";
 #endif
 #if NET_NATIVE || MERGE_DCJS
diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonClassDataContract.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonClassDataContract.cs
@@ -32,7 +32,7 @@ internal JsonFormatClassReaderDelegate JsonFormatReaderDelegate
                     {
                         if (_helper.JsonFormatReaderDelegate == null)
                         {
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
                             JsonFormatClassReaderDelegate tempDelegate = new JsonFormatReaderGenerator().GenerateClassReader(TraditionalClassDataContract);
                             Interlocked.MemoryBarrier();
 #else
@@ -57,7 +57,7 @@ internal JsonFormatClassWriterDelegate JsonFormatWriterDelegate
                     {
                         if (_helper.JsonFormatWriterDelegate == null)
                         {
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
                             JsonFormatClassWriterDelegate tempDelegate = new JsonFormatWriterGenerator().GenerateClassWriter(TraditionalClassDataContract);
                             Interlocked.MemoryBarrier();
 #else
diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonCollectionDataContract.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonCollectionDataContract.cs
@@ -30,7 +30,7 @@ internal JsonFormatCollectionReaderDelegate JsonFormatReaderDelegate
                     {
                         if (_helper.JsonFormatReaderDelegate == null)
                         {
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
                             JsonFormatCollectionReaderDelegate tempDelegate = new JsonFormatReaderGenerator().GenerateCollectionReader(TraditionalCollectionDataContract);
                             Interlocked.MemoryBarrier();
 #else
@@ -60,7 +60,7 @@ internal JsonFormatGetOnlyCollectionReaderDelegate JsonFormatGetOnlyReaderDelega
                             {
                                 throw new InvalidDataContractException(SR.Format(SR.GetOnlyCollectionMustHaveAddMethod, DataContract.GetClrTypeFullName(this.TraditionalDataContract.UnderlyingType)));
                             }
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
                             JsonFormatGetOnlyCollectionReaderDelegate tempDelegate = new JsonFormatReaderGenerator().GenerateGetOnlyCollectionReader(TraditionalCollectionDataContract);
                             Interlocked.MemoryBarrier();
 #else
@@ -85,7 +85,7 @@ internal JsonFormatCollectionWriterDelegate JsonFormatWriterDelegate
                     {
                         if (_helper.JsonFormatWriterDelegate == null)
                         {
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
                             JsonFormatCollectionWriterDelegate tempDelegate = new JsonFormatWriterGenerator().GenerateCollectionWriter(TraditionalCollectionDataContract);
                             Interlocked.MemoryBarrier();
 #else
diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/XmlObjectSerializerReadContextComplexJson.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/XmlObjectSerializerReadContextComplexJson.cs
@@ -321,7 +321,7 @@ public static string GetJsonMemberName(XmlReaderDelegator xmlReader)
         }
 #endif
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
         public static void ThrowDuplicateMemberException(object obj, XmlDictionaryString[] memberNames, int memberIndex)
         {
             throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new SerializationException(
diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatGeneratorStatics.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatGeneratorStatics.cs
@@ -822,7 +822,7 @@ internal static MethodInfo GetDateTimeOffsetAdapterMethod
             }
         }
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
         private static MethodInfo s_getTypeHandleMethod;
         internal static MethodInfo GetTypeHandleMethod
         {
diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs
@@ -633,7 +633,7 @@ protected virtual void WriteTypeInfo(XmlWriterDelegator writer, XmlDictionaryStr
             writer.WriteAttributeQualifiedName(Globals.XsiPrefix, DictionaryGlobals.XsiTypeLocalName, DictionaryGlobals.SchemaInstanceNamespace, dataContractName, dataContractNamespace);
         }
 
-#if MERGE_DCJS
+#if !NET_NATIVE && MERGE_DCJS
         public void WriteExtensionData(XmlWriterDelegator xmlWriter, ExtensionDataObject extensionData, int memberIndex)
         {
             // Needed by the code generator, but not called. 

Original file line number	Diff line number	Diff line change
`@@ -1449,7 +1449,7 @@ public int Compare(DataMember x, DataMember y)`
`1449`	`1449`	`internal static DataMemberComparer Singleton = new DataMemberComparer();`
`1450`	`1450`	`}`
`1451`	`1451`
`1452`		`-#if MERGE_DCJS`
	`1452`	`+#if !NET_NATIVE && MERGE_DCJS`
`1453`	`1453`	`/// <summary>`
`1454`	`1454`	`/// Get object type for Xml/JsonFormmatReaderGenerator`
`1455`	`1455`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ private static MethodInfo ArraySetValue`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`-#if MERGE_DCJS`
	`82`	`+#if !NET_NATIVE && MERGE_DCJS`
`83`	`83`	`[SecurityCritical]`
`84`	`84`	`private static MethodInfo s_objectToString;`
`85`	`85`	`private static MethodInfo ObjectToString`
`@@ -150,7 +150,7 @@ private static Module SerializationModule`
`150`	`150`	`private enum CodeGenTrace { None, Save, Tron };`
`151`	`151`	`private CodeGenTrace _codeGenTrace;`
`152`	`152`
`153`		`-#if MERGE_DCJS`
	`153`	`+#if !NET_NATIVE && MERGE_DCJS`
`154`	`154`	`private LocalBuilder _stringFormatArray;`
`155`	`155`	`#endif`
`156`	`156`
`@@ -1648,7 +1648,7 @@ internal void IfNotIsEmptyString(LocalBuilder strLocal)`
`1648`	`1648`	`If(Cmp.NotEqualTo);`
`1649`	`1649`	`}`
`1650`	`1650`
`1651`		`-#if MERGE_DCJS`
	`1651`	`+#if !NET_NATIVE && MERGE_DCJS`
`1652`	`1652`	`internal void BeginWhileCondition()`
`1653`	`1653`	`{`
`1654`	`1654`	`Label startWhile = DefineLabel();`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ internal static DataContract GetDataContractFromGeneratedAssembly(Type type)`
`103`	`103`	`}`
`104`	`104`	`#endif`
`105`	`105`
`106`		`-#if MERGE_DCJS`
	`106`	`+#if !NET_NATIVE && MERGE_DCJS`
`107`	`107`	`internal MethodInfo ParseMethod`
`108`	`108`	`{`
`109`	`109`	`get { return _helper.ParseMethod; }`
`@@ -529,7 +529,7 @@ internal class DataContractCriticalHelper`
`529`	`529`	`private XmlDictionaryString _name;`
`530`	`530`	`private XmlDictionaryString _ns;`
`531`	`531`
`532`		`-#if MERGE_DCJS`
	`532`	`+#if !NET_NATIVE && MERGE_DCJS`
`533`	`533`	`private MethodInfo _parseMethod;`
`534`	`534`	`private bool _parseMethodSet;`
`535`	`535`	`#endif`
`@@ -1162,7 +1162,7 @@ internal virtual bool IsPrimitive`
`1162`	`1162`	`get { return false; }`
`1163`	`1163`	`}`
`1164`	`1164`
`1165`		`-#if MERGE_DCJS`
	`1165`	`+#if !NET_NATIVE && MERGE_DCJS`
`1166`	`1166`	`internal MethodInfo ParseMethod`
`1167`	`1167`	`{`
`1168`	`1168`	`get`
`@@ -2206,7 +2206,7 @@ internal static bool IsAssemblyFriendOfSerializationAssembly(Assembly assembly,`
`2206`	`2206`	`return false;`
`2207`	`2207`	`}`
`2208`	`2208`
`2209`		`-#if MERGE_DCJS`
	`2209`	`+#if !NET_NATIVE && MERGE_DCJS`
`2210`	`2210`	`internal static string SanitizeTypeName(string typeName)`
`2211`	`2211`	`{`
`2212`	`2212`	`return typeName.Replace('.', '_');`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ internal JsonFormatClassReaderDelegate JsonFormatReaderDelegate`
`32`	`32`	`{`
`33`	`33`	`if (_helper.JsonFormatReaderDelegate == null)`
`34`	`34`	`{`
`35`		`-#if MERGE_DCJS`
	`35`	`+#if !NET_NATIVE && MERGE_DCJS`
`36`	`36`	`JsonFormatClassReaderDelegate tempDelegate = new JsonFormatReaderGenerator().GenerateClassReader(TraditionalClassDataContract);`
`37`	`37`	`Interlocked.MemoryBarrier();`
`38`	`38`	`#else`
`@@ -57,7 +57,7 @@ internal JsonFormatClassWriterDelegate JsonFormatWriterDelegate`
`57`	`57`	`{`
`58`	`58`	`if (_helper.JsonFormatWriterDelegate == null)`
`59`	`59`	`{`
`60`		`-#if MERGE_DCJS`
	`60`	`+#if !NET_NATIVE && MERGE_DCJS`
`61`	`61`	`JsonFormatClassWriterDelegate tempDelegate = new JsonFormatWriterGenerator().GenerateClassWriter(TraditionalClassDataContract);`
`62`	`62`	`Interlocked.MemoryBarrier();`
`63`	`63`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ internal JsonFormatCollectionReaderDelegate JsonFormatReaderDelegate`
`30`	`30`	`{`
`31`	`31`	`if (_helper.JsonFormatReaderDelegate == null)`
`32`	`32`	`{`
`33`		`-#if MERGE_DCJS`
	`33`	`+#if !NET_NATIVE && MERGE_DCJS`
`34`	`34`	`JsonFormatCollectionReaderDelegate tempDelegate = new JsonFormatReaderGenerator().GenerateCollectionReader(TraditionalCollectionDataContract);`
`35`	`35`	`Interlocked.MemoryBarrier();`
`36`	`36`	`#else`
`@@ -60,7 +60,7 @@ internal JsonFormatGetOnlyCollectionReaderDelegate JsonFormatGetOnlyReaderDelega`
`60`	`60`	`{`
`61`	`61`	`throw new InvalidDataContractException(SR.Format(SR.GetOnlyCollectionMustHaveAddMethod, DataContract.GetClrTypeFullName(this.TraditionalDataContract.UnderlyingType)));`
`62`	`62`	`}`
`63`		`-#if MERGE_DCJS`
	`63`	`+#if !NET_NATIVE && MERGE_DCJS`
`64`	`64`	`JsonFormatGetOnlyCollectionReaderDelegate tempDelegate = new JsonFormatReaderGenerator().GenerateGetOnlyCollectionReader(TraditionalCollectionDataContract);`
`65`	`65`	`Interlocked.MemoryBarrier();`
`66`	`66`	`#else`
`@@ -85,7 +85,7 @@ internal JsonFormatCollectionWriterDelegate JsonFormatWriterDelegate`
`85`	`85`	`{`
`86`	`86`	`if (_helper.JsonFormatWriterDelegate == null)`
`87`	`87`	`{`
`88`		`-#if MERGE_DCJS`
	`88`	`+#if !NET_NATIVE && MERGE_DCJS`
`89`	`89`	`JsonFormatCollectionWriterDelegate tempDelegate = new JsonFormatWriterGenerator().GenerateCollectionWriter(TraditionalCollectionDataContract);`
`90`	`90`	`Interlocked.MemoryBarrier();`
`91`	`91`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ public static string GetJsonMemberName(XmlReaderDelegator xmlReader)`
`321`	`321`	`}`
`322`	`322`	`#endif`
`323`	`323`
`324`		`-#if MERGE_DCJS`
	`324`	`+#if !NET_NATIVE && MERGE_DCJS`
`325`	`325`	`public static void ThrowDuplicateMemberException(object obj, XmlDictionaryString[] memberNames, int memberIndex)`
`326`	`326`	`{`
`327`	`327`	`throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new SerializationException(`
Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,7 @@ internal static MethodInfo GetDateTimeOffsetAdapterMethod`
`822`	`822`	`}`
`823`	`823`	`}`
`824`	`824`
`825`		`-#if MERGE_DCJS`
	`825`	`+#if !NET_NATIVE && MERGE_DCJS`
`826`	`826`	`private static MethodInfo s_getTypeHandleMethod;`
`827`	`827`	`internal static MethodInfo GetTypeHandleMethod`
`828`	`828`	`{`
Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ protected virtual void WriteTypeInfo(XmlWriterDelegator writer, XmlDictionaryStr`
`633`	`633`	`writer.WriteAttributeQualifiedName(Globals.XsiPrefix, DictionaryGlobals.XsiTypeLocalName, DictionaryGlobals.SchemaInstanceNamespace, dataContractName, dataContractNamespace);`
`634`	`634`	`}`
`635`	`635`
`636`		`-#if MERGE_DCJS`
	`636`	`+#if !NET_NATIVE && MERGE_DCJS`
`637`	`637`	`public void WriteExtensionData(XmlWriterDelegator xmlWriter, ExtensionDataObject extensionData, int memberIndex)`
`638`	`638`	`{`
`639`	`639`	`// Needed by the code generator, but not called.`