Adding SystemFormats.Nrbf fixes

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>

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/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);