Switch to System.Formats.Nrbf (#9465)

* install the System.Formats.Nrbf package

* switch to the new API

* remove unused methods

* remove everything related to parsing NRBF payloads and records that don't support writing

* try to fix and update the tests

* remove more unused code

Fixed conflict in Versions.props, and added missing entry to Version.Details.xml

Author: adamsitnik

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 -->

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" />
@@ -1480,6 +1471,7 @@
     <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);