Changes that should be functionally equivalent

.gitignore

@@ -322,6 +322,8 @@ ASALocalRun/
 
 # MSBuild Binary and Structured Log
 *.binlog
+*.err
+*.wrn
 
 # NVidia Nsight GPU debugger configuration file
 *.nvuser

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+HwndDpiInfo.cs

@@ -12,6 +12,8 @@ namespace MS.Internal
     using System.Runtime.InteropServices;
     using System.Security;
 
+    using NativeMethods = MS.Win32.NativeMethods;
+
     internal static partial class DpiUtil
     {
         /// <summary>

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+ProcessDpiAwarenessHelper.cs

@@ -13,6 +13,7 @@ namespace MS.Internal
     using System.Security;
 
     using PROCESS_DPI_AWARENESS = MS.Win32.NativeMethods.PROCESS_DPI_AWARENESS;
+    using NativeMethods = MS.Win32.NativeMethods;
 
     /// <content>
     /// Contains definition of <see cref="ProcessDpiAwarenessHelper"/>

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+SystemDpiHelper.cs

@@ -13,6 +13,7 @@ namespace MS.Internal
     using System.Security;
 
     using PROCESS_DPI_AWARENESS = MS.Win32.NativeMethods.PROCESS_DPI_AWARENESS;
+    using NativeMethods = MS.Win32.NativeMethods;
 
     /// <content>
     /// Contains definition of <see cref="SystemDpiHelper"/>

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+WindowDpiScaleHelper.cs

@@ -11,6 +11,7 @@ namespace MS.Internal
     using System.Security;
 
     using MONITOR_DPI_TYPE = MS.Win32.NativeMethods.MONITOR_DPI_TYPE;
+    using NativeMethods = MS.Win32.NativeMethods;
 
     /// <content>
     /// Contains definition of <see cref="WindowDpiScaleHelper"/>

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FamilyCollection.cs

@@ -474,7 +474,7 @@ private static Text.TextInterface.Font GetFontFromFamily(Text.TextInterface.Font
                 // and at every locale name this font face has.
                 foreach (KeyValuePair<CultureInfo, string> name in font.FaceNames)
                 {
-                    if (faceName.Equals(name.Value, StringComparison.OrdinalIgnoreCase))
+                    if (faceName.Equals(name.Value.AsSpan(), StringComparison.OrdinalIgnoreCase))
                     {
                         return font;
                     }

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ByteRangeDownloader.cs

@@ -816,7 +816,7 @@ static private bool CheckContentRange(WebHeaderCollection responseHeaders, int b
             // Get the instance length
             // ContentRange: ZZZ
             contentRangeSpan = contentRangeSpan.Slice(index + 1);
-            if (!contentRangeSpan.Equals("*", StringComparison.Ordinal))
+            if (!contentRangeSpan.Equals(Asterisk.AsSpan(), StringComparison.Ordinal))
             {
                 // Note: for firstByteOffset and lastByteOffset, we are using Int32.Parse to make sure Int32.Parse to throw
                 //  if it is not an integer or the integer is bigger than Int32 since HttpWebRequest.AddRange
@@ -891,6 +891,7 @@ static private bool CheckContentRange(WebHeaderCollection responseHeaders, int b
 
         private const String ByteRangeUnit = "BYTES ";
         private const String ContentRangeHeader = "Content-Range";
+        private const String Asterisk = "*";
 
         #endregion Private Fields
     }

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/DeobfuscatingStream.cs

@@ -326,7 +326,7 @@ private static byte[] GetGuidByteArray(string guidString)
         {
             // Make sure we have at least on '-' since Guid constructor will take both dash'ed and non-dash'ed format of GUID string
             //  while XPS spec requires dash'ed format of GUID
-            if (!guidString.Contains('-'))
+            if (!guidString.Contains("-"))
             {
                 throw new ArgumentException(SR.InvalidPartName);
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/NumberSubstitution.cs

@@ -508,7 +508,7 @@ private CultureInfo CreateTraditionalCulture(CultureInfo numberCulture, int firs
                     int n = firstDigit + i - 0x10000;
                     twoChars[0] = (char)((n >> 10) | 0xD800);     // high surrogate
                     twoChars[1] = (char)((n & 0x03FF) | 0xDC00);  // low surrogate
-                    digits[i] = new string(twoChars);
+                    digits[i] = twoChars.ToString();
                 }
             }
 

src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj

@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputProcessorProfilesLoader.cs

@@ -22,6 +22,8 @@
 using System.Diagnostics;
 using MS.Win32;
 
+using UnsafeNativeMethods = MS.Win32.UnsafeNativeMethods;
+
 namespace System.Windows.Input
 {
     //------------------------------------------------------

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputScopeConverter.cs

@@ -109,7 +109,7 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 
             if (null != stringSource)
             {
-                ReadOnlySpan<char> spanSource = stringSource;
+                ReadOnlySpan<char> spanSource = stringSource.AsSpan();
                 spanSource = spanSource.Trim();
 
                 int periodPos = spanSource.LastIndexOf('.');

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs

@@ -21,6 +21,7 @@
 using System.Windows.Media;
 using System.Windows.Threading;
 using SR = MS.Internal.PresentationCore.SR;
+using UnsafeNativeMethods = MS.Win32.UnsafeNativeMethods;
 
 namespace System.Windows.Input.StylusWisp
 {

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionManager.cs

@@ -23,6 +23,7 @@
 using MS.Internal.PresentationCore;                        // SecurityHelper
 
 using SR=MS.Internal.PresentationCore.SR;
+using UnsafeNativeMethods = MS.Win32.UnsafeNativeMethods;
 
 namespace System.Windows.Input
 {

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

@@ -25,6 +25,7 @@
 using System.IO;
 
 using SR = MS.Internal.PresentationCore.SR;
+using UnsafeNativeMethods = MS.Win32.UnsafeNativeMethods;
 
 #pragma warning disable 1634, 1691  // suppressing PreSharp warnings
 

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/PropVariant.cs

@@ -364,7 +364,7 @@ internal void Init(object value)
                 else if (value is char)
                 {
                     varType = (ushort)VarEnum.VT_LPSTR;
-                    pszVal = Marshal.StringToCoTaskMemAnsi(new String(stackalloc char[] { (char)value }));
+                    pszVal = Marshal.StringToCoTaskMemAnsi((stackalloc char[] { (char)value }).ToString());
                 }
                 else if (type == typeof(short))
                 {

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContextNotificationWindow.cs

@@ -29,6 +29,7 @@
 
 using SR=MS.Internal.PresentationCore.SR;
 using DllImport=MS.Internal.PresentationCore.DllImport;
+using UnsafeNativeMethods = MS.Win32.UnsafeNativeMethods;
 
 namespace System.Windows.Media
 {

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/dataobject.cs

@@ -34,6 +34,7 @@ namespace System.Windows
 
     using SR=MS.Internal.PresentationCore.SR;
     using IComDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
+    using NativeMethods = MS.Win32.NativeMethods;
 
 // PreSharp uses message numbers that the C# compiler doesn't know about.
 // Disable the C# complaints, per the PreSharp documentation.

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ShellProvider.cs

@@ -21,6 +21,7 @@ namespace MS.Internal.AppModel
     using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
     using IPersistFile = System.Runtime.InteropServices.ComTypes.IPersistFile;
     using IStream = System.Runtime.InteropServices.ComTypes.IStream;
+    using NativeMethods = MS.Win32.NativeMethods;
 
     #region Structs
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/PtsHost/ListMarkerSourceInfo.cs

@@ -164,11 +164,11 @@ private static string ConvertNumberToString(int number, bool oneBased, string nu
             if (number < b)
             {
                 // Optimize common case of single-digit numbers.
-                return new string(stackalloc char[2] // digit + suffix
+                return stackalloc char[2] // digit + suffix
                 {
                     numericSymbols[number],
                     NumberSuffix
-                });
+                }.ToString();
             }
             else
             {

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/WindowsRuntime/Generated/WinRT.cs

@@ -136,14 +136,14 @@ public static DllModule Load(string fileName)
             // Explicitly look for module in the same directory as this one, and
             // use altered search path to ensure any dependencies in the same directory are found.
             _moduleHandle = Platform.LoadLibraryExW(System.IO.Path.Combine(_currentModuleDirectory, fileName), IntPtr.Zero, /* LOAD_WITH_ALTERED_SEARCH_PATH */ 8);
-#if !NETSTANDARD2_0 && !NETCOREAPP2_0
+#if NET
             if (_moduleHandle == IntPtr.Zero)
             {
-                try 
-	            {	        
+                try
+                {
                     // Allow runtime to find module in RID-specific relative subfolder
                     _moduleHandle = NativeLibrary.Load(fileName, Assembly.GetExecutingAssembly(), null);
-	            }
+                }
                 catch (Exception) { }
             }
 #endif

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/WindowsRuntime/Generated/WinRT/ExceptionHelpers.cs

@@ -168,7 +168,7 @@ public static unsafe void SetErrorInfo(Exception ex)
             {
                 // If the exception has information for an IRestrictedErrorInfo, use that
                 // as our error so as to propagate the error through WinRT end-to-end.
-                if (ex.TryGetRestrictedLanguageErrorObject(out var restrictedErrorObject))
+                if (ex.TryGetRestrictedLanguageErrorObject(out IObjectReference restrictedErrorObject))
                 {
                     using (restrictedErrorObject)
                     {
@@ -215,7 +215,7 @@ public static void ReportUnhandledError(Exception ex)
         public static int GetHRForException(Exception ex)
         {
             int hr = ex.HResult;
-            if (ex.TryGetRestrictedLanguageErrorObject(out var restrictedErrorObject))
+            if (ex.TryGetRestrictedLanguageErrorObject(out IObjectReference restrictedErrorObject))
             {
                 restrictedErrorObject.AsType<ABI.WinRT.Interop.IRestrictedErrorInfo>().GetErrorDetails(out _, out hr, out _, out _);
             }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/CommonDialog.cs

@@ -28,6 +28,8 @@ namespace Microsoft.Win32
     using MS.Internal.PresentationFramework;
     using MS.Win32;
 
+    using NativeMethods = MS.Win32.NativeMethods;
+
     /// <summary>
     ///  An abstract base class for displaying common dialogs.
     /// </summary>
@@ -80,7 +82,7 @@ public virtual Nullable<bool> ShowDialog()
             // Call GetActiveWindow to retrieve the window handle to the active window
             // attached to the calling thread's message queue.  We'll set the owner of
             // the common dialog to this handle.
-            IntPtr hwndOwner = UnsafeNativeMethods.GetActiveWindow();
+            IntPtr hwndOwner = MS.Win32.UnsafeNativeMethods.GetActiveWindow();
 
             if (hwndOwner == IntPtr.Zero)
             {
@@ -321,16 +323,16 @@ private void MoveToScreenCenter(HandleRef hWnd)
                                                          ref y);
 
                     // Call SetWindowPos to actually move the window.
-                    UnsafeNativeMethods.SetWindowPos(hWnd,                          // handle to the window to move
-                                                     NativeMethods.NullHandleRef,   // window to precede this one in zorder
-                                                     (int)Math.Round(x),
-                                                     (int)Math.Round(y),            // new X and Y positions
-                                                     0, 0,                          // new width and height, if applicable
-                                                                                    // Flags:  
-                                                                                    //    SWP_NOSIZE: Retains current size
-                                                                                    //    SWP_NOZORDER:  retains current zorder
-                                                                                    //    SWP_NOACTIVATE:  does not activate the window
-                                                     NativeMethods.SWP_NOSIZE | NativeMethods.SWP_NOZORDER | NativeMethods.SWP_NOACTIVATE);
+                    MS.Win32.UnsafeNativeMethods.SetWindowPos(hWnd,                          // handle to the window to move
+                                                              NativeMethods.NullHandleRef,   // window to precede this one in zorder
+                                                              (int)Math.Round(x),
+                                                              (int)Math.Round(y),            // new X and Y positions
+                                                              0, 0,                          // new width and height, if applicable
+                                                                                             // Flags:  
+                                                                                             //    SWP_NOSIZE: Retains current size
+                                                                                             //    SWP_NOZORDER:  retains current zorder
+                                                                                             //    SWP_NOACTIVATE:  does not activate the window
+                                                              NativeMethods.SWP_NOSIZE | NativeMethods.SWP_NOZORDER | NativeMethods.SWP_NOACTIVATE);
                 }
             }
         }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/CommonItemDialog.cs

@@ -353,7 +353,7 @@ internal bool MessageBoxWithFocusRestore(string message,
             bool ret = false;
 
             // Get the window that currently has focus and temporarily cache a handle to it
-            IntPtr focusHandle = UnsafeNativeMethods.GetFocus();
+            IntPtr focusHandle = MS.Win32.UnsafeNativeMethods.GetFocus();
 
             try
             {
@@ -367,7 +367,7 @@ internal bool MessageBoxWithFocusRestore(string message,
             {
                 // Return focus to the window that had focus before we showed the messagebox.
                 // SetFocus can handle improper hwnd values, including null.
-                UnsafeNativeMethods.SetFocus(new HandleRef(this, focusHandle));
+                MS.Win32.UnsafeNativeMethods.SetFocus(new HandleRef(this, focusHandle));
             }
             return ret;
         }
@@ -577,7 +577,7 @@ private bool HandleItemOk(IFileDialog dialog)
             // When this callback occurs, the HWND is visible and we need to
             // grab it because it is used for various things like looking up the
             // DialogCaption.
-            UnsafeNativeMethods.IOleWindow oleWindow = (UnsafeNativeMethods.IOleWindow)dialog;
+            MS.Win32.UnsafeNativeMethods.IOleWindow oleWindow = (MS.Win32.UnsafeNativeMethods.IOleWindow)dialog;
             oleWindow.GetWindow(out _hwndFileDialog);
 
             string[] saveItemNames = _itemNames;
@@ -677,20 +677,20 @@ private string DialogCaption
         {
             get
             {
-                if (!UnsafeNativeMethods.IsWindow(new HandleRef(this, _hwndFileDialog)))
+                if (!MS.Win32.UnsafeNativeMethods.IsWindow(new HandleRef(this, _hwndFileDialog)))
                 {
                     return String.Empty;
                 }
 
                 // Determine the length of the text we want to retrieve...
-                int textLen = UnsafeNativeMethods.GetWindowTextLength(new HandleRef(this, _hwndFileDialog));
+                int textLen = MS.Win32.UnsafeNativeMethods.GetWindowTextLength(new HandleRef(this, _hwndFileDialog));
                 // then make a StringBuilder...
                 StringBuilder sb = new StringBuilder(textLen + 1);
                 // and call GetWindowText to fill it up...
-                UnsafeNativeMethods.GetWindowText(new HandleRef(this, _hwndFileDialog),
-                           sb /*target string*/,
-                           sb.Capacity /* max # of chars to copy before truncation occurs */
-                           );
+                MS.Win32.UnsafeNativeMethods.GetWindowText(new HandleRef(this, _hwndFileDialog),
+                                                           sb /*target string*/,
+                                                           sb.Capacity /* max # of chars to copy before truncation occurs */
+                                                           );
                 // then return the results.
                 return sb.ToString();
             }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj

@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ItemContainerGenerator.cs

@@ -1130,8 +1130,8 @@ void FormatCollectionChangedSource(int level, object source, bool? isLikely, Lis
                 if (index >= 0)
                 {
                     ReadOnlySpan<char> token = aqn.AsSpan(index + PublicKeyToken.Length);
-                    if (token.Equals(MS.Internal.PresentationFramework.BuildInfo.WCP_PUBLIC_KEY_TOKEN, StringComparison.OrdinalIgnoreCase) ||
-                        token.Equals(MS.Internal.PresentationFramework.BuildInfo.DEVDIV_PUBLIC_KEY_TOKEN, StringComparison.OrdinalIgnoreCase))
+                    if (token.Equals(MS.Internal.PresentationFramework.BuildInfo.WCP_PUBLIC_KEY_TOKEN.AsSpan(), StringComparison.OrdinalIgnoreCase) ||
+                        token.Equals(MS.Internal.PresentationFramework.BuildInfo.DEVDIV_PUBLIC_KEY_TOKEN.AsSpan(), StringComparison.OrdinalIgnoreCase))
                     {
                         isLikely = false;
                     }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/Binding.cs

@@ -779,7 +779,7 @@ internal bool TreeContextIsRequired
                 treeContextIsRequired = (_attachedPropertiesInPath > 0);
 
                 // namespace prefixes in the XPath need an XmlNamespaceManager
-                if (!treeContextIsRequired && HasValue(Feature.XPath) && XPath.Contains(':'))
+                if (!treeContextIsRequired && HasValue(Feature.XPath) && XPath.Contains(":"))
                 {
                     treeContextIsRequired = true;
                 }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/CaretElement.cs

@@ -20,6 +20,7 @@ namespace System.Windows.Documents
     using System.Windows.Interop;
     using System.Windows.Controls.Primitives;
 
+    using NativeMethods = MS.Win32.NativeMethods;
 
 // Disable pragma warnings to enable PREsharp pragmas
 #pragma warning disable 1634, 1691

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FixedSchema.cs

@@ -442,7 +442,7 @@ public override string[] ExtractUriFromAttr(string attrName, string attrValue)
                 attrName.Equals("Stroke", StringComparison.Ordinal))
             {
                 ReadOnlySpan<char> attrValueSpan = attrValue.AsSpan().Trim();
-                if (attrValueSpan.StartsWith(_contextColor, StringComparison.Ordinal))
+                if (attrValueSpan.StartsWith(_contextColor.AsSpan(), StringComparison.Ordinal))
                 {
                     attrValueSpan = attrValueSpan.Slice(_contextColor.Length).Trim();
                     int spacePos = attrValueSpan.IndexOf(' ');

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/NLGSpellerInterop.cs

@@ -20,6 +20,8 @@ namespace System.Windows.Documents
     using System.Windows.Controls;
     using MS.Internal.PresentationFramework;
 
+    using NativeMethods = MS.Win32.NativeMethods;
+
     // Custom COM marshalling code and interfaces for interaction
     // with the Natural Language Group's nl6 proofing engine.
     internal class NLGSpellerInterop : SpellerInteropBase

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlReader.cs

@@ -275,7 +275,7 @@ internal static bool StringToInt(ReadOnlySpan<char> s, ref int i)
 
         internal static string StringToXMLAttribute(string s)
         {
-            if (!s.Contains('"'))
+            if (!s.Contains("\""))
             {
                 return s;
             }
@@ -3747,7 +3747,7 @@ internal Hashtable FontMappings
                                         if (lhs_name.Length > rhs_name.Length)
                                         {
                                             ReadOnlySpan<char> s = lhs_name.AsSpan(0, rhs_name.Length);
-                                            if (s.Equals(rhs_name, StringComparison.OrdinalIgnoreCase))
+                                            if (s.Equals(rhs_name.AsSpan(), StringComparison.OrdinalIgnoreCase))
                                             {
                                                 bAdd = true;
                                             }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextEditorContextMenu.cs

@@ -20,6 +20,8 @@ namespace System.Windows.Documents
     using MS.Win32;
     using System.Windows.Interop;
 
+    using NativeMethods = MS.Win32.NativeMethods;
+
     // A Component of TextEditor supporting the default ContextMenu.
     internal static class TextEditorContextMenu
     {