Merge pull request dotnet#11603 from JeremyKuhne/sanitizeSpwc

Namespace cleanup for System.Private.Windows.Core
Balkoth · Jun 27, 2024 · e1cd1ba · e1cd1ba
2 parents df56dcc + d6d7175
commit e1cd1ba
Show file tree

Hide file tree

Showing 115 changed files with 134 additions and 124 deletions.
diff --git a/...ystem/Private/Windows/DisposalTracking.cs → ...ndows.Core/src/System/DisposalTracking.cs b/...ystem/Private/Windows/DisposalTracking.cs → ...ndows.Core/src/System/DisposalTracking.cs
diff --git a/src/System.Private.Windows.Core/src/System/IO/BinaryWriterExtensions.cs b/src/System.Private.Windows.Core/src/System/IO/BinaryWriterExtensions.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
-using System.Windows.Forms.BinaryFormat;
+using System.Private.Windows.Core.BinaryFormat;
 
 namespace System.IO;
 

diff --git a/...m/Windows/Forms/BinaryFormat/ArrayInfo.cs → ...te/Windows/Core/BinaryFormat/ArrayInfo.cs b/...m/Windows/Forms/BinaryFormat/ArrayInfo.cs → ...te/Windows/Core/BinaryFormat/ArrayInfo.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Array information structure.

diff --git a/...Windows/Forms/BinaryFormat/ArrayRecord.cs → .../Windows/Core/BinaryFormat/ArrayRecord.cs b/...Windows/Forms/BinaryFormat/ArrayRecord.cs → .../Windows/Core/BinaryFormat/ArrayRecord.cs
@@ -4,7 +4,7 @@
 using System.Collections;
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Base class for array records.

