Use PayloadReader in System.Resources.Extensions

src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln

@@ -55,6 +55,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{DB5983
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{7FF9B3DF-E383-4487-9ADB-E3BF59CFCE83}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions.Compat.Tests", "tests\CompatTests\System.Resources.Extensions.Compat.Tests.csproj", "{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions.BinaryFormat.Tests", "tests\BinaryFormatTests\System.Resources.Extensions.BinaryFormat.Tests.csproj", "{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -503,6 +507,66 @@ Global
 		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Checked|arm64.ActiveCfg = Debug|Any CPU
 		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Checked|x64.ActiveCfg = Debug|Any CPU
 		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Checked|arm.Build.0 = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Checked|arm64.Build.0 = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Checked|x64.Build.0 = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Checked|x86.Build.0 = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Debug|arm.Build.0 = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Debug|arm64.Build.0 = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Debug|x86.Build.0 = Debug|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Release|arm.ActiveCfg = Release|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Release|arm.Build.0 = Release|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Release|arm64.ActiveCfg = Release|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Release|arm64.Build.0 = Release|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Release|x64.Build.0 = Release|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1}.Release|x86.Build.0 = Release|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Checked|arm.ActiveCfg = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Checked|arm.Build.0 = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Checked|arm64.ActiveCfg = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Checked|arm64.Build.0 = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Checked|x64.Build.0 = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Checked|x86.Build.0 = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Debug|arm.Build.0 = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Debug|arm64.Build.0 = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Debug|x64.Build.0 = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Debug|x86.Build.0 = Debug|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Release|arm.ActiveCfg = Release|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Release|arm.Build.0 = Release|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Release|arm64.ActiveCfg = Release|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Release|arm64.Build.0 = Release|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Release|x64.ActiveCfg = Release|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Release|x64.Build.0 = Release|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Release|x86.ActiveCfg = Release|Any CPU
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -531,6 +595,8 @@ Global
 		{BE197124-901B-4517-879B-93D0E6684A2C} = {7FF9B3DF-E383-4487-9ADB-E3BF59CFCE83}
 		{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC} = {DB598308-6179-48EA-A670-0DA6CE5D8340}
 		{DB598308-6179-48EA-A670-0DA6CE5D8340} = {7FF9B3DF-E383-4487-9ADB-E3BF59CFCE83}
+		{BD76A85A-8E6F-4D4C-A628-661EFE6999F1} = {2195CD2B-EF9E-46A7-B4AA-A2CD31625957}
+		{4D72DCD5-BB24-47ED-9B98-8E0B49A9F314} = {2195CD2B-EF9E-46A7-B4AA-A2CD31625957}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E201426B-999F-48A5-BCFD-3E757AA0E182}

src/libraries/System.Resources.Extensions/src/BinaryFormat/BinaryFormattedObject.IParseState.cs

@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization.BinaryFormat;
+
+namespace System.Resources.Extensions.BinaryFormat;
+
+internal sealed partial class BinaryFormattedObject
+{
+    /// <summary>
+    ///  Parsing state.
+    /// </summary>
+    internal interface IParseState
+    {
+        BinaryReader Reader { get; }
+        IReadOnlyDictionary<int, SerializationRecord> RecordMap { get; }
+        Options Options { get; }
+        ITypeResolver TypeResolver { get; }
+    }
+}

src/libraries/System.Resources.Extensions/src/BinaryFormat/BinaryFormattedObject.ITypeResolver.cs

@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection.Metadata;
+
+namespace System.Resources.Extensions.BinaryFormat;
+
+internal sealed partial class BinaryFormattedObject
+{
+    /// <summary>
+    ///  Resolver for types.
+    /// </summary>
+    internal interface ITypeResolver
+    {
+        /// <summary>
+        ///  Resolves the given type name against the specified library.
+        /// </summary>
+        [RequiresUnreferencedCode("Calls System.Reflection.Assembly.GetType(String)")]
+        [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+        Type GetType(TypeName typeName);
+    }
+}

src/libraries/System.Resources.Extensions/src/BinaryFormat/BinaryFormattedObject.Options.cs

@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters;
+
+namespace System.Resources.Extensions.BinaryFormat;
+
+#pragma warning disable SYSLIB0050 // Type or member is obsolete
+
+internal sealed partial class BinaryFormattedObject
+{
+    internal sealed class Options
+    {
+        /// <summary>
+        ///  How exactly assembly names need to match for deserialization.
+        /// </summary>
+
+        public FormatterAssemblyStyle AssemblyMatching { get; set; } = FormatterAssemblyStyle.Simple;
+
+        /// <summary>
+        ///  Type name binder.
+        /// </summary>
+        public SerializationBinder? Binder { get; set; }
+
+        /// <summary>
+        ///  Optional type <see cref="ISerializationSurrogate"/> provider.
+        /// </summary>
+        public ISurrogateSelector? SurrogateSelector { get; set; }
+
+        /// <summary>
+        ///  Streaming context.
+        /// </summary>
+        public StreamingContext StreamingContext { get; set; } = new(StreamingContextStates.All);
+    }
+}
+
+#pragma warning restore SYSLIB0050 // Type or member is obsolete

src/libraries/System.Resources.Extensions/src/BinaryFormat/BinaryFormattedObject.ParseState.cs

@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization.BinaryFormat;
+
+namespace System.Resources.Extensions.BinaryFormat;
+
+internal sealed partial class BinaryFormattedObject
+{
+    /// <summary>
+    ///  Parsing state for <see cref="BinaryFormattedObject"/>.
+    /// </summary>
+    internal sealed class ParseState : IParseState
+    {
+        private readonly BinaryFormattedObject _format;
+
+        public ParseState(BinaryReader reader, BinaryFormattedObject format)
+        {
+            Reader = reader;
+            _format = format;
+        }
+
+        public BinaryReader Reader { get; }
+        public IReadOnlyDictionary<int, SerializationRecord> RecordMap => _format.RecordMap;
+        public Options Options => _format._options;
+        public ITypeResolver TypeResolver => _format.TypeResolver;
+    }
+}

src/libraries/System.Resources.Extensions/src/BinaryFormat/BinaryFormattedObject.TypeResolver.cs

@@ -0,0 +1,139 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Metadata;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters;
+
+#pragma warning disable SYSLIB0050 // Type or member is obsolete
+
+namespace System.Resources.Extensions.BinaryFormat;
+
+internal sealed partial class BinaryFormattedObject
+{
+    internal sealed class DefaultTypeResolver : ITypeResolver
+    {
+        private readonly FormatterAssemblyStyle _assemblyMatching;
+        private readonly SerializationBinder? _binder;
+
+        private readonly Dictionary<string, Assembly> _assemblies = [];
+        private readonly Dictionary<string, Type> _types = [];
+
+        internal DefaultTypeResolver(Options options)
+        {
+            _assemblyMatching = options.AssemblyMatching;
+            _binder = options.Binder;
+        }
+
+        /// <summary>
+        ///  Resolves the given type name against the specified library.
+        /// </summary>
+        [RequiresUnreferencedCode("Calls System.Reflection.Assembly.GetType(String)")]
+        [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+        Type ITypeResolver.GetType(TypeName typeName)
+        {
+            Debug.Assert(typeName.AssemblyName is not null);
+
+            if (_types.TryGetValue(typeName.AssemblyQualifiedName, out Type? cachedType))
+            {
+                return cachedType;
+            }
+
+            if (_binder?.BindToType(typeName.AssemblyName.FullName, typeName.FullName) is Type binderType)
+            {
+                // BinaryFormatter is inconsistent about what caching behavior you get with binders.
+                // It would always cache the last item from the binder, but wouldn't put the result
+                // in the type cache. This could lead to inconsistent results if the binder didn't
+                // always return the same result for a given set of strings. Choosing to always cache
+                // for performance.
+
+                _types[typeName.AssemblyQualifiedName] = binderType;
+                return binderType;
+            }
+
+            if (!_assemblies.TryGetValue(typeName.AssemblyName.FullName, out Assembly? assembly))
+            {
+                AssemblyName assemblyName = typeName.AssemblyName.ToAssemblyName();
+                try
+                {
+                    assembly = Assembly.Load(assemblyName);
+                }
+                catch
+                {
+                    if (_assemblyMatching != FormatterAssemblyStyle.Simple)
+                    {
+                        throw;
+                    }
+
+                    assembly = Assembly.Load(assemblyName.Name!);
+                }
+
+                _assemblies.Add(typeName.AssemblyName.FullName, assembly);
+            }
+
+            Type? type = _assemblyMatching != FormatterAssemblyStyle.Simple
+                ? assembly.GetType(typeName.FullName)
+                : GetSimplyNamedTypeFromAssembly(assembly, typeName);
+
+            _types[typeName.AssemblyQualifiedName] = type ?? throw new SerializationException($"Could not find type '{typeName}'.");
+            return type;
+        }
+
+        [RequiresUnreferencedCode("Calls System.Reflection.Assembly.GetType(String, Boolean, Boolean)")]
+        private static Type? GetSimplyNamedTypeFromAssembly(Assembly assembly, TypeName typeName)
+        {
+            // Catching any exceptions that could be thrown from a failure on assembly load
+            // This is necessary, for example, if there are generic parameters that are qualified
+            // with a version of the assembly that predates the one available.
+
+            try
+            {
+                return assembly.GetType(typeName.FullName, throwOnError: false, ignoreCase: false);
+            }
+            catch (TypeLoadException) { }
+            catch (FileNotFoundException) { }
+            catch (FileLoadException) { }
+            catch (BadImageFormatException) { }
+
+            return Type.GetType(typeName.FullName, ResolveSimpleAssemblyName, new TopLevelAssemblyTypeResolver(assembly).ResolveType, throwOnError: false);
+
+            static Assembly? ResolveSimpleAssemblyName(AssemblyName assemblyName)
+            {
+                try
+                {
+                    return Assembly.Load(assemblyName);
+                }
+                catch { }
+
+                try
+                {
+                    return Assembly.Load(assemblyName.Name!);
+                }
+                catch { }
+
+                return null;
+            }
+        }
+
+        private sealed class TopLevelAssemblyTypeResolver
+        {
+            private readonly Assembly _topLevelAssembly;
+
+            public TopLevelAssemblyTypeResolver(Assembly topLevelAssembly) => _topLevelAssembly = topLevelAssembly;
+
+            [RequiresUnreferencedCode("Calls System.Reflection.Assembly.GetType(String, Boolean, Boolean)")]
+            public Type? ResolveType(Assembly? assembly, string simpleTypeName, bool ignoreCase)
+            {
+                assembly ??= _topLevelAssembly;
+                return assembly.GetType(simpleTypeName, throwOnError: false, ignoreCase);
+            }
+        }
+    }
+}
+
+#pragma warning restore SYSLIB0050 // Type or member is obsolete