Backport BinaryFormatter changes to Preview 7

Microsoft.Dotnet.Wpf.sln

@@ -247,12 +247,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{34B64A4A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{A48B585E-6AB0-4F8D-8484-77F37CB44437}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFB}") = "System.Xaml.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\System.Xaml.Tests\System.Xaml.Tests.csproj", "{B2F2A89C-55C9-41B1-A645-0948609BD8BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xaml.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\System.Xaml.Tests\System.Xaml.Tests.csproj", "{B2F2A89C-55C9-41B1-A645-0948609BD8BE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework.Fluent", "src\Microsoft.DotNet.Wpf\src\Themes\PresentationFramework.Fluent\PresentationFramework.Fluent.csproj", "{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework.Fluent-ref", "src\Microsoft.DotNet.Wpf\src\Themes\PresentationFramework.Fluent\ref\PresentationFramework.Fluent-ref.csproj", "{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationCore.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\PresentationCore.Tests\PresentationCore.Tests.csproj", "{A4377D3F-6BA1-4994-945C-88667993E4F3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1924,28 +1926,22 @@ Global
 		{AF9084C3-BF37-4A56-A851-89F3BAE731B3}.Release|x86.ActiveCfg = Release|Win32
 		{AF9084C3-BF37-4A56-A851-89F3BAE731B3}.Release|x86.Build.0 = Release|Win32
 		{AF9084C3-BF37-4A56-A851-89F3BAE731B3}.Release|x86.Deploy.0 = Release|Win32
-		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|Any CPU.Build.0 = Debug|Win32
-		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|Any CPU.Deploy.0 = Debug|Win32
+		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|ARM64.Build.0 = Debug|ARM64
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.ActiveCfg = Debug|x64
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.Build.0 = Debug|x64
-		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.Deploy.0 = Debug|x64
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.ActiveCfg = Debug|x86
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Build.0 = Debug|x86
-		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Deploy.0 = Debug|x86
-		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.ActiveCfg = Release|Win32
-		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.Build.0 = Release|Win32
-		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.Deploy.0 = Release|Win32
+		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|ARM64.ActiveCfg = Release|ARM64
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|ARM64.Build.0 = Release|ARM64
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.ActiveCfg = Release|x64
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.Build.0 = Release|x64
-		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.Deploy.0 = Release|x64
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.ActiveCfg = Release|x86
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Build.0 = Release|x86
-		{B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Deploy.0 = Release|x86
 		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|ARM64.ActiveCfg = Debug|arm64
@@ -1978,6 +1974,22 @@ Global
 		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x64.Build.0 = Release|x64
 		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x86.ActiveCfg = Release|Any CPU
 		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x86.Build.0 = Release|Any CPU
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|x64.ActiveCfg = Debug|x64
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|x64.Build.0 = Debug|x64
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|x86.ActiveCfg = Debug|x86
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|x86.Build.0 = Debug|x86
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|ARM64.Build.0 = Release|ARM64
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|x64.ActiveCfg = Release|x64
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|x64.Build.0 = Release|x64
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|x86.ActiveCfg = Release|x86
+		{A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2100,6 +2112,7 @@ Global
 		{B2F2A89C-55C9-41B1-A645-0948609BD8BE} = {A48B585E-6AB0-4F8D-8484-77F37CB44437}
 		{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9} = {5ACFB055-649D-4A01-98C2-B0BFE7E543D6}
 		{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD} = {60F4058B-D35B-42D2-B276-D44B3AC579BD}
+		{A4377D3F-6BA1-4994-945C-88667993E4F3} = {A48B585E-6AB0-4F8D-8484-77F37CB44437}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B4340004-DAC0-497D-B69D-CFA7CD93F567}

eng/Version.Details.xml

@@ -95,6 +95,10 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
     </Dependency>
+    <Dependency Name="System.Formats.Nrbf" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.Private.Winforms">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>
+    </Dependency>
     <Dependency Name="System.IO.Packaging" Version="9.0.0-preview.7.24376.15" CoherentParentDependency="Microsoft.Private.Winforms">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>bdcf3ef75e11d22e4973bf37f2d5b660b73aa266</Sha>

eng/Versions.props

@@ -34,6 +34,7 @@
     <SystemDiagnosticsEventLogPackageVersion>9.0.0-preview.7.24376.15</SystemDiagnosticsEventLogPackageVersion>
     <SystemDrawingCommonVersion>9.0.0-preview.7.24379.1</SystemDrawingCommonVersion>
     <SystemDirectoryServicesVersion>9.0.0-preview.7.24376.15</SystemDirectoryServicesVersion>
+    <SystemFormatsNrbfVersion>9.0.0-preview.7.24376.15</SystemFormatsNrbfVersion>
     <SystemIOPackagingVersion>9.0.0-preview.7.24376.15</SystemIOPackagingVersion>
     <SystemReflectionMetadataLoadContextVersion>9.0.0-preview.7.24376.15</SystemReflectionMetadataLoadContextVersion>
     <SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
@@ -66,14 +67,14 @@
   <PropertyGroup>
     <MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
-    <!-- 
-        Also in global.json 
-        Used in Wpf.Cpp.PrivateTools.props/targets 
+    <!--
+        Also in global.json
+        Used in Wpf.Cpp.PrivateTools.props/targets
     <MsvcurtC1xxVersion>0.0.1.2</MsvcurtC1xxVersion>
     -->
     <!--
     This is the version of the test infrastructure package is compiled against. This should be
-    removed as part of https://github.com/dotnet/wpf/issues/816 
+    removed as part of https://github.com/dotnet/wpf/issues/816
     -->
     <MicrosoftDotNetWpfTestPackageVersion>1.0.0-beta.19263.1</MicrosoftDotNetWpfTestPackageVersion>
     <!-- These versions are specified in global.json -->
@@ -86,10 +87,10 @@
   </PropertyGroup>
   <!-- XUnit-related (not extensions) -->
   <PropertyGroup>
-    <XUnitVersion>2.4.0</XUnitVersion>
+    <XUnitVersion>2.9.0</XUnitVersion>
     <XUnitAssertVersion>$(XUnitVersion)</XUnitAssertVersion>
     <XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
-    <XUnitRunnerVisualStudioVersion>2.4.0</XUnitRunnerVisualStudioVersion>
+    <XUnitRunnerVisualStudioVersion>2.8.1</XUnitRunnerVisualStudioVersion>
     <XUnitExtensibilityExecutionVersion>$(XUnitVersion)</XUnitExtensibilityExecutionVersion>
     <XUnitStaFactPackageVersion>1.2.46-alpha</XUnitStaFactPackageVersion>
   </PropertyGroup>

eng/WpfArcadeSdk/tools/TestProjects.targets

@@ -29,7 +29,6 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" CopyLocal="true"  />
     <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" CopyLocal="true" />
-    <PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" CopyLocal="true" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" CopyLocal="true" />
     <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" CopyLocal="true" />
 

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "9.0.100-preview.5.24307.3",
+    "dotnet": "9.0.100-preview.6.24328.19",
     "runtimes": {
       "dotnet": [
         "2.1.7",
@@ -16,7 +16,7 @@
     "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24368.9"
   },
   "sdk": {
-    "version": "9.0.100-preview.5.24307.3"
+    "version": "9.0.100-preview.6.24328.19"
   },
   "native-tools": {
     "strawberry-perl": "5.38.0.1",

src/Microsoft.DotNet.Wpf/src/PresentationCore/OtherAssemblyAttrs.cs

@@ -18,7 +18,7 @@
 [assembly:InternalsVisibleTo(BuildInfo.PresentationFrameworkSystemDrawing)]
 [assembly:InternalsVisibleTo(BuildInfo.SystemWindowsControlsRibbon)]
 [assembly:InternalsVisibleTo(BuildInfo.WindowsFormsIntegration)]
-[assembly:InternalsVisibleTo("PresentationCore.Tests,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
+[assembly:InternalsVisibleTo($"PresentationCore.Tests, PublicKey={BuildInfo.WCP_PUBLIC_KEY_STRING}")]
 [assembly: TypeForwardedTo(typeof(System.Windows.Markup.IUriContext))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Media.TextFormattingMode))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Input.ICommand))]

src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj

@@ -338,19 +338,15 @@
     <Compile Include="System\Windows\BinaryFormat\BinaryFormatWriterScope.cs" />
     <Compile Include="System\Windows\BinaryFormat\ExceptionExtensions.cs" />
     <Compile Include="System\Windows\BinaryFormat\BinaryObjectString.cs" />
-    <Compile Include="System\Windows\BinaryFormat\IBinaryFormatParseable.cs" />
     <Compile Include="System\Windows\BinaryFormat\IBinaryWriteable.cs" />
     <Compile Include="System\Windows\BinaryFormat\MemberTypeInfo.cs" />
     <Compile Include="System\Windows\BinaryFormat\Id.cs" />
     <Compile Include="System\Windows\BinaryFormat\IRecord.cs" />
-    <Compile Include="System\Windows\BinaryFormat\RecordMap.cs" />
     <Compile Include="System\Windows\BinaryFormat\RecordType.cs" />
-    <Compile Include="System\Windows\BinaryFormat\NullableAttributes.cs" />
     <Compile Include="System\Windows\BinaryFormat\ListConverterHelper.cs" />
     <Compile Include="System\Windows\BinaryFormat\FormatterConverterStub.cs" />
     <Compile Include="System\Windows\BinaryFormat\SerializationExtensions.cs" />
-    <Compile Include="System\Windows\BinaryFormat\BinaryFormattedObject.cs" />
-    <Compile Include="System\Windows\BinaryFormat\BinaryFormattedObjectExtensions.cs" />
+    <Compile Include="System\Windows\Nrbf\SerializationRecordExtensions.cs" />
     <Compile Include="System\Windows\BinaryFormat\MessageEnd.cs" />
     <Compile Include="System\Windows\BinaryFormat\Record.cs" />
     <Compile Include="System\Windows\BinaryFormat\BinaryType.cs" />
@@ -366,19 +362,14 @@
     <Compile Include="System\Windows\BinaryFormat\BinaryLibrary.cs" />
     <Compile Include="System\Windows\BinaryFormat\MemberReference.cs" />
     <Compile Include="System\Windows\BinaryFormat\MemberPrimitiveTyped.cs" />
-    <Compile Include="System\Windows\BinaryFormat\BinaryArray.cs" />
     <Compile Include="System\Windows\BinaryFormat\ClassWithMembersAndTypes.cs" />
     <Compile Include="System\Windows\BinaryFormat\SystemClassWithMembersAndTypes.cs" />
     <Compile Include="System\Windows\BinaryFormat\ClassInfo.cs" />
     <Compile Include="System\Windows\BinaryFormat\ClassRecord.cs" />
     <Compile Include="System\Windows\BinaryFormat\ClassWithId.cs" />
     <Compile Include="System\Windows\BinaryFormat\TypeInfo.cs" />
-    <Compile Include="System\Windows\BinaryFormat\ClassWithMembers.cs" />
-    <Compile Include="System\Windows\BinaryFormat\SystemClassWithMembers.cs" />
     <Compile Include="System\Windows\BinaryFormat\SerializationHeader.cs" />
     <Compile Include="System\Windows\BinaryFormat\ClassTypeInfo.cs" />
-    <Compile Include="System\Windows\BinaryFormat\BinaryArrayType.cs" />
-    <Compile Include="System\Windows\BinaryFormat\BinaryReaderExtensions.cs" />
     <Compile Include="System\Windows\BinaryFormat\BinaryWriterExtensions.cs" />
     <Compile Include="System\Windows\BinaryFormat\IntrinsicExtensions.cs" />
     <Compile Include="System\Windows\BinaryFormat\NullRecord.ObjectNullMultiple.cs" />
@@ -1461,6 +1452,7 @@
     <NetCoreReference Include="System.Runtime.CompilerServices.VisualC" />
     <NetCoreReference Include="System.Runtime.Extensions" />
     <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Runtime.Serialization.Formatters" />
     <NetCoreReference Include="System.Text.Encoding.Extensions" />
     <NetCoreReference Include="System.Text.RegularExpressions" />
     <NetCoreReference Include="System.Threading" />
@@ -1476,10 +1468,9 @@
 
   <ItemGroup>
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
-    <!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
-    <PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
     <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
     <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
+    <PackageReference Include="System.Formats.Nrbf" Version="$(SystemFormatsNrbfVersion)" />
   </ItemGroup>
 
   <ItemGroup>

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/BinaryFormat/ArrayInfo.cs

@@ -26,13 +26,6 @@ public ArrayInfo(Id objectId, Count length)
             ObjectId = objectId;
         }
 
-        public static ArrayInfo Parse(BinaryReader reader, out Count length)
-        {
-            ArrayInfo arrayInfo = new(reader.ReadInt32(), reader.ReadInt32());
-            length = arrayInfo.Length;
-            return arrayInfo;
-        }
-
         public readonly void Write(BinaryWriter writer)
         {
             writer.Write(ObjectId);

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/BinaryFormat/ArraySingleObject.cs

@@ -16,26 +16,14 @@ namespace System.Windows
     ///   </see>
     ///  </para>
     /// </remarks>
-    internal sealed class ArraySingleObject : ArrayRecord, IRecord<ArraySingleObject>
+    internal sealed class ArraySingleObject : ArrayRecord
     {
         public static RecordType RecordType => RecordType.ArraySingleObject;
 
         public ArraySingleObject(ArrayInfo arrayInfo, IReadOnlyList<object> arrayObjects)
             : base(arrayInfo, arrayObjects)
         { }
 
-        static ArraySingleObject IBinaryFormatParseable<ArraySingleObject>.Parse(
-            BinaryReader reader,
-            RecordMap recordMap)
-        {
-            ArraySingleObject record = new(
-                ArrayInfo.Parse(reader, out Count length),
-                ReadRecords(reader, recordMap, length));
-
-            recordMap[record.ObjectId] = record;
-            return record;
-        }
-
         public override void Write(BinaryWriter writer)
         {
             writer.Write((byte)RecordType);

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/BinaryFormat/ArraySinglePrimitive.cs

@@ -16,7 +16,7 @@ namespace System.Windows
     ///   </see>
     ///  </para>
     /// </remarks>
-    internal sealed class ArraySinglePrimitive : ArrayRecord, IRecord<ArraySinglePrimitive>
+    internal sealed class ArraySinglePrimitive : ArrayRecord
     {
         public PrimitiveType PrimitiveType { get; }
 
@@ -28,22 +28,6 @@ public ArraySinglePrimitive(ArrayInfo arrayInfo, PrimitiveType primitiveType, IR
             PrimitiveType = primitiveType;
         }
 
-        static ArraySinglePrimitive IBinaryFormatParseable<ArraySinglePrimitive>.Parse(
-            BinaryReader reader,
-            RecordMap recordMap)
-        {
-            ArrayInfo arrayInfo = ArrayInfo.Parse(reader, out Count length);
-            PrimitiveType primitiveType = (PrimitiveType)reader.ReadByte();
-
-            ArraySinglePrimitive record = new(
-                arrayInfo,
-                primitiveType,
-                ReadPrimitiveTypes(reader, primitiveType, length));
-
-            recordMap[record.ObjectId] = record;
-            return record;
-        }
-
         public override void Write(BinaryWriter writer)
         {
             writer.Write((byte)RecordType);

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/BinaryFormat/ArraySingleString.cs

@@ -17,26 +17,14 @@ namespace System.Windows
     ///   </see>
     ///  </para>
     /// </remarks>
-    internal sealed class ArraySingleString : ArrayRecord, IRecord<ArraySingleString>
+    internal sealed class ArraySingleString : ArrayRecord
     {
         public static RecordType RecordType => RecordType.ArraySingleString;
 
         public ArraySingleString(ArrayInfo arrayInfo, IReadOnlyList<object> arrayObjects)
             : base(arrayInfo, arrayObjects)
         { }
 
-        static ArraySingleString IBinaryFormatParseable<ArraySingleString>.Parse(
-            BinaryReader reader,
-            RecordMap recordMap)
-        {
-            ArraySingleString record = new(
-                ArrayInfo.Parse(reader, out Count length),
-                ReadRecords(reader, recordMap, length));
-
-            recordMap[record.ObjectId] = record;
-            return record;
-        }
-
         public override void Write(BinaryWriter writer)
         {
             writer.Write((byte)RecordType);