Address review feedback

src/Adapter/MSTest.Engine/Assertions/AssertFailedException.cs

@@ -82,6 +82,9 @@ public AssertFailedException(string message, Exception ex)
     {
     }
 
+#if NET8_0_OR_GREATER
+    [Obsolete(DiagnosticId = "SYSLIB0051")]
+#endif
     private AssertFailedException(SerializationInfo serializationInfo, StreamingContext streamingContext)
     {
     }

src/TestFramework/TestFramework/Constants.cs

@@ -9,6 +9,4 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting;
 internal static class Constants
 {
     internal const string PublicTypeObsoleteMessage = "We will remove or hide this type starting with v4. If you are using this type, reach out to our team on https://github.com/microsoft/testfx.";
-
-    internal const string LegacyFormatterImplementationMessage = "This API supports obsolete formatter-based serialization. It should not be called or extended by application code.";
 }

src/TestFramework/TestFramework/Exceptions/AssertFailedException.cs

@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if NETFRAMEWORK || NETSTANDARD2_0
 using System.ComponentModel;
 using System.Runtime.Serialization;
-#endif
 
 namespace Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -41,17 +39,17 @@ public AssertFailedException()
     {
     }
 
-#if NETFRAMEWORK || NETSTANDARD2_0
     /// <summary>
     /// Initializes a new instance of the <see cref="AssertFailedException"/> class.
     /// </summary>
     /// <param name="info">Serialization info.</param>
     /// <param name="context">Streaming context.</param>
-    [Obsolete(Constants.LegacyFormatterImplementationMessage)]
+#if NET8_0_OR_GREATER
+    [Obsolete(DiagnosticId = "SYSLIB0051")]
+#endif
     [EditorBrowsable(EditorBrowsableState.Never)]
     protected AssertFailedException(SerializationInfo info, StreamingContext context)
         : base(info, context)
     {
     }
-#endif
 }

src/TestFramework/TestFramework/Exceptions/AssertInconclusiveException.cs

@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if NETFRAMEWORK || NETSTANDARD2_0
 using System.ComponentModel;
 using System.Runtime.Serialization;
-#endif
 
 namespace Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -41,17 +39,17 @@ public AssertInconclusiveException()
     {
     }
 
-#if NETFRAMEWORK || NETSTANDARD2_0
     /// <summary>
     /// Initializes a new instance of the <see cref="AssertInconclusiveException"/> class.
     /// </summary>
     /// <param name="info">Serialization info.</param>
     /// <param name="context">Streaming context.</param>
-    [Obsolete(Constants.LegacyFormatterImplementationMessage)]
+#if NET8_0_OR_GREATER
+    [Obsolete(DiagnosticId = "SYSLIB0051")]
+#endif
     [EditorBrowsable(EditorBrowsableState.Never)]
     protected AssertInconclusiveException(SerializationInfo info, StreamingContext context)
         : base(info, context)
     {
     }
-#endif
 }

src/TestFramework/TestFramework/Exceptions/InternalTestFailureException.cs

@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if NETFRAMEWORK || NETSTANDARD2_0
 using System.ComponentModel;
 using System.Runtime.Serialization;
-#endif
 
 namespace Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -52,17 +50,17 @@ public InternalTestFailureException()
     {
     }
 
-#if NETFRAMEWORK || NETSTANDARD2_0
     /// <summary>
     /// Initializes a new instance of the <see cref="InternalTestFailureException"/> class.
     /// </summary>
     /// <param name="info">Serialization info.</param>
     /// <param name="context">Streaming context.</param>
-    [Obsolete(Constants.LegacyFormatterImplementationMessage)]
+#if NET8_0_OR_GREATER
+    [Obsolete(DiagnosticId = "SYSLIB0051")]
+#endif
     [EditorBrowsable(EditorBrowsableState.Never)]
     protected InternalTestFailureException(SerializationInfo info, StreamingContext context)
         : base(info, context)
     {
     }
-#endif
 }

src/TestFramework/TestFramework/Exceptions/UnitTestAssertException.cs

@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if NETFRAMEWORK || NETSTANDARD2_0
 using System.ComponentModel;
 using System.Runtime.Serialization;
-#endif
 
 namespace Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -40,17 +38,17 @@ protected UnitTestAssertException(string msg)
     {
     }
 
