diff options
| author | Stephen Toub <stoub@microsoft.com> | 2016-07-20 21:46:55 -0700 |
|---|---|---|
| committer | Stephen Toub <stoub@microsoft.com> | 2016-07-21 07:51:06 -0700 |
| commit | 292d4eaeb0656119acfe5bc654176792b35b5190 (patch) | |
| tree | 0aa4b9f969b0aeca52ac18b50c8e1e2ce75a6c32 /src/mscorlib/src/System/Text/ISCIIEncoding.cs | |
| parent | 481c1818829b652b71fff4be9dad2d094965adeb (diff) | |
| download | coreclr-292d4eaeb0656119acfe5bc654176792b35b5190.tar.gz coreclr-292d4eaeb0656119acfe5bc654176792b35b5190.tar.bz2 coreclr-292d4eaeb0656119acfe5bc654176792b35b5190.zip | |
Expose serialization primitives from System.Private.Corelib
- Update the model.xml file to expose the serialization primitives from the runtime, e.g. [Serializable], [NonSerialized], ISerializable, etc.
- Tweak how FEATURE_SERIALIZATION is used on some types. ISerializable and IDeserializationCallback are not ifdef'd based on FEATURE_SERIALIZATION, but their members are, which means there are some types which are implementing the interface but have the implementation of the interface's method ifdef'd. This commit removes the ifdef'ing of the methods on the interface, and then ifdef's the implementation of the interface on the offending types.
Diffstat (limited to 'src/mscorlib/src/System/Text/ISCIIEncoding.cs')
| -rw-r--r-- | src/mscorlib/src/System/Text/ISCIIEncoding.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mscorlib/src/System/Text/ISCIIEncoding.cs b/src/mscorlib/src/System/Text/ISCIIEncoding.cs index a26018f6cc..7e73bb70b9 100644 --- a/src/mscorlib/src/System/Text/ISCIIEncoding.cs +++ b/src/mscorlib/src/System/Text/ISCIIEncoding.cs @@ -31,7 +31,10 @@ namespace System.Text #if FEATURE_SERIALIZATION [Serializable] #endif - internal class ISCIIEncoding : EncodingNLS, ISerializable + internal class ISCIIEncoding : EncodingNLS +#if FEATURE_SERIALIZATION + , ISerializable +#endif { // Constants private const int CodeDefault = 0; // 0x40 Default |