diff options
| author | Viktor Hofer <viktor.hofer@outlook.com> | 2017-09-07 21:21:45 +0200 |
|---|---|---|
| committer | Viktor Hofer <viktor.hofer@outlook.com> | 2017-09-12 17:06:00 +0200 |
| commit | 1fffec5ee9fcb838c6b71ae8b755406e098c9671 (patch) | |
| tree | cc692837c583a3ae7eef7f6b2a9e1ec0f8052ed4 | |
| parent | e466788c35fcf8cbb3fca4320824ad83530b7927 (diff) | |
| download | coreclr-1fffec5ee9fcb838c6b71ae8b755406e098c9671.tar.gz coreclr-1fffec5ee9fcb838c6b71ae8b755406e098c9671.tar.bz2 coreclr-1fffec5ee9fcb838c6b71ae8b755406e098c9671.zip | |
TextInfo
| -rw-r--r-- | src/mscorlib/src/System/Globalization/TextInfo.Unix.cs | 1 | ||||
| -rw-r--r-- | src/mscorlib/src/System/Globalization/TextInfo.cs | 34 |
2 files changed, 8 insertions, 27 deletions
diff --git a/src/mscorlib/src/System/Globalization/TextInfo.Unix.cs b/src/mscorlib/src/System/Globalization/TextInfo.Unix.cs index f7f64c684a..9f80d73891 100644 --- a/src/mscorlib/src/System/Globalization/TextInfo.Unix.cs +++ b/src/mscorlib/src/System/Globalization/TextInfo.Unix.cs @@ -11,7 +11,6 @@ namespace System.Globalization { public partial class TextInfo { - [NonSerialized] private Tristate _needsTurkishCasing = Tristate.NotInitialized; private void FinishInitialization(string textInfoName) diff --git a/src/mscorlib/src/System/Globalization/TextInfo.cs b/src/mscorlib/src/System/Globalization/TextInfo.cs index ecc2108ce3..c5acbd4579 100644 --- a/src/mscorlib/src/System/Globalization/TextInfo.cs +++ b/src/mscorlib/src/System/Globalization/TextInfo.cs @@ -21,10 +21,6 @@ namespace System.Globalization { public partial class TextInfo : ICloneable, IDeserializationCallback { - ////--------------------------------------------------------------------// - //// Internal Information // - ////--------------------------------------------------------------------// - private enum Tristate : byte { NotInitialized, @@ -32,36 +28,22 @@ namespace System.Globalization False, } - //// - //// Variables. - //// - - [OptionalField(VersionAdded = 2)] - private String _listSeparator; - [OptionalField(VersionAdded = 2)] + private string _listSeparator; private bool _isReadOnly = false; - //// _cultureName is the name of the creating culture. Note that we consider this authoritative, - //// if the culture's textinfo changes when deserializing, then behavior may change. - //// (ala Whidbey behavior). This is the only string Arrowhead needs to serialize. - //// _cultureData is the data that backs this class. - //// _textInfoName is the actual name of the textInfo (from cultureData.STEXTINFO) - //// this can be the same as _cultureName on Silverlight since the OS knows - //// how to do the sorting. However in the desktop, when we call the sorting dll, it doesn't - //// know how to resolve custom locale names to sort ids so we have to have already resolved this. - //// - - [OptionalField(VersionAdded = 3)] + /* _cultureName is the name of the creating culture. + _cultureData is the data that backs this class. + _textInfoName is the actual name of the textInfo (from cultureData.STEXTINFO) + In the desktop, when we call the sorting dll, it doesn't + know how to resolve custom locle names to sort ids so we have to have already resolved this. + */ + private String _cultureName; // Name of the culture that created this text info - [NonSerialized] private CultureData _cultureData; // Data record for the culture that made us, not for this textinfo - [NonSerialized] private String _textInfoName; // Name of the text info we're using (ie: _cultureData.STEXTINFO) - [NonSerialized] private Tristate _isAsciiCasingSameAsInvariant = Tristate.NotInitialized; // _invariantMode is defined for the perf reason as accessing the instance field is faster than access the static property GlobalizationMode.Invariant - [NonSerialized] private readonly bool _invariantMode = GlobalizationMode.Invariant; // Invariant text info |