-#if NETFRAMEWORK || NETSTANDARD2_0
     /// <summary>
     /// Initializes a new instance of the <see cref="UnitTestAssertException"/> class.
     /// </summary>
     /// <param name="info">Serialization info.</param>
     /// <param name="context">Streaming context.</param>
-    [Obsolete(Constants.LegacyFormatterImplementationMessage)]
+#if NET8_0_OR_GREATER
+    [Obsolete(DiagnosticId = "SYSLIB0051")]
+#endif
     [EditorBrowsable(EditorBrowsableState.Never)]
     protected UnitTestAssertException(SerializationInfo info, StreamingContext context)
         : base(info, context)
     {
     }
-#endif
 }

src/TestFramework/TestFramework/PublicAPI/PublicAPI.Unshipped.txt

@@ -1,4 +1,5 @@
 #nullable enable
+<<<<<<< HEAD
 abstract Microsoft.VisualStudio.TestTools.UnitTesting.ConditionBaseAttribute.IgnoreMessage.get -> string?
 abstract Microsoft.VisualStudio.TestTools.UnitTesting.ConditionBaseAttribute.GroupName.get -> string!
 abstract Microsoft.VisualStudio.TestTools.UnitTesting.ConditionBaseAttribute.ShouldRun.get -> bool
@@ -375,3 +376,9 @@ static Microsoft.VisualStudio.TestTools.UnitTesting.Assert.ThrowsExactlyAsync<TE
 [MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.RetryResult
 [MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.RetryResult.AddResult(Microsoft.VisualStudio.TestTools.UnitTesting.TestResult![]! testResults) -> void
 [MSTESTEXP]Microsoft.VisualStudio.TestTools.UnitTesting.RetryResult.RetryResult() -> void
+=======
+Microsoft.VisualStudio.TestTools.UnitTesting.AssertFailedException.AssertFailedException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.AssertInconclusiveException.AssertInconclusiveException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.InternalTestFailureException.InternalTestFailureException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void
+Microsoft.VisualStudio.TestTools.UnitTesting.UnitTestAssertException.UnitTestAssertException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void
+>>>>>>> Address review feedback

src/TestFramework/TestFramework/TestFramework.csproj

@@ -17,12 +17,6 @@
 
     <AdditionalFiles Include="PublicAPI\net\PublicAPI.Shipped.txt" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netcoreapp3.1'))" />
     <AdditionalFiles Include="PublicAPI\net\PublicAPI.Unshipped.txt" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netcoreapp3.1'))" />
-
-    <AdditionalFiles Include="PublicAPI\netframework\PublicAPI.Shipped.txt" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net462'))" />
-    <AdditionalFiles Include="PublicAPI\netframework\PublicAPI.Unshipped.txt" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net462'))" />
-
-    <AdditionalFiles Include="PublicAPI\netstandard2.0\PublicAPI.Shipped.txt" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-    <AdditionalFiles Include="PublicAPI\netstandard2.0\PublicAPI.Unshipped.txt" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
   </ItemGroup>
 
   <ItemGroup>

test/UnitTests/TestFramework.UnitTests/Exceptions/BinaryFormatterExceptionSerializationTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if NETFRAMEWORK
 using System.Runtime.Serialization.Formatters.Binary;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -10,15 +9,15 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.TestFramework.UnitTests.Attributes;
 
-public class BinaryFormatterExceptionSerializationTests : TestContainer
+[Obsolete]
+public sealed class BinaryFormatterExceptionSerializationTests : TestContainer
 {
     public void AssertFailedExceptionCanBeSerializedAndDeserialized()
         => VerifySerialization(Assert.Fail);
 
     public void AssertInconclusiveExceptionCanBeSerializedAndDeserialized()
         => VerifySerialization(Assert.Inconclusive);
 
-    [Obsolete]
     public void InternalTestFailureExceptionCanBeSerializedAndDeserialized()
         => VerifySerialization(() => throw new InternalTestFailureException("Some internal error."));
 
@@ -43,4 +42,3 @@ private void VerifySerialization(Action actionThatThrows)
         throw new InvalidOperationException($"The provided '{nameof(actionThatThrows)}' did not throw any exception.");
     }
 }
-#endif