From b59a50056da89776117ff66f0526c9d49a888b1a Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Wed, 14 Jun 2017 12:36:18 -0400 Subject: [PATCH] Remove [Serializable] from VB types (#21046) --- .../CompilerServices/ExceptionUtils.vb | 5 ---- .../IncompleteInitialization.vb | 8 ------- .../CompilerServices/StaticLocalInitFlag.vb | 1 - .../tests/Microsoft.VisualBasic.Tests.csproj | 3 +-- .../tests/SerializationTests.cs | 23 ------------------- 5 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 src/Microsoft.VisualBasic/tests/SerializationTests.cs diff --git a/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/ExceptionUtils.vb b/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/ExceptionUtils.vb index 54c4ec9a813a..9e1a658cc55e 100644 --- a/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/ExceptionUtils.vb +++ b/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/ExceptionUtils.vb @@ -58,7 +58,6 @@ Namespace Microsoft.VisualBasic.CompilerServices End Class - Public NotInheritable Class InternalErrorException Inherits System.Exception @@ -75,10 +74,6 @@ Namespace Microsoft.VisualBasic.CompilerServices MyBase.New(GetResourceString(SR.InternalError)) End Sub - Private Sub New(ByVal info As System.Runtime.Serialization.SerializationInfo, ByVal context As System.Runtime.Serialization.StreamingContext) - MyBase.New(info, context) - End Sub - End Class End Namespace diff --git a/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/IncompleteInitialization.vb b/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/IncompleteInitialization.vb index 416358d810bf..52f2af042c67 100644 --- a/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/IncompleteInitialization.vb +++ b/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/IncompleteInitialization.vb @@ -5,19 +5,11 @@ Namespace Global.Microsoft.VisualBasic.CompilerServices - Public Class IncompleteInitialization Inherits Global.System.Exception Public Sub New() MyBase.New() End Sub -#Disable Warning CA2229 ' Rule wants ctor to be protected, but private to match desktop - - Private Sub New(ByVal info As System.Runtime.Serialization.SerializationInfo, ByVal context As System.Runtime.Serialization.StreamingContext) - MyBase.New(info, context) - End Sub -#Enable Warning CA2229 ' Implement Serialization constructor - End Class End Namespace diff --git a/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StaticLocalInitFlag.vb b/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StaticLocalInitFlag.vb index 0749b449280c..4805db4aa236 100644 --- a/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StaticLocalInitFlag.vb +++ b/src/Microsoft.VisualBasic/src/Microsoft/VisualBasic/CompilerServices/StaticLocalInitFlag.vb @@ -5,7 +5,6 @@ Namespace Global.Microsoft.VisualBasic.CompilerServices - Public Class StaticLocalInitFlag Public State As Short End Class diff --git a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj index c55152b7f0e9..0566fda5870b 100644 --- a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj +++ b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj @@ -7,7 +7,6 @@ - CommonTest\System\PlatformDetection.cs @@ -17,4 +16,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.VisualBasic/tests/SerializationTests.cs b/src/Microsoft.VisualBasic/tests/SerializationTests.cs deleted file mode 100644 index c7b974ee7863..000000000000 --- a/src/Microsoft.VisualBasic/tests/SerializationTests.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.Serialization.Formatters.Tests; -using Microsoft.VisualBasic.CompilerServices; -using Xunit; - -namespace Microsoft.VisualBasic.Tests -{ - public class SerializationTests - { - [Fact] - public void SerializeDeserialize_Roundtrip_Success() - { - BinaryFormatterHelpers.AssertRoundtrips(new IncompleteInitialization()); - - var initFlag = new StaticLocalInitFlag { State = 42 }; - var clonedInitFlag = BinaryFormatterHelpers.Clone(initFlag); - Assert.Equal(42, clonedInitFlag.State); - } - } -}