ReadOnlySpan<char> adjustments, enable nullable context, unescape properly

Author: h3xds1nz

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Resources/ResourceManagerWrapper.cs

@@ -236,11 +236,10 @@ private ResourceSet ResourceSet
             {
                 if (_resourceSet == null)
                 {
-                    string manifestResourceName;
+                    //"$(AssemblyShortname).unlocalizable.g"
+                    string manifestResourceName = $"{ReflectionUtils.GetAssemblyPartialName(_assembly)}{UnLocalizableResourceNameSuffix}";
+                    ResourceManager manager = new(manifestResourceName, _assembly);
 
-                    manifestResourceName = ReflectionUtils.GetAssemblyPartialName(_assembly) + UnLocalizableResourceNameSuffix;
-
-                    ResourceManager manager = new ResourceManager(manifestResourceName, this._assembly);
                     _resourceSet = manager.GetResourceSet(CultureInfo.InvariantCulture, true, false);
                 }
 
@@ -258,11 +257,9 @@ private ResourceManager ResourceManager
             {
                 if (_resourceManager == null)
                 {
-                    string baseResourceName;  // Our build system always generate a resource base name "$(AssemblyShortname).g"
-
-                    baseResourceName = ReflectionUtils.GetAssemblyPartialName(_assembly) + LocalizableResourceNameSuffix;
-
-                    _resourceManager = new ResourceManager(baseResourceName, this._assembly);
+                    // Our build system always generate a resource base name "$(AssemblyShortname).g"
+                    string baseResourceName = $"{ReflectionUtils.GetAssemblyPartialName(_assembly)}{LocalizableResourceNameSuffix}";
+                    _resourceManager = new ResourceManager(baseResourceName, _assembly);
                 }
 
                 return _resourceManager;

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

@@ -424,7 +424,7 @@ internal static bool PlatformSupportsTransparentChildWindows
         /// <remarks>Not intended to be tested outside test code</remarks>
         internal static void SetPlatformSupportsTransparentChildWindowsForTestingOnly(bool value)
         {
-            if (string.Equals(ReflectionUtils.GetAssemblyPartialName(Assembly.GetEntryAssembly()), "drthwndsource", StringComparison.CurrentCultureIgnoreCase))
+            if (ReflectionUtils.GetAssemblyPartialName(Assembly.GetEntryAssembly()).Equals("drthwndsource", StringComparison.CurrentCultureIgnoreCase))
             {
                 _platformSupportsTransparentChildWindows = value;
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Navigation/BaseUriHelper.cs

@@ -347,7 +347,7 @@ static internal bool IsComponentEntryAssembly(string component)
 
                     if (assembly != null)
                     {
-                        return (string.Equals(ReflectionUtils.GetAssemblyPartialName(assembly), assemblyName, StringComparison.OrdinalIgnoreCase));
+                        return ReflectionUtils.GetAssemblyPartialName(assembly).Equals(assemblyName, StringComparison.OrdinalIgnoreCase);
                     }
                     else
                     {

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/documents/DocumentsTrace.cs

@@ -120,8 +120,8 @@ static DocumentsTrace()
         public DocumentsTrace(string switchName)
         {
 #if DEBUG
-            string name = ReflectionUtils.GetAssemblyPartialName(Assembly.GetCallingAssembly());
-            _switch = new BooleanSwitch(switchName, $"[{name}]");
+            ReadOnlySpan<char> shortAssemblyName = ReflectionUtils.GetAssemblyPartialName(Assembly.GetCallingAssembly());
+            _switch = new BooleanSwitch(switchName, $"[{shortAssemblyName}]");
 #endif
         }
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/SystemResources.cs

@@ -580,7 +580,7 @@ internal ResourceDictionaries(Assembly assembly)
                 }
                 else
                 {
-                    _assemblyName = ReflectionUtils.GetAssemblyPartialName(assembly);
+                    _assemblyName = ReflectionUtils.GetAssemblyPartialName(assembly).ToString();
                 }
             }
 

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

@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#nullable enable
+
+using System.Runtime.CompilerServices;
 using System.Reflection;
+using System.Text;
 using System;
 
 namespace MS.Internal
@@ -12,6 +16,23 @@ namespace MS.Internal
     /// </summary>
     internal static class ReflectionUtils
     {
+
+#if !NETFX
+        /// <summary>
+        ///  Retrieves the full assembly name by combining the <paramref name="partialName"/> passed in
+        ///  with everything else from <paramref name="assembly"/>.
+        /// </summary>
+        internal static string GetFullAssemblyNameFromPartialName(Assembly assembly, string partialName)
+        {
+            ArgumentNullException.ThrowIfNull(assembly, nameof(assembly));
+            string? fullName = assembly.FullName;
+            ArgumentNullException.ThrowIfNull(fullName, nameof(Assembly.FullName));
+
+            AssemblyName name = new(fullName) { Name = partialName };
+            return name.FullName;
+        }
+#endif
+
         /// <summary>
         ///  Given an <paramref name="assembly"/>, returns the partial/simple name of the assembly.
         /// </summary>
@@ -22,40 +43,45 @@ internal static string GetAssemblyPartialName(Assembly assembly)
 #endif
         {
 #if !NETFX
+            ArgumentNullException.ThrowIfNull(assembly, nameof(assembly));
             // We know that the input is trusted (it will be properly escaped, with ", " between tokens etc.)
             // So we can allow ourselves to do a little trick, where we just find the first separator
             // You cannot load an assembly (or define) where name is empty, it needs to be at least 1 character
             // But we will keep this for consistency of the previous function, maybe I've missed a class
             ReadOnlySpan<char> fullName = assembly.FullName;
             if (fullName.IsEmpty)
-                return string.Empty;
+                return ReadOnlySpan<char>.Empty;
 
             ReadOnlySpan<char> nameSlice = fullName;
-            // Skip any escaped commas in the name
+            // Skip any escaped commas in the name if present
             int escapedComma = fullName.LastIndexOf("\\,");
             if (escapedComma != -1)
                 nameSlice = nameSlice.Slice(escapedComma + 2);
 
-            // Find the start of the next token (usually "Version")
+            // Find the real ending of the name section
             int commaIndex = nameSlice.IndexOf(',');
             if (commaIndex != -1)
                 fullName = fullName.Slice(0, fullName.Length - nameSlice.Length + commaIndex);
 
+            // Check if we need to unescape, this is very rare case so we can just do it the dirty way
+            if (escapedComma != -1 || fullName.Contains('\\'))
+                UnescapeDirty(ref fullName);
+
+            // Since having "," or "=" in the assembly name is very rare, we don't want to inline
+            [MethodImpl(MethodImplOptions.NoInlining)]
+            static void UnescapeDirty(ref ReadOnlySpan<char> dirtyName)
+            {
+                StringBuilder sb = new(dirtyName.Length);
+                sb.Append(dirtyName);
+                sb.Replace("\\", null);
+                dirtyName = sb.ToString();
+            }
+
             return fullName;
 #else
             AssemblyName name = new(assembly.FullName);
             return name.Name ?? string.Empty;
 #endif
         }
-
-        /// <summary>
-        ///  Retrieves the full assembly name by combining the <paramref name="partialName"/> passed in
-        ///  with everything else from <paramref name="assembly"/>.
-        /// </summary>
-        internal static string GetFullAssemblyNameFromPartialName(Assembly assembly, string partialName)
-        {
-            AssemblyName name = new(assembly.FullName) { Name = partialName };
-            return name.FullName;
-        }
     }
 }