Skip to content

Commit cc8aabe

Browse files
JeremyKuhneJeremyKuhne
authored
Remove ".Core" from namespaces (#12839)
`System.Private.Windows` is really the root namespace. `Core` is just the name of the core assembly for `Sytem.Private.Windows`. We already have a second assembly (GdiPlus), and may have others in the future.
1 parent 2fecee4 commit cc8aabe

File tree

119 files changed

+132
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+132
-146
lines changed

‎src/Common/tests/TestUtilities/CommonTestHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.ComponentModel.Design.Serialization;
55
using System.Drawing;
66

7-
namespace System.Private.Windows.Core.TestUtilities;
7+
namespace System.Private.Windows.TestUtilities;
88

99
public static class CommonTestHelper
1010
{

‎src/Common/tests/TestUtilities/TestIncludeType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
namespace System.Private.Windows.Core.TestUtilities;
4+
namespace System.Private.Windows.TestUtilities;
55

66
/// <summary>
77
/// Specifies what type of test data to include in the <see cref="TheoryData"/>. This is

‎src/System.Private.Windows.Core/src/GlobalUsings.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
global using System.Diagnostics;
55
global using System.Diagnostics.CodeAnalysis;
6-
global using System.Private.Windows.Core;
6+
global using System.Private.Windows;
7+
global using Windows.Win32;
78
global using Windows.Win32.Foundation;
89
global using Windows.Win32.Graphics.Gdi;
910
global using Windows.Win32.UI.WindowsAndMessaging;
11+
global using System.Private.Windows.Core.Resources;

‎src/System.Private.Windows.Core/src/System/IO/BinaryWriterExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Runtime.CompilerServices;
55
using System.Runtime.Serialization;
6-
using System.Private.Windows.Core.BinaryFormat.Serializer;
6+
using System.Private.Windows.BinaryFormat.Serializer;
77

88
namespace System.IO;
99

‎src/System.Private.Windows.Core/src/System/IO/StreamExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
using Windows.Win32;
54
using Windows.Win32.System.Com;
65

76
namespace System.IO;

‎src/System.Private.Windows.Core/src/System/Private/Windows/Core/BinaryFormat/BinaryFormatWriter.cs renamed to ‎src/System.Private.Windows.Core/src/System/Private/Windows/BinaryFormat/BinaryFormatWriter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
using System.Collections;
55
using System.Drawing;
6-
using System.Private.Windows.Core.BinaryFormat.Serializer;
6+
using System.Private.Windows.BinaryFormat.Serializer;
77
using System.Reflection;
88
using System.Runtime.CompilerServices;
99
using System.Runtime.Serialization;
1010

11-
namespace System.Private.Windows.Core.BinaryFormat;
11+
namespace System.Private.Windows.BinaryFormat;
1212

1313
/// <summary>
1414
/// Writer that writes specific types in binary format without using the BinaryFormatter.

‎src/System.Private.Windows.Core/src/System/Private/Windows/Core/BinaryFormat/BinaryFormattedObjectExtensions.cs renamed to ‎src/System.Private.Windows.Core/src/System/Private/Windows/BinaryFormat/BinaryFormattedObjectExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
using System.Private.Windows.Core.BinaryFormat.Serializer;
4+
using System.Private.Windows.BinaryFormat.Serializer;
55

6-
namespace System.Private.Windows.Core.BinaryFormat;
6+
namespace System.Private.Windows.BinaryFormat;
77

88
internal static class BinaryFormattedObjectExtensions
99
{

‎src/System.Private.Windows.Core/src/System/Private/Windows/Core/BinaryFormat/Deserializer/ArrayRecordDeserializer.cs renamed to ‎src/System.Private.Windows.Core/src/System/Private/Windows/BinaryFormat/Deserializer/ArrayRecordDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Formats.Nrbf;
55

6-
namespace System.Private.Windows.Core.BinaryFormat;
6+
namespace System.Private.Windows.BinaryFormat;
77

88
internal sealed class ArrayRecordDeserializer : ObjectRecordDeserializer
99
{

‎src/System.Private.Windows.Core/src/System/Private/Windows/Core/BinaryFormat/Deserializer/ArrayUpdater.cs renamed to ‎src/System.Private.Windows.Core/src/System/Private/Windows/BinaryFormat/Deserializer/ArrayUpdater.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Formats.Nrbf;
55

6-
namespace System.Private.Windows.Core.BinaryFormat;
6+
namespace System.Private.Windows.BinaryFormat;
77

88
internal sealed class ArrayUpdater : ValueUpdater
99
{

‎src/System.Private.Windows.Core/src/System/Private/Windows/Core/BinaryFormat/Deserializer/ClassRecordDeserializer.cs renamed to ‎src/System.Private.Windows.Core/src/System/Private/Windows/BinaryFormat/Deserializer/ClassRecordDeserializer.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
using System.Runtime.CompilerServices;
55
using System.Runtime.Serialization;
66
using System.Formats.Nrbf;
7-
using System.Private.Windows.Core.Resources;
87

9-
namespace System.Private.Windows.Core.BinaryFormat;
8+
namespace System.Private.Windows.BinaryFormat;
109

1110
#pragma warning disable SYSLIB0050 // Type or member is obsolete
1211

0 commit comments

Comments
 (0)