Scale back [Serializable] CoreFX types (dotnet#19742)

* Remove SerializableAttribute from many CoreFX types that will not be serializable. * Removes serialization tests for types that are no longer serializable and fixes serializing a couple of types. Includes marking some internal serializable types as public so that they'll be reflectible with .NET Native. * Remove unneeded pragmas * Update based on review comments
MaximLipnin · May 16, 2017 · 6dd451f · 6dd451f
1 parent b0900bb
commit 6dd451f
Show file tree

Hide file tree

Showing 460 changed files with 42 additions and 858 deletions.
diff --git a/CodeAnalysis.ruleset b/CodeAnalysis.ruleset
@@ -19,7 +19,7 @@
     <Rule Id="CA2229" Action="Error" /> <!-- Serializable type doesn't have a serialization constructor -->
     <Rule Id="CA2235" Action="None" /> <!-- Serializable type has non serializable field -->
     <Rule Id="CA2231" Action="None" /> <!-- Overload operator equals when overriding ValueType.Equals -->
-    <Rule Id="CA2237" Action="Error" /> <!-- Add [Serializable] to types that implement ISerializable -->
+    <Rule Id="CA2237" Action="None" /> <!-- Add [Serializable] to types that implement ISerializable -->
 
     <Rule Id="CA2200" Action="None"/> <!-- Rethrowing caught exception changes stack information -->
 

diff --git a/src/Common/src/System/CodeDom/CodeObject.cs b/src/Common/src/System/CodeDom/CodeObject.cs
@@ -11,7 +11,6 @@ namespace System.CodeDom
 namespace System.Runtime.Serialization
 #endif
 {
-    [Serializable]
 #if !FEATURE_SERIALIZATION
     public class CodeObject
 #else

diff --git a/src/Common/src/System/CodeDom/CodeTypeReference.cs b/src/Common/src/System/CodeDom/CodeTypeReference.cs
@@ -23,7 +23,6 @@ internal enum CodeTypeReferenceOptions
         GenericTypeParameter = 0x00000002
     }
 
-    [Serializable]
 #if !FEATURE_SERIALIZATION
     public class CodeTypeReference : CodeObject
 #else

diff --git a/src/Common/src/System/CodeDom/CodeTypeReferenceCollection.cs b/src/Common/src/System/CodeDom/CodeTypeReferenceCollection.cs
@@ -10,7 +10,6 @@ namespace System.CodeDom
 namespace System.Runtime.Serialization
 #endif
 {
-    [Serializable]
 #if !FEATURE_SERIALIZATION
     public class CodeTypeReferenceCollection : CollectionBase
 #else

diff --git a/src/Common/src/System/Collections/CompatibleComparer.cs b/src/Common/src/System/Collections/CompatibleComparer.cs
@@ -6,7 +6,6 @@
 
 namespace System.Collections
 {
-    [Serializable]
     internal sealed class CompatibleComparer : IEqualityComparer
     {
         private readonly IHashCodeProvider _hcp;

diff --git a/src/Common/src/System/Data/Common/NameValuePair.cs b/src/Common/src/System/Data/Common/NameValuePair.cs
@@ -7,7 +7,6 @@
 
 namespace System.Data.Common
 {
-    [Serializable]
     internal sealed class NameValuePair
     {
         readonly private string _name;

diff --git a/src/Common/src/System/Net/NetworkInformation/NetworkInformationException.cs b/src/Common/src/System/Net/NetworkInformation/NetworkInformationException.cs
@@ -14,7 +14,6 @@ namespace System.Net.NetworkInformation
     ///       Provides NetworkInformation exceptions to the application.
     ///    </para>
     /// </devdoc>
-    [Serializable]
     public class NetworkInformationException : Win32Exception
     {
         /// <devdoc>

diff --git a/src/Common/src/System/Text/DBCSDecoder.cs b/src/Common/src/System/Text/DBCSDecoder.cs
@@ -8,7 +8,6 @@
 
 namespace System.Text
 {
-    [Serializable]
     internal sealed class DecoderDBCS : Decoder
     {
         private readonly Encoding _encoding;

diff --git a/src/Common/src/System/Text/OSEncoder.cs b/src/Common/src/System/Text/OSEncoder.cs
@@ -8,7 +8,6 @@
 
 namespace System.Text
 {
-    [Serializable]
     internal sealed class OSEncoder : Encoder
     {
         private char _charLeftOver;

diff --git a/src/Common/src/System/Text/OSEncoding.Windows.cs b/src/Common/src/System/Text/OSEncoding.Windows.cs
@@ -9,7 +9,6 @@
 
 namespace System.Text
 {
-    [Serializable]
     internal sealed class OSEncoding : Encoding
     {
         private readonly int _codePage;

diff --git a/src/Common/tests/System/Collections/IEnumerable.Generic.Serialization.Tests.cs b/src/Common/tests/System/Collections/IEnumerable.Generic.Serialization.Tests.cs
@@ -15,6 +15,13 @@ public abstract partial class IEnumerable_Generic_Tests<T> : TestBase<T>
         public void IGenericSharedAPI_SerializeDeserialize(int count)
         {
             IEnumerable<T> expected = GenericIEnumerableFactory(count);
+
+            // Not all IEnumerables are intended to be Serializable
+            if (!expected.GetType().IsSerializable)
+            {
+                return;
+            }
+
             IEnumerable<T> actual = BinaryFormatterHelpers.Clone(expected);
 
             if (Order == EnumerableOrder.Sequential)

diff --git a/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderException.cs b/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderException.cs
@@ -12,7 +12,6 @@ namespace Microsoft.CSharp.RuntimeBinder
     /// <see cref="RuntimeBinderException"/> represents a failure to bind in the sense of a usual compiler error, whereas <see cref="RuntimeBinderInternalCompilerException"/>
     /// represents a malfunctioning of the runtime binder itself.
     /// </summary>
-    [Serializable]
     public class RuntimeBinderException : Exception
     {
         /// <summary>

diff --git a/...osoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderInternalCompilerException.cs b/...osoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderInternalCompilerException.cs
@@ -12,7 +12,6 @@ namespace Microsoft.CSharp.RuntimeBinder
     /// <see cref="RuntimeBinderException"/> represents a failure to bind in the sense of a usual compiler error, whereas <see cref="RuntimeBinderInternalCompilerException"/>
     /// represents a malfunctioning of the runtime binder itself.
     /// </summary>
-    [Serializable]
     public class RuntimeBinderInternalCompilerException : Exception
     {
         /// <summary>

diff --git a/src/Microsoft.CSharp/tests/RuntimeBinderExceptionTests.cs b/src/Microsoft.CSharp/tests/RuntimeBinderExceptionTests.cs
@@ -20,7 +20,6 @@ public void NullaryCtor()
             Assert.Empty(rbe.Data);
             Assert.True((rbe.HResult & 0xFFFF0000) == 0x80130000); // Error from .NET
             Assert.Contains(rbe.GetType().FullName, rbe.Message); // Localized, but should contain type name.
-            BinaryFormatterHelpers.AssertRoundtrips(rbe);
         }
 
         [Fact]
@@ -34,7 +33,6 @@ public void StringCtor()
             Assert.Same(message, rbe.Message);
             rbe = new RuntimeBinderException(null);
             Assert.Equal(new RuntimeBinderException().Message, rbe.Message);
-            BinaryFormatterHelpers.AssertRoundtrips(rbe);
         }
 
 
@@ -45,7 +43,6 @@ public void InnerExceptionCtor()
             Exception inner = new Exception("This is a test exception");
             RuntimeBinderException rbe = new RuntimeBinderException(message, inner);
             Assert.Same(inner, rbe.InnerException);
-            BinaryFormatterHelpers.AssertRoundtrips(rbe);
         }
     }
 }
diff --git a/src/Microsoft.CSharp/tests/RuntimeBinderInternalCompilerExceptionTests.cs b/src/Microsoft.CSharp/tests/RuntimeBinderInternalCompilerExceptionTests.cs
@@ -18,7 +18,6 @@ public void NullaryCtor()
             Assert.Empty(rbe.Data);
             Assert.True((rbe.HResult & 0xFFFF0000) == 0x80130000); // Error from .NET
             Assert.Contains(rbe.GetType().FullName, rbe.Message); // Localized, but should contain type name.
-            BinaryFormatterHelpers.AssertRoundtrips(rbe);
         }
 
         [Fact]
@@ -32,7 +31,6 @@ public void StringCtor()
             Assert.Same(message, rbe.Message);
             rbe = new RuntimeBinderInternalCompilerException(null);
             Assert.Equal(new RuntimeBinderInternalCompilerException().Message, rbe.Message);
-            BinaryFormatterHelpers.AssertRoundtrips(rbe);
         }
 
 
@@ -43,7 +41,6 @@ public void InnerExceptionCtor()
             Exception inner = new Exception("This is a test exception");
             RuntimeBinderInternalCompilerException rbe = new RuntimeBinderInternalCompilerException(message, inner);
             Assert.Same(inner, rbe.InnerException);
-            BinaryFormatterHelpers.AssertRoundtrips(rbe);
         }
     }
 }
diff --git a/src/Microsoft.Win32.Primitives/src/System/ComponentModel/Win32Exception.cs b/src/Microsoft.Win32.Primitives/src/System/ComponentModel/Win32Exception.cs
@@ -10,7 +10,6 @@ namespace System.ComponentModel
     /// <devdoc>
     ///    <para>The exception that is thrown for a Win32 error code.</para>
     /// </devdoc>
-    [Serializable]
     public partial class Win32Exception : ExternalException, ISerializable
     {
         /// <devdoc>

diff --git a/src/Microsoft.Win32.Primitives/tests/Win32Exception.cs b/src/Microsoft.Win32.Primitives/tests/Win32Exception.cs
@@ -102,23 +102,6 @@ public static void InstantiateExceptionWithLongErrorString()
             }
         }
 
-        public static IEnumerable<object[]> SerializeDeserialize_MemberData()
-        {
-            yield return new object[] { new Win32Exception() };
-            yield return new object[] { new Win32Exception(42) };
-            yield return new object[] { new Win32Exception(-42) };
-            yield return new object[] { new Win32Exception("some message") };
-            yield return new object[] { new Win32Exception(42, "some message") };
-            yield return new object[] { new Win32Exception("some message", new InvalidOperationException()) };
-        }
-
-        [Theory]
-        [MemberData(nameof(SerializeDeserialize_MemberData))]
-        public static void SerializeDeserialize(Win32Exception exception)
-        {
-            BinaryFormatterHelpers.AssertRoundtrips(exception, e => e.NativeErrorCode, e => e.ErrorCode);
-        }
-
         [Fact]
         public static void GetObjectData_InvalidArgs_Throws()
         {

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeArgumentReferenceExpression.cs b/src/System.CodeDom/src/System/CodeDom/CodeArgumentReferenceExpression.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeArgumentReferenceExpression : CodeExpression
     {
         private string _parameterName;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeArrayCreateExpression.cs b/src/System.CodeDom/src/System/CodeDom/CodeArrayCreateExpression.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeArrayCreateExpression : CodeExpression
     {
         private readonly CodeExpressionCollection _initializers = new CodeExpressionCollection();

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeArrayIndexerExpression.cs b/src/System.CodeDom/src/System/CodeDom/CodeArrayIndexerExpression.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeArrayIndexerExpression : CodeExpression
     {
         private CodeExpressionCollection _indices;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeAssignStatement.cs b/src/System.CodeDom/src/System/CodeDom/CodeAssignStatement.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeAssignStatement : CodeStatement
     {
         public CodeAssignStatement() { }

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeAttachEventStatement.cs b/src/System.CodeDom/src/System/CodeDom/CodeAttachEventStatement.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeAttachEventStatement : CodeStatement
     {
         private CodeEventReferenceExpression _eventRef;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeAttributeArgument.cs b/src/System.CodeDom/src/System/CodeDom/CodeAttributeArgument.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeAttributeArgument
     {
         private string _name;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeAttributeArgumentCollection.cs b/src/System.CodeDom/src/System/CodeDom/CodeAttributeArgumentCollection.cs
@@ -6,7 +6,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeAttributeArgumentCollection : CollectionBase
     {
         public CodeAttributeArgumentCollection() { }

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeAttributeDeclaration.cs b/src/System.CodeDom/src/System/CodeDom/CodeAttributeDeclaration.cs
@@ -5,7 +5,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeAttributeDeclaration
     {
         private string _name;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeAttributeDeclarationCollection.cs b/src/System.CodeDom/src/System/CodeDom/CodeAttributeDeclarationCollection.cs
@@ -6,7 +6,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeAttributeDeclarationCollection : CollectionBase
     {
         public CodeAttributeDeclarationCollection()

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeBaseReferenceExpression.cs b/src/System.CodeDom/src/System/CodeDom/CodeBaseReferenceExpression.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeBaseReferenceExpression : CodeExpression
     {
     }

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeBinaryOperatorExpression.cs b/src/System.CodeDom/src/System/CodeDom/CodeBinaryOperatorExpression.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeBinaryOperatorExpression : CodeExpression
     {
         public CodeBinaryOperatorExpression() { }

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeCastExpression.cs b/src/System.CodeDom/src/System/CodeDom/CodeCastExpression.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeCastExpression : CodeExpression
     {
         private CodeTypeReference _targetType;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeCatchClause.cs b/src/System.CodeDom/src/System/CodeDom/CodeCatchClause.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeCatchClause
     {
         private CodeStatementCollection _statements;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeCatchClauseCollection.cs b/src/System.CodeDom/src/System/CodeDom/CodeCatchClauseCollection.cs
@@ -6,7 +6,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeCatchClauseCollection : CollectionBase
     {
         public CodeCatchClauseCollection() { }

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeChecksumPragma.cs b/src/System.CodeDom/src/System/CodeDom/CodeChecksumPragma.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeChecksumPragma : CodeDirective
     {
         private string _fileName;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeComment.cs b/src/System.CodeDom/src/System/CodeDom/CodeComment.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeComment : CodeObject
     {
         private string _text;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeCommentStatement.cs b/src/System.CodeDom/src/System/CodeDom/CodeCommentStatement.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeCommentStatement : CodeStatement
     {
         public CodeCommentStatement() { }

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeCommentStatementCollection.cs b/src/System.CodeDom/src/System/CodeDom/CodeCommentStatementCollection.cs
@@ -6,7 +6,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeCommentStatementCollection : CollectionBase
     {
         public CodeCommentStatementCollection() { }

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeCompileUnit.cs b/src/System.CodeDom/src/System/CodeDom/CodeCompileUnit.cs
@@ -6,7 +6,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeCompileUnit : CodeObject
     {
         private StringCollection _assemblies = null;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeConditionStatement.cs b/src/System.CodeDom/src/System/CodeDom/CodeConditionStatement.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeConditionStatement : CodeStatement
     {
         public CodeConditionStatement() { }

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeConstructor.cs b/src/System.CodeDom/src/System/CodeDom/CodeConstructor.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeConstructor : CodeMemberMethod
     {
         public CodeConstructor()

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeDefaultValueExpression.cs b/src/System.CodeDom/src/System/CodeDom/CodeDefaultValueExpression.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeDefaultValueExpression : CodeExpression
     {
         private CodeTypeReference _type;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeDelegateCreateExpression.cs b/src/System.CodeDom/src/System/CodeDom/CodeDelegateCreateExpression.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeDelegateCreateExpression : CodeExpression
     {
         private CodeTypeReference _delegateType;

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeDelegateInvokeExpression.cs b/src/System.CodeDom/src/System/CodeDom/CodeDelegateInvokeExpression.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeDelegateInvokeExpression : CodeExpression
     {
         public CodeDelegateInvokeExpression() { }

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeDirectionExpression.cs b/src/System.CodeDom/src/System/CodeDom/CodeDirectionExpression.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeDirectionExpression : CodeExpression
     {
         public CodeDirectionExpression() { }

diff --git a/src/System.CodeDom/src/System/CodeDom/CodeDirective.cs b/src/System.CodeDom/src/System/CodeDom/CodeDirective.cs
@@ -4,7 +4,6 @@
 
 namespace System.CodeDom
 {
-    [Serializable]
     public class CodeDirective : CodeObject
     {
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ @@
     namespace System.CodeDom
     {
-        [Serializable]
         public class CodeBaseReferenceExpression : CodeExpression
         {
         }
@@ Expand Down @@