Rebase, use named arg, avoid auto format

Author: h3xds1nz

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

@@ -48,7 +48,12 @@ static BaseUriHelper()
         ///     Flags: None
         ///     Default Value: null.
         /// </summary>
-        public static readonly DependencyProperty BaseUriProperty = DependencyProperty.RegisterAttached("BaseUri", typeof(Uri), typeof(BaseUriHelper), new PropertyMetadata(null));
+        public static readonly DependencyProperty BaseUriProperty =
+                    DependencyProperty.RegisterAttached(
+                                "BaseUri",
+                                typeof(Uri),
+                                typeof(BaseUriHelper),
+                                new PropertyMetadata(defaultValue: null));
 
         /// <summary>
         /// Get BaseUri for a dependency object inside a tree.

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

@@ -90,8 +90,8 @@ static void UnescapeDirty(ref ReadOnlySpan<char> dirtyName)
         /// This should only be passed a RuntimeAssembly to ensure proper functionality.
         /// </summary>
         /// <param name="assembly">The RuntimeAssembly which will provide properly formatted full name.</param>
-        /// <param name="version">If present, returns the value of Version portion, otherwise Empty result.</param>
-        /// <param name="token">If present, returns the value of PublicKeyToken portion. Empty result is returned when the value is "null" or not present.</param>
+        /// <param name="assemblyVersion">If present, returns the value of Version portion, otherwise Empty result.</param>
+        /// <param name="assemblyToken">If present, returns the value of PublicKeyToken portion. Empty result is returned when the value is "null" or not present.</param>
         internal static void GetAssemblyVersionPlusToken(Assembly assembly, out ReadOnlySpan<char> assemblyVersion, out ReadOnlySpan<char> assemblyToken)
         {
             ArgumentNullException.ThrowIfNull(assembly, nameof(assembly));