Ensure On* methods are not removed by BclRewriter

Commit migrated from https://github.com/dotnet/coreclr/commit/19984585ce87829b89f4755e2869f594245dd84e

diff --git a/src/coreclr/src/mscorlib/model.xml b/src/coreclr/src/mscorlib/model.xml
index c7ffa7c..67641ea 100644 (file)
--- a/src/coreclr/src/mscorlib/model.xml
+++ b/src/coreclr/src/mscorlib/model.xml
@@ -1630,6 +1630,7 @@
       <Member Name="GetTypeCode" />
       <Member Name="Multiply(System.Decimal,System.Decimal)" />
       <Member Name="Negate(System.Decimal)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="op_Addition(System.Decimal,System.Decimal)" />
       <Member Name="op_Decrement(System.Decimal)" />
       <Member Name="op_Division(System.Decimal,System.Decimal)" />
@@ -1978,6 +1979,7 @@
       <Member MemberType="Property" Name="TargetSite" />
       <Member Status="ImplRoot" Name="InternalToString" />
       <Member Status="ImplRoot" Name="InternalPreserveStackTrace" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
       <Member Status="ImplRoot" MemberType="Field" Name="_remoteStackIndex" /> <!-- EE -->
       <Member Status="ImplRoot" MemberType="Field" Name="_exceptionMethod" /> <!-- EE -->
       <Member Status="ImplRoot" MemberType="Field" Name="_exceptionMethodString" /> <!-- EE -->
