From 7cee8622610c805a1c021782ba4adaaf5ea1688b Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Thu, 8 Aug 2019 15:12:50 -0400 Subject: [PATCH] Fix FxCop warning CA2229 (private deserialization ctor) Commit migrated from https://github.com/dotnet/coreclr/commit/17655f12b5ba2230a544dbe10eaceaf444a77965 --- .../System.Private.CoreLib/src/System/DataMisalignedException.cs | 2 +- .../System.Private.CoreLib/src/System/ExecutionEngineException.cs | 2 +- .../System.Private.CoreLib/src/System/IndexOutOfRangeException.cs | 2 +- .../src/System/InsufficientExecutionStackException.cs | 2 +- .../System.Private.CoreLib/src/System/InvalidProgramException.cs | 2 +- .../System.Private.CoreLib/src/System/MulticastNotSupportedException.cs | 2 +- .../src/System/Reflection/AmbiguousMatchException.cs | 2 +- .../src/System/Reflection/TargetInvocationException.cs | 2 +- .../src/System/Reflection/TargetParameterCountException.cs | 2 +- .../System.Private.CoreLib/src/System/StackOverflowException.cs | 2 +- .../System.Private.CoreLib/src/System/Threading/ThreadAbortException.cs | 2 +- .../System.Private.CoreLib/src/System/TypeInitializationException.cs | 2 +- .../System.Private.CoreLib/src/System/UnitySerializationHolder.cs | 2 ++ src/libraries/System.Private.CoreLib/src/System/WeakReference.T.cs | 2 +- 14 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/DataMisalignedException.cs b/src/libraries/System.Private.CoreLib/src/System/DataMisalignedException.cs index 2b49e5a..927abe0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/DataMisalignedException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/DataMisalignedException.cs @@ -35,7 +35,7 @@ namespace System HResult = HResults.COR_E_DATAMISALIGNED; } - internal DataMisalignedException(SerializationInfo info, StreamingContext context) : base(info, context) + private DataMisalignedException(SerializationInfo info, StreamingContext context) : base(info, context) { } } diff --git a/src/libraries/System.Private.CoreLib/src/System/ExecutionEngineException.cs b/src/libraries/System.Private.CoreLib/src/System/ExecutionEngineException.cs index 2d6da9c..b804599 100644 --- a/src/libraries/System.Private.CoreLib/src/System/ExecutionEngineException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/ExecutionEngineException.cs @@ -43,7 +43,7 @@ namespace System HResult = HResults.COR_E_EXECUTIONENGINE; } - internal ExecutionEngineException(SerializationInfo info, StreamingContext context) : base(info, context) + private ExecutionEngineException(SerializationInfo info, StreamingContext context) : base(info, context) { } } diff --git a/src/libraries/System.Private.CoreLib/src/System/IndexOutOfRangeException.cs b/src/libraries/System.Private.CoreLib/src/System/IndexOutOfRangeException.cs index ec4195c..b2ef538 100644 --- a/src/libraries/System.Private.CoreLib/src/System/IndexOutOfRangeException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/IndexOutOfRangeException.cs @@ -37,7 +37,7 @@ namespace System HResult = HResults.COR_E_INDEXOUTOFRANGE; } - internal IndexOutOfRangeException(SerializationInfo info, StreamingContext context) : base(info, context) + private IndexOutOfRangeException(SerializationInfo info, StreamingContext context) : base(info, context) { } } diff --git a/src/libraries/System.Private.CoreLib/src/System/InsufficientExecutionStackException.cs b/src/libraries/System.Private.CoreLib/src/System/InsufficientExecutionStackException.cs index bb60d53..998a824 100644 --- a/src/libraries/System.Private.CoreLib/src/System/InsufficientExecutionStackException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/InsufficientExecutionStackException.cs @@ -28,7 +28,7 @@ namespace System HResult = HResults.COR_E_INSUFFICIENTEXECUTIONSTACK; } - internal InsufficientExecutionStackException(SerializationInfo info, StreamingContext context) : base(info, context) + private InsufficientExecutionStackException(SerializationInfo info, StreamingContext context) : base(info, context) { } } diff --git a/src/libraries/System.Private.CoreLib/src/System/InvalidProgramException.cs b/src/libraries/System.Private.CoreLib/src/System/InvalidProgramException.cs index 236768e..d20391b 100644 --- a/src/libraries/System.Private.CoreLib/src/System/InvalidProgramException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/InvalidProgramException.cs @@ -37,6 +37,6 @@ namespace System HResult = HResults.COR_E_INVALIDPROGRAM; } - internal InvalidProgramException(SerializationInfo info, StreamingContext context) : base(info, context) { } + private InvalidProgramException(SerializationInfo info, StreamingContext context) : base(info, context) { } } } diff --git a/src/libraries/System.Private.CoreLib/src/System/MulticastNotSupportedException.cs b/src/libraries/System.Private.CoreLib/src/System/MulticastNotSupportedException.cs index 898b2eb..34c7ed5 100644 --- a/src/libraries/System.Private.CoreLib/src/System/MulticastNotSupportedException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/MulticastNotSupportedException.cs @@ -33,7 +33,7 @@ namespace System HResult = HResults.COR_E_MULTICASTNOTSUPPORTED; } - internal MulticastNotSupportedException(SerializationInfo info, StreamingContext context) : base(info, context) + private MulticastNotSupportedException(SerializationInfo info, StreamingContext context) : base(info, context) { } } diff --git a/src/libraries/System.Private.CoreLib/src/System/Reflection/AmbiguousMatchException.cs b/src/libraries/System.Private.CoreLib/src/System/Reflection/AmbiguousMatchException.cs index 7db74c6..f6472c9 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Reflection/AmbiguousMatchException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Reflection/AmbiguousMatchException.cs @@ -28,7 +28,7 @@ namespace System.Reflection HResult = HResults.COR_E_AMBIGUOUSMATCH; } - internal AmbiguousMatchException(SerializationInfo info, StreamingContext context) : base(info, context) + private AmbiguousMatchException(SerializationInfo info, StreamingContext context) : base(info, context) { } } diff --git a/src/libraries/System.Private.CoreLib/src/System/Reflection/TargetInvocationException.cs b/src/libraries/System.Private.CoreLib/src/System/Reflection/TargetInvocationException.cs index 9d92532..d529e64 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Reflection/TargetInvocationException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Reflection/TargetInvocationException.cs @@ -22,7 +22,7 @@ namespace System.Reflection HResult = HResults.COR_E_TARGETINVOCATION; } - internal TargetInvocationException(SerializationInfo info, StreamingContext context) + private TargetInvocationException(SerializationInfo info, StreamingContext context) : base(info, context) { } diff --git a/src/libraries/System.Private.CoreLib/src/System/Reflection/TargetParameterCountException.cs b/src/libraries/System.Private.CoreLib/src/System/Reflection/TargetParameterCountException.cs index aaf1c33..888068d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Reflection/TargetParameterCountException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Reflection/TargetParameterCountException.cs @@ -28,7 +28,7 @@ namespace System.Reflection HResult = HResults.COR_E_TARGETPARAMCOUNT; } - internal TargetParameterCountException(SerializationInfo info, StreamingContext context) + private TargetParameterCountException(SerializationInfo info, StreamingContext context) : base(info, context) { } diff --git a/src/libraries/System.Private.CoreLib/src/System/StackOverflowException.cs b/src/libraries/System.Private.CoreLib/src/System/StackOverflowException.cs index 0177b58..a1dd460 100644 --- a/src/libraries/System.Private.CoreLib/src/System/StackOverflowException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/StackOverflowException.cs @@ -37,7 +37,7 @@ namespace System HResult = HResults.COR_E_STACKOVERFLOW; } - internal StackOverflowException(SerializationInfo info, StreamingContext context) : base(info, context) + private StackOverflowException(SerializationInfo info, StreamingContext context) : base(info, context) { } } diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadAbortException.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadAbortException.cs index 9391bb4..574e27f 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadAbortException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadAbortException.cs @@ -29,7 +29,7 @@ namespace System.Threading public object? ExceptionState => null; - internal ThreadAbortException(SerializationInfo info, StreamingContext context) + private ThreadAbortException(SerializationInfo info, StreamingContext context) : base(info, context) { } diff --git a/src/libraries/System.Private.CoreLib/src/System/TypeInitializationException.cs b/src/libraries/System.Private.CoreLib/src/System/TypeInitializationException.cs index 4586746..a0f5d08 100644 --- a/src/libraries/System.Private.CoreLib/src/System/TypeInitializationException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/TypeInitializationException.cs @@ -53,7 +53,7 @@ namespace System HResult = HResults.COR_E_TYPEINITIALIZATION; } - internal TypeInitializationException(SerializationInfo info, StreamingContext context) + private TypeInitializationException(SerializationInfo info, StreamingContext context) : base(info, context) { _typeName = info.GetString("TypeName"); diff --git a/src/libraries/System.Private.CoreLib/src/System/UnitySerializationHolder.cs b/src/libraries/System.Private.CoreLib/src/System/UnitySerializationHolder.cs index b369a7a..ac90cf1 100644 --- a/src/libraries/System.Private.CoreLib/src/System/UnitySerializationHolder.cs +++ b/src/libraries/System.Private.CoreLib/src/System/UnitySerializationHolder.cs @@ -31,7 +31,9 @@ namespace System info.AddValue("AssemblyName", string.Empty); } +#pragma warning disable CA2229 // public for compat public UnitySerializationHolder(SerializationInfo info, StreamingContext context) +#pragma warning restore CA2229 { if (info == null) { diff --git a/src/libraries/System.Private.CoreLib/src/System/WeakReference.T.cs b/src/libraries/System.Private.CoreLib/src/System/WeakReference.T.cs index 81c9ecc..73aac7f 100644 --- a/src/libraries/System.Private.CoreLib/src/System/WeakReference.T.cs +++ b/src/libraries/System.Private.CoreLib/src/System/WeakReference.T.cs @@ -31,7 +31,7 @@ namespace System Create(target, trackResurrection); } - internal WeakReference(SerializationInfo info, StreamingContext context) + private WeakReference(SerializationInfo info, StreamingContext context) { if (info == null) { -- 2.7.4