Remove BinaryFormatter altogether

src/Orleans.Core/Core/DefaultClientServices.cs

@@ -56,7 +56,6 @@ public static void AddDefaultServices(IClientBuilder builder, IServiceCollection
             services.TryAddSingleton<ImrRpcProvider>();
             services.TryAddSingleton<ImrGrainMethodInvokerProvider>();
             services.TryAddSingleton<GrainReferenceSerializer>();
-            services.TryAddSingleton<BinaryFormatterGrainReferenceSurrogateSelector>();
             services.TryAddSingleton<GrainReferenceKeyStringConverter>();
             services.TryAddSingleton<IGrainReferenceRuntime, GrainReferenceRuntime>();
             services.TryAddSingleton<GrainInterfaceTypeResolver>();
@@ -87,13 +86,8 @@ public static void AddDefaultServices(IClientBuilder builder, IServiceCollection
             services.AddSingleton<DotNetSerializableSerializer>();
             services.AddFromExisting<IKeyedSerializer, DotNetSerializableSerializer>();
 
-            services.AddSingleton<BinaryFormatterSerializer>();
-            services.AddSingleton<BinaryFormatterISerializableSerializer>();
-            services.AddFromExisting<IKeyedSerializer, BinaryFormatterISerializableSerializer>();
-#pragma warning disable CS0618 // Type or member is obsolete
             services.TryAddSingleton<ILBasedSerializer>();
             services.AddFromExisting<IKeyedSerializer, ILBasedSerializer>();
-#pragma warning restore CS0618 // Type or member is obsolete
 
             // Application parts
             var parts = builder.GetApplicationPartManager();

src/Orleans.Core/Serialization/ILBasedSerializer.cs

@@ -1,14 +1,13 @@
+using System;
+using System.Collections.Concurrent;
+using System.Reflection;
+using Orleans.Runtime;
+
 namespace Orleans.Serialization
 {
-    using System;
-    using System.Collections.Concurrent;
-    using System.Reflection;
-    using Orleans.Runtime;
-
     /// <summary>
     /// Fallback serializer to be used when other serializers are unavailable.
     /// </summary>
-    [Obsolete("Obsolete in favor of other serializers.")]
     public class ILBasedSerializer : IKeyedSerializer
     {
         private static readonly Type ExceptionType = typeof(Exception);

src/Orleans.Core/Serialization/KeyedSerializerId.cs

@@ -12,9 +12,7 @@ internal enum KeyedSerializerId : byte
         /// </summary>
         ILBasedSerializer = 1,
 
-        /// <summary>
-        /// <see cref="Orleans.Serialization.BinaryFormatterISerializableSerializer"/>
-        /// </summary>
+        [Obsolete("Removed")]
         BinaryFormatterISerializable = 2,
 
         /// <summary>

src/Orleans.Core/Serialization/SerializationManager.cs

@@ -1654,7 +1654,7 @@ private IExternalSerializer GetFallbackSerializer(IServiceProvider serviceProvid
             }
             else
             {
-                serializer = new BinaryFormatterSerializer(this.ServiceProvider);
+                serializer = this.ServiceProvider.GetRequiredService<ILBasedSerializer>();
             }
             return serializer;
         }

src/Orleans.Runtime/Hosting/DefaultSiloServices.cs

@@ -124,7 +124,6 @@ internal static void AddDefaultServices(IApplicationPartManager applicationPartM
             services.TryAddSingleton<ImrRpcProvider>();
             services.TryAddSingleton<ImrGrainMethodInvokerProvider>();
             services.TryAddSingleton<GrainReferenceSerializer>();
-            services.TryAddSingleton<BinaryFormatterGrainReferenceSurrogateSelector>();
             services.TryAddSingleton<GrainReferenceKeyStringConverter>();
             services.AddSingleton<GrainVersionManifest>();
             services.TryAddSingleton<TypeMetadataCache>();
@@ -305,14 +304,9 @@ internal static void AddDefaultServices(IApplicationPartManager applicationPartM
             services.AddSingleton<DotNetSerializableSerializer>();
             services.AddFromExisting<IKeyedSerializer, DotNetSerializableSerializer>();
 
-            services.AddSingleton<BinaryFormatterSerializer>();
-            services.AddSingleton<BinaryFormatterISerializableSerializer>();
-            services.AddFromExisting<IKeyedSerializer, BinaryFormatterISerializableSerializer>();
 
-#pragma warning disable CS0618 // Type or member is obsolete
             services.AddSingleton<ILBasedSerializer>();
             services.AddFromExisting<IKeyedSerializer, ILBasedSerializer>();
-#pragma warning restore CS0618 // Type or member is obsolete
 
             // Transactions
             services.TryAddSingleton<ITransactionAgent, DisabledTransactionAgent>();

src/Orleans.TestingHost/Utils/TestingUtils.cs

@@ -4,7 +4,6 @@
 using System.IO;
 using System.Net;
 using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
@@ -128,24 +127,5 @@ public static void ConfigureThreadPoolSettingsForStorageTests(int numDotNetPoolT
             ServicePointManager.DefaultConnectionLimit = numDotNetPoolThreads; // 1000;
             ServicePointManager.UseNagleAlgorithm = false;
         }
-
-        /// <summary> Serialize and deserialize the input </summary>
-        /// <typeparam name="T">The type of the input</typeparam>
-        /// <param name="input">The input to serialize and deserialize</param>
-        /// <param name="grainFactory">The grain factory.</param>
-        /// <param name="serializationManager">The serialization manager.</param>
-        /// <returns>Input that have been serialized and then deserialized</returns>
-        public static T RoundTripDotNetSerializer<T>(T input, IGrainFactory grainFactory, SerializationManager serializationManager)
-        {
-            IFormatter formatter = new BinaryFormatter();
-            MemoryStream stream = new MemoryStream(new byte[100000], true);
-            formatter.Context = new StreamingContext(StreamingContextStates.All, new SerializationContext(serializationManager));
-            formatter.SurrogateSelector = serializationManager.ServiceProvider.GetRequiredService<BinaryFormatterGrainReferenceSurrogateSelector>();
-            formatter.Serialize(stream, input);
-            stream.Position = 0;
-            T output = (T)formatter.Deserialize(stream);
-
-            return output;
-        }
     }
 }