diff --git a/...rms/BinaryFormat/ArrayRecordExtensions.cs → ...ore/BinaryFormat/ArrayRecordExtensions.cs b/...rms/BinaryFormat/ArrayRecordExtensions.cs → ...ore/BinaryFormat/ArrayRecordExtensions.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 internal static class ArrayRecordExtensions
 {

diff --git a/...s/Forms/BinaryFormat/ArraySingleObject.cs → ...ws/Core/BinaryFormat/ArraySingleObject.cs b/...s/Forms/BinaryFormat/ArraySingleObject.cs → ...ws/Core/BinaryFormat/ArraySingleObject.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Single dimensional array of objects.

diff --git a/...orms/BinaryFormat/ArraySinglePrimitive.cs → ...Core/BinaryFormat/ArraySinglePrimitive.cs b/...orms/BinaryFormat/ArraySinglePrimitive.cs → ...Core/BinaryFormat/ArraySinglePrimitive.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Single dimensional array of a primitive type.

diff --git a/...at/ArraySingleString.StringListAdapter.cs → ...at/ArraySingleString.StringListAdapter.cs b/...at/ArraySingleString.StringListAdapter.cs → ...at/ArraySingleString.StringListAdapter.cs
@@ -3,7 +3,7 @@
 
 using System.Collections;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 internal sealed partial class ArraySingleString
 {

diff --git a/...s/Forms/BinaryFormat/ArraySingleString.cs → ...ws/Core/BinaryFormat/ArraySingleString.cs b/...s/Forms/BinaryFormat/ArraySingleString.cs → ...ws/Core/BinaryFormat/ArraySingleString.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Single dimensional array of strings.

diff --git a/...Windows/Forms/BinaryFormat/BinaryArray.cs → .../Windows/Core/BinaryFormat/BinaryArray.cs b/...Windows/Forms/BinaryFormat/BinaryArray.cs → .../Windows/Core/BinaryFormat/BinaryArray.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Array of objects.

diff --git a/...s/Forms/BinaryFormat/BinaryArrayObject.cs → ...ws/Core/BinaryFormat/BinaryArrayObject.cs b/...s/Forms/BinaryFormat/BinaryArrayObject.cs → ...ws/Core/BinaryFormat/BinaryArrayObject.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  <see cref="BinaryArray"/> of objects.

diff --git a/...orms/BinaryFormat/BinaryArrayPrimitive.cs → ...Core/BinaryFormat/BinaryArrayPrimitive.cs b/...orms/BinaryFormat/BinaryArrayPrimitive.cs → ...Core/BinaryFormat/BinaryArrayPrimitive.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  <see cref="BinaryArray"/> of primitive values.

diff --git a/...ows/Forms/BinaryFormat/BinaryArrayType.cs → ...dows/Core/BinaryFormat/BinaryArrayType.cs b/...ows/Forms/BinaryFormat/BinaryArrayType.cs → ...dows/Core/BinaryFormat/BinaryArrayType.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Binary array type.

diff --git a/.../Forms/BinaryFormat/BinaryFormatWriter.cs → ...s/Core/BinaryFormat/BinaryFormatWriter.cs b/.../Forms/BinaryFormat/BinaryFormatWriter.cs → ...s/Core/BinaryFormat/BinaryFormatWriter.cs
@@ -6,7 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Writer that writes specific types in binary format without using the BinaryFormatter.

diff --git a/...rmat/BinaryFormattedObject.IParseState.cs → ...rmat/BinaryFormattedObject.IParseState.cs b/...rmat/BinaryFormattedObject.IParseState.cs → ...rmat/BinaryFormattedObject.IParseState.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 internal sealed partial class BinaryFormattedObject
 {

diff --git a/...at/BinaryFormattedObject.ITypeResolver.cs → ...at/BinaryFormattedObject.ITypeResolver.cs b/...at/BinaryFormattedObject.ITypeResolver.cs → ...at/BinaryFormattedObject.ITypeResolver.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 internal sealed partial class BinaryFormattedObject
 {

diff --git a/...ryFormat/BinaryFormattedObject.Options.cs → ...ryFormat/BinaryFormattedObject.Options.cs b/...ryFormat/BinaryFormattedObject.Options.cs → ...ryFormat/BinaryFormattedObject.Options.cs
@@ -4,7 +4,7 @@
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 #pragma warning disable SYSLIB0050 // Type or member is obsolete
 

diff --git a/...ormat/BinaryFormattedObject.ParseState.cs → ...ormat/BinaryFormattedObject.ParseState.cs b/...ormat/BinaryFormattedObject.ParseState.cs → ...ormat/BinaryFormattedObject.ParseState.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 internal sealed partial class BinaryFormattedObject
 {

diff --git a/...mat/BinaryFormattedObject.TypeResolver.cs → ...mat/BinaryFormattedObject.TypeResolver.cs b/...mat/BinaryFormattedObject.TypeResolver.cs → ...mat/BinaryFormattedObject.TypeResolver.cs
@@ -7,7 +7,7 @@
 
 #pragma warning disable SYSLIB0050 // Type or member is obsolete
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 internal sealed partial class BinaryFormattedObject
 {

diff --git a/...rms/BinaryFormat/BinaryFormattedObject.cs → ...ore/BinaryFormat/BinaryFormattedObject.cs b/...rms/BinaryFormat/BinaryFormattedObject.cs → ...ore/BinaryFormat/BinaryFormattedObject.cs
@@ -6,7 +6,7 @@
 using System.Runtime.Serialization;
 using System.Text;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Object model for the binary format put out by BinaryFormatter. It parses and creates a model but does not

diff --git a/...Format/BinaryFormattedObjectExtensions.cs → ...Format/BinaryFormattedObjectExtensions.cs b/...Format/BinaryFormattedObjectExtensions.cs → ...Format/BinaryFormattedObjectExtensions.cs
@@ -5,7 +5,7 @@
 using System.Drawing;
 using System.Runtime.CompilerServices;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 internal static class BinaryFormattedObjectExtensions
 {

diff --git a/...ndows/Forms/BinaryFormat/BinaryLibrary.cs → ...indows/Core/BinaryFormat/BinaryLibrary.cs b/...ndows/Forms/BinaryFormat/BinaryLibrary.cs → ...indows/Core/BinaryFormat/BinaryLibrary.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Library full name information.

diff --git a/.../Forms/BinaryFormat/BinaryObjectString.cs → ...s/Core/BinaryFormat/BinaryObjectString.cs b/.../Forms/BinaryFormat/BinaryObjectString.cs → ...s/Core/BinaryFormat/BinaryObjectString.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  String record.

diff --git a/.../Windows/Forms/BinaryFormat/BinaryType.cs → ...e/Windows/Core/BinaryFormat/BinaryType.cs b/.../Windows/Forms/BinaryFormat/BinaryType.cs → ...e/Windows/Core/BinaryFormat/BinaryType.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Identifies the remoting type of a class member or array item.

diff --git a/...m/Windows/Forms/BinaryFormat/ClassInfo.cs → ...te/Windows/Core/BinaryFormat/ClassInfo.cs b/...m/Windows/Forms/BinaryFormat/ClassInfo.cs → ...te/Windows/Core/BinaryFormat/ClassInfo.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Class info.

diff --git a/...Windows/Forms/BinaryFormat/ClassRecord.cs → .../Windows/Core/BinaryFormat/ClassRecord.cs b/...Windows/Forms/BinaryFormat/ClassRecord.cs → .../Windows/Core/BinaryFormat/ClassRecord.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Base class for class records.

diff --git a/...rms/BinaryFormat/ClassRecordExtensions.cs → ...ore/BinaryFormat/ClassRecordExtensions.cs b/...rms/BinaryFormat/ClassRecordExtensions.cs → ...ore/BinaryFormat/ClassRecordExtensions.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.CompilerServices;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 internal static class ClassRecordExtensions
 {

diff --git a/...ndows/Forms/BinaryFormat/ClassTypeInfo.cs → ...indows/Core/BinaryFormat/ClassTypeInfo.cs b/...ndows/Forms/BinaryFormat/ClassTypeInfo.cs → ...indows/Core/BinaryFormat/ClassTypeInfo.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Identifies a class by it's name and library id.

diff --git a/...Windows/Forms/BinaryFormat/ClassWithId.cs → .../Windows/Core/BinaryFormat/ClassWithId.cs b/...Windows/Forms/BinaryFormat/ClassWithId.cs → .../Windows/Core/BinaryFormat/ClassWithId.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Class information that references another class record's metadata.

diff --git a/...ws/Forms/BinaryFormat/ClassWithMembers.cs → ...ows/Core/BinaryFormat/ClassWithMembers.cs b/...ws/Forms/BinaryFormat/ClassWithMembers.cs → ...ows/Core/BinaryFormat/ClassWithMembers.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Class information with the source library.

diff --git a/.../BinaryFormat/ClassWithMembersAndTypes.cs → .../BinaryFormat/ClassWithMembersAndTypes.cs b/.../BinaryFormat/ClassWithMembersAndTypes.cs → .../BinaryFormat/ClassWithMembersAndTypes.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat;
+namespace System.Private.Windows.Core.BinaryFormat;
 
 /// <summary>
 ///  Class information with type info and the source library.

diff --git a/...t/Deserializer/ArrayRecordDeserializer.cs → ...t/Deserializer/ArrayRecordDeserializer.cs b/...t/Deserializer/ArrayRecordDeserializer.cs → ...t/Deserializer/ArrayRecordDeserializer.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat.Deserializer;
+namespace System.Private.Windows.Core.BinaryFormat.Deserializer;
 
 internal sealed class ArrayRecordDeserializer : ObjectRecordDeserializer
 {
@@ -14,7 +14,7 @@ internal sealed class ArrayRecordDeserializer : ObjectRecordDeserializer
     private int _index;
     private bool _hasFixups;
 
-    [RequiresUnreferencedCode("Calls System.Windows.Forms.BinaryFormat.BinaryFormattedObject.TypeResolver.GetType(String, Id)")]
+    [RequiresUnreferencedCode("Calls System.Private.Windows.Core.BinaryFormat.BinaryFormattedObject.TypeResolver.GetType(String, Id)")]
     internal ArrayRecordDeserializer(ArrayRecord<object?> arrayRecord, IDeserializer deserializer)
         : base(arrayRecord, deserializer)
     {

diff --git a/...BinaryFormat/Deserializer/ArrayUpdater.cs → ...BinaryFormat/Deserializer/ArrayUpdater.cs b/...BinaryFormat/Deserializer/ArrayUpdater.cs → ...BinaryFormat/Deserializer/ArrayUpdater.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat.Deserializer;
+namespace System.Private.Windows.Core.BinaryFormat.Deserializer;
 
 internal sealed class ArrayUpdater : ValueUpdater
 {

diff --git a/...t/Deserializer/ClassRecordDeserializer.cs → ...t/Deserializer/ClassRecordDeserializer.cs b/...t/Deserializer/ClassRecordDeserializer.cs → ...t/Deserializer/ClassRecordDeserializer.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat.Deserializer;
+namespace System.Private.Windows.Core.BinaryFormat.Deserializer;
 
 #pragma warning disable SYSLIB0050 // Type or member is obsolete
 
@@ -33,7 +33,7 @@ private protected ClassRecordDeserializer(
         _onlyAllowPrimitives = @object is IObjectReference;
     }
 
-    [RequiresUnreferencedCode("Calls System.Windows.Forms.BinaryFormat.BinaryFormattedObject.TypeResolver.GetType(String, Id)")]
+    [RequiresUnreferencedCode("Calls System.Private.Windows.Core.BinaryFormat.BinaryFormattedObject.TypeResolver.GetType(String, Id)")]
     internal static ObjectRecordDeserializer Create(ClassRecord classRecord, IDeserializer deserializer)
     {
         Type type = deserializer.TypeResolver.GetType(classRecord.Name, classRecord.LibraryId);

diff --git a/...lizer/ClassRecordFieldInfoDeserializer.cs → ...lizer/ClassRecordFieldInfoDeserializer.cs b/...lizer/ClassRecordFieldInfoDeserializer.cs → ...lizer/ClassRecordFieldInfoDeserializer.cs
@@ -5,7 +5,7 @@
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters;
 
-namespace System.Windows.Forms.BinaryFormat.Deserializer;
+namespace System.Private.Windows.Core.BinaryFormat.Deserializer;
 
 #pragma warning disable SYSLIB0050 // Type or member is obsolete
 

diff --git a/...assRecordSerializationInfoDeserializer.cs → ...assRecordSerializationInfoDeserializer.cs b/...assRecordSerializationInfoDeserializer.cs → ...assRecordSerializationInfoDeserializer.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat.Deserializer;
+namespace System.Private.Windows.Core.BinaryFormat.Deserializer;
 
 #pragma warning disable SYSLIB0050 // Type or member is obsolete
 

diff --git a/...serializer/Deserializer.PendingUpdates.cs → ...serializer/Deserializer.PendingUpdates.cs b/...serializer/Deserializer.PendingUpdates.cs → ...serializer/Deserializer.PendingUpdates.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Windows.Forms.BinaryFormat.Deserializer;
+namespace System.Private.Windows.Core.BinaryFormat.Deserializer;
 
 internal sealed partial class Deserializer
 {

diff --git a/...BinaryFormat/Deserializer/Deserializer.cs → ...BinaryFormat/Deserializer/Deserializer.cs b/...BinaryFormat/Deserializer/Deserializer.cs → ...BinaryFormat/Deserializer/Deserializer.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat.Deserializer;
+namespace System.Private.Windows.Core.BinaryFormat.Deserializer;
 
 #pragma warning disable SYSLIB0050 // Type or member is obsolete
 
@@ -101,7 +101,7 @@ private Deserializer(
     /// <summary>
     ///  Deserializes the object graph for the given <paramref name="recordMap"/> and <paramref name="rootId"/>.
     /// </summary>
-    [RequiresUnreferencedCode("Calls System.Windows.Forms.BinaryFormat.Deserializer.Deserializer.Deserialize()")]
+    [RequiresUnreferencedCode("Calls System.Private.Windows.Core.BinaryFormat.Deserializer.Deserializer.Deserialize()")]
     internal static object Deserialize(
         Id rootId,
         IReadOnlyRecordMap recordMap,
@@ -112,7 +112,7 @@ internal static object Deserialize(
         return deserializer.Deserialize();
     }
 
-    [RequiresUnreferencedCode("Calls System.Windows.Forms.BinaryFormat.Deserializer.Deserializer.DeserializeRoot(Id)")]
+    [RequiresUnreferencedCode("Calls System.Private.Windows.Core.BinaryFormat.Deserializer.Deserializer.DeserializeRoot(Id)")]
     private object Deserialize()
     {
         DeserializeRoot(_rootId);
@@ -191,7 +191,7 @@ private void DeserializeRoot(Id rootId)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        [RequiresUnreferencedCode("Calls System.Windows.Forms.BinaryFormat.Deserializer.ObjectRecordParser.Create(Id, IRecord, IDeserializer)")]
+        [RequiresUnreferencedCode("Calls System.Private.Windows.Core.BinaryFormat.Deserializer.ObjectRecordParser.Create(Id, IRecord, IDeserializer)")]
         object DeserializeNew(Id id)
         {
             // Strings, string arrays, and primitive arrays can be completed without creating a

diff --git a/...yFormat/Deserializer/FieldValueUpdater.cs → ...yFormat/Deserializer/FieldValueUpdater.cs b/...yFormat/Deserializer/FieldValueUpdater.cs → ...yFormat/Deserializer/FieldValueUpdater.cs
@@ -3,7 +3,7 @@
 
 using System.Reflection;
 
-namespace System.Windows.Forms.BinaryFormat.Deserializer;
+namespace System.Private.Windows.Core.BinaryFormat.Deserializer;
 
 internal sealed class FieldValueUpdater : ValueUpdater
 {

diff --git a/...inaryFormat/Deserializer/IDeserializer.cs → ...inaryFormat/Deserializer/IDeserializer.cs b/...inaryFormat/Deserializer/IDeserializer.cs → ...inaryFormat/Deserializer/IDeserializer.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.Serialization;
 
-namespace System.Windows.Forms.BinaryFormat.Deserializer;
+namespace System.Private.Windows.Core.BinaryFormat.Deserializer;
 
 #pragma warning disable SYSLIB0050 // Type or member is obsolete