Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 93fa7c4

Browse files
authored
Remove ReflectionXmlSerializationReader and ReflectionXmlSerializationWriter from SGEN (#18874)
* Remove ReflectionXmlSerializationReader and ReflectionXmlSerializationWriter from the XmlSerializerGenerator. * Remove the XmlSerializationPrimitiveReader class in sgen.
1 parent ef3a704 commit 93fa7c4

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

src/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@
6969
<Compile Include="$(SourceDir)\System\Xml\Serialization\PrimitiveXmlSerializers.cs">
7070
<Link>System\Xml\Serialization\PrimitiveXmlSerializers.cs</Link>
7171
</Compile>
72-
<Compile Include="$(SourceDir)\System\Xml\Serialization\ReflectionXmlSerializationReader.cs">
73-
<Link>System\Xml\Serialization\ReflectionXmlSerializationReader.cs</Link>
74-
</Compile>
75-
<Compile Include="$(SourceDir)\System\Xml\Serialization\ReflectionXmlSerializationWriter.cs">
76-
<Link>System\Xml\Serialization\ReflectionXmlSerializationWriter.cs</Link>
77-
</Compile>
7872
<Compile Include="$(SourceDir)\System\Xml\Serialization\SoapAttributeAttribute.cs">
7973
<Link>System\Xml\Serialization\SoapAttributeAttribute.cs</Link>
8074
</Compile>

src/System.Private.Xml/src/System/Xml/Serialization/PrimitiveXmlSerializers.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,8 @@ protected override void InitCallbacks()
236236
}
237237
}
238238

239-
#if XMLSERIALIZERGENERATOR
240-
internal class XmlSerializationPrimitiveReader : Microsoft.XmlSerializer.Generator.XmlSerializationReader
241-
#else
239+
#if !XMLSERIALIZERGENERATOR
242240
internal class XmlSerializationPrimitiveReader : System.Xml.Serialization.XmlSerializationReader
243-
#endif
244241
{
245242
internal object Read_string()
246243
{
@@ -762,4 +759,5 @@ protected override void InitIDs()
762759
_id1_QName = Reader.NameTable.Add(@"QName");
763760
}
764761
}
762+
#endif
765763
}

src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationReader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ internal void Init(XmlReader r, XmlDeserializationEvents events, string encoding
188188
InitIDs();
189189
}
190190

191+
#if !XMLSERIALIZERGENERATOR
191192
protected bool DecodeName
192193
{
193194
get
@@ -223,9 +224,7 @@ protected XmlDocument Document
223224
if (_d == null)
224225
{
225226
_d = new XmlDocument(_r.NameTable);
226-
#if !XMLSERIALIZERGENERATOR
227227
_d.SetBaseURI(_r.BaseURI);
228-
#endif
229228
}
230229
return _d;
231230
}
@@ -2145,6 +2144,7 @@ public object CollectionItems
21452144
get { return _collectionItems; }
21462145
}
21472146
}
2147+
#endif
21482148
}
21492149

21502150
///<internalonly/>

src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public struct XmlDeserializationEvents
3333
private XmlAttributeEventHandler _onUnknownAttribute;
3434
private XmlElementEventHandler _onUnknownElement;
3535
private UnreferencedObjectEventHandler _onUnreferencedObject;
36+
#if !XMLSERIALIZERGENERATOR
3637
internal object sender;
38+
#endif
3739

3840
/// <include file='doc\XmlSerializer.uex' path='docs/doc[@for="XmlDeserializationEvents.OnUnknownNode"]/*' />
3941
public XmlNodeEventHandler OnUnknownNode
@@ -361,6 +363,7 @@ internal static TempAssembly GenerateTempAssembly(XmlMapping xmlMapping, Type ty
361363
return new TempAssembly(new XmlMapping[] { xmlMapping }, new Type[] { type }, defaultNamespace, location);
362364
}
363365

366+
#if !XMLSERIALIZERGENERATOR
364367
/// <include file='doc\XmlSerializer.uex' path='docs/doc[@for="XmlSerializer.Serialize"]/*' />
365368
/// <devdoc>
366369
/// <para>[To be supplied.]</para>
@@ -681,6 +684,7 @@ public object Deserialize(XmlReader xmlReader, string encodingStyle, XmlDeserial
681684
}
682685
}
683686
}
687+
#endif
684688

685689
private static bool ShouldUseReflectionBasedSerialization(XmlMapping mapping)
686690
{
@@ -1072,6 +1076,7 @@ private static XmlTypeMapping GetKnownMapping(Type type, string ns)
10721076
return mapping;
10731077
}
10741078

1079+
#if !XMLSERIALIZERGENERATOR
10751080
private void SerializePrimitive(XmlWriter xmlWriter, object o, XmlSerializerNamespaces namespaces)
10761081
{
10771082
XmlSerializationPrimitiveWriter writer = new XmlSerializationPrimitiveWriter();
@@ -1228,6 +1233,7 @@ private object DeserializePrimitive(XmlReader xmlReader, XmlDeserializationEvent
12281233
return o;
12291234
}
12301235

1236+
#endif
12311237
private class XmlSerializerMappingKey
12321238
{
12331239
public XmlMapping Mapping;

0 commit comments

Comments
 (0)