Skip to content

Commit cf71a1f

Browse files
committed
Address post-merge using issues
1 parent 27d1016 commit cf71a1f

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndSourceParameters.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
3-
// See the LICENSE file in the project root for more information.
43

5-
using MS.Win32;
6-
using System.Windows.Media;
74
using System.Windows.Input;
5+
using System.Reflection;
6+
using MS.Internal;
7+
using MS.Win32;
88

99
namespace System.Windows.Interop
1010
{

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/Baml2006Reader.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using System.Globalization;
1313
using XamlReaderHelper = System.Windows.Markup.XamlReaderHelper;
1414
using System.Runtime.CompilerServices;
15+
using MS.Internal;
1516

1617
namespace System.Windows.Baml2006
1718
{

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Primitives/MarkupWriter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
3-
// See the LICENSE file in the project root for more information.
43

54
//
65
// Contents: XAML writer
76
//
87

8+
using System.Xml.Serialization;
99
using System.ComponentModel;
10-
using System.Reflection;
1110
using System.Collections;
11+
using System.Reflection;
12+
using MS.Internal;
1213
using System.Text;
1314
using System.Xml;
14-
using System.Xml.Serialization;
1515

1616
namespace System.Windows.Markup.Primitives
1717
{

src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/ReflectionUtils.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ namespace MS.Internal
1616
/// </summary>
1717
internal static class ReflectionUtils
1818
{
19-
2019
#if !NETFX
2120
/// <summary>
2221
/// Retrieves the full assembly name by combining the <paramref name="partialName"/> passed in

src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/SplashScreen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public SplashScreen(Assembly resourceAssembly, string resourceName)
5353
}
5454

5555
_resourceName = resourceName.ToLowerInvariant();
56-
_hInstance = Marshal.GetHINSTANCE(resourceAssembly.ManifestModule);
56+
_hInstance = (HINSTANCE)Marshal.GetHINSTANCE(resourceAssembly.ManifestModule);
5757
_resourceManager = new ResourceManager($"{ReflectionUtils.GetAssemblyPartialName(resourceAssembly)}.g", resourceAssembly);
5858
}
5959

0 commit comments

Comments
 (0)