@@ -2206,6 +2208,9 @@
       <Member Name="LastIndexOf(System.String,System.String,System.Int32,System.Globalization.CompareOptions)" />
       <Member Name="LastIndexOf(System.String,System.String,System.Int32,System.Int32)" />
       <Member Name="LastIndexOf(System.String,System.String,System.Int32,System.Int32,System.Globalization.CompareOptions)" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnDeserializing(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="ToString" />
       <Member MemberType="Property" Name="Name" />
     </Type>
@@ -2246,6 +2251,8 @@
       <Member Name="get_TwoLetterISOLanguageName" />
       <Member Name="GetFormat(System.Type)" />
       <Member Name="GetHashCode" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="ReadOnly(System.Globalization.CultureInfo)" />
       <Member Name="set_CurrentCulture(System.Globalization.CultureInfo)" />
       <Member Name="set_CurrentUICulture(System.Globalization.CultureInfo)" />
@@ -2327,6 +2334,8 @@
       <Member Name="GetFormat(System.Type)" />
       <Member Name="GetInstance(System.IFormatProvider)" />
       <Member Name="GetMonthName(System.Int32)" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="ReadOnly(System.Globalization.DateTimeFormatInfo)" />
       <Member Name="set_AbbreviatedDayNames(System.String[])" />
       <Member Name="set_AbbreviatedMonthGenitiveNames(System.String[])" />
@@ -2474,6 +2483,7 @@
       <Member Name="IsLeapDay(System.Int32,System.Int32,System.Int32,System.Int32)" />
       <Member Name="IsLeapMonth(System.Int32,System.Int32,System.Int32)" />
       <Member Name="IsLeapYear(System.Int32,System.Int32)" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="set_CalendarType(System.Globalization.GregorianCalendarTypes)" />
       <Member Name="set_TwoDigitYearMax(System.Int32)" />
       <Member Name="ToDateTime(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32)" />
@@ -2733,6 +2743,9 @@
       <Member Name="get_PositiveSign" />
       <Member Name="GetFormat(System.Type)" />
       <Member Name="GetInstance(System.IFormatProvider)" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnDeserializing(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="ReadOnly(System.Globalization.NumberFormatInfo)" />
       <Member Name="set_CurrencyDecimalDigits(System.Int32)" />
       <Member Name="set_CurrencyDecimalSeparator(System.String)" />
@@ -2823,6 +2836,8 @@
       <Member Name="get_NativeName" />
       <Member Name="get_TwoLetterISORegionName" />
       <Member Name="GetHashCode" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="ToString" />
       <Member MemberType="Property" Name="CurrencySymbol" />
       <Member MemberType="Property" Name="CurrentRegion" />
@@ -2845,6 +2860,8 @@
       <Member Name="GetNextTextElement(System.String,System.Int32)" />
       <Member Name="GetTextElementEnumerator(System.String)" />
       <Member Name="GetTextElementEnumerator(System.String,System.Int32)" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnDeserializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="ParseCombiningCharacters(System.String)" />
       <Member Name="set_String(System.String)" />
       <Member MemberType="Property" Name="LengthInTextElements" />
@@ -2896,6 +2913,9 @@
       <Member Name="get_ElementIndex" />
       <Member Name="GetTextElement" />
       <Member Name="MoveNext" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnDeserializing(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="Reset" />
       <Member MemberType="Property" Name="Current" />
       <Member MemberType="Property" Name="ElementIndex" />
@@ -2907,6 +2927,9 @@
       <Member Name="get_IsRightToLeft" />
       <Member Name="get_ListSeparator" />
       <Member Name="GetHashCode" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnDeserializing(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="set_ListSeparator(System.String)" />
       <Member Name="ToLower(System.Char)" />
       <Member Name="ToLower(System.String)" />
@@ -3220,6 +3243,7 @@
       <Member Name="get_IsValueCreated"/>
       <Member MemberType="Property" Name="Value"/>
       <Member Name="get_Value"/>
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
     </Type>
     <Type Status="ImplRoot" Name="System.System_LazyDebugView&lt;T&gt;">
       <Member Status="ImplRoot" Name="#ctor(System.Lazy&lt;T&gt;)"/>
@@ -5559,6 +5583,9 @@
       <Member Name="GetString(System.String)" />
       <Member Name="GetString(System.String,System.Globalization.CultureInfo)" />
       <Member Name="InternalGetResourceSet(System.Globalization.CultureInfo,System.Boolean,System.Boolean)" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnDeserializing(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="ReleaseAllResources" />
       <Member Name="set_IgnoreCase(System.Boolean)" />
       <Member MemberType="Property" Name="BaseName" />
@@ -6845,6 +6872,9 @@
       <Member Name="IsAlwaysNormalized" />
       <Member Name="IsAlwaysNormalized(System.Text.NormalizationForm)" />
     -->
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnDeserializing(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
       <Member Name="set_DecoderFallback(System.Text.DecoderFallback)" />
       <Member Name="set_EncoderFallback(System.Text.EncoderFallback)" />
       <Member MemberType="Property" Name="ASCII" />
@@ -6969,6 +6999,7 @@
       <Member Name="GetMaxByteCount(System.Int32)" />
       <Member Name="GetMaxCharCount(System.Int32)" />
       <Member Name="GetPreamble" />
+      <Member Status="ImplRoot" Name="OnDeserializing(System.Runtime.Serialization.StreamingContext)" />
     </Type>
     <Type Name="System.Text.UTF32Encoding">
       <Member Name="#ctor" />
@@ -7013,6 +7044,8 @@
       <Member Name="GetMaxByteCount(System.Int32)" />
       <Member Name="GetMaxCharCount(System.Int32)" />
       <Member Name="GetString(System.Byte[],System.Int32,System.Int32)" />
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnDeserializing(System.Runtime.Serialization.StreamingContext)" />
     </Type>
     <Type Name="System.Text.UTF8Encoding">
       <Member Name="#ctor" />
@@ -8731,7 +8764,11 @@
     <Type Status="ImplRoot" Name="System.Diagnostics.EditAndContinueHelper">
       <Member MemberType="Field" Name="_objectReference" />
     </Type>
-    <Type Status="ImplRoot" Name="System.Diagnostics.StackFrameHelper" />
+    <Type Status="ImplRoot" Name="System.Diagnostics.StackFrameHelper">
+      <Member Status="ImplRoot" Name="OnDeserialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerialized(System.Runtime.Serialization.StreamingContext)" />
+      <Member Status="ImplRoot" Name="OnSerializing(System.Runtime.Serialization.StreamingContext)" />
+    </Type>
     <Type Name="System.Diagnostics.Tracing.EventAttribute">
       <Member Name="#ctor(System.Int32)" />
       <Member Name="get_EventId" />

diff --git a/src/coreclr/src/mscorlib/src/System/Diagnostics/Contracts/ContractsBCL.cs b/src/coreclr/src/mscorlib/src/System/Diagnostics/Contracts/ContractsBCL.cs
index de7e8d2..804318e 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Diagnostics/Contracts/ContractsBCL.cs
+++ b/src/coreclr/src/mscorlib/src/System/Diagnostics/Contracts/ContractsBCL.cs
@@ -202,6 +202,7 @@ namespace System.Diagnostics.Contracts {
         }
     }
 
+    [Serializable]
     [SuppressMessage("Microsoft.Design", "CA1064:ExceptionsShouldBePublic")]
     internal sealed class ContractException : Exception
     {