Move PrintName comment outside of if else of reparseTag check.

src/libraries/System.IO.FileSystem/tests/Base/SymbolicLinks/BaseSymbolicLinks.cs

@@ -25,11 +25,11 @@ protected DirectoryInfo CreateSelfReferencingSymbolicLink()
 
         protected string GetRandomFileName() => GetTestFileName() + ".txt";
         protected string GetRandomLinkName() => GetTestFileName() + ".link";
-        protected string GetRandomDirName() => GetTestFileName() + "_dir";
+        protected string GetRandomDirName()  => GetTestFileName() + "_dir";
 
         protected string GetRandomFilePath() => Path.Join(ActualTestDirectory.Value, GetRandomFileName());
         protected string GetRandomLinkPath() => Path.Join(ActualTestDirectory.Value, GetRandomLinkName());
-        protected string GetRandomDirPath() => Path.Join(ActualTestDirectory.Value, GetRandomDirName());
+        protected string GetRandomDirPath()  => Path.Join(ActualTestDirectory.Value, GetRandomDirName());
 
         private Lazy<string> ActualTestDirectory => new Lazy<string>(() => GetTestDirectoryActualCasing());
 

src/libraries/System.Private.CoreLib/src/System/IO/FileSystem.Windows.cs

@@ -502,17 +502,19 @@ internal static void CreateSymbolicLink(string path, string pathToTarget, bool i
                 success = MemoryMarshal.TryRead(bufferSpan, out Interop.Kernel32.SymbolicLinkReparseBuffer rbSymlink);
                 Debug.Assert(success);
 
+                // We use PrintName(Offset|Length) instead of SubstituteName(Offset|Length) given that we don't want to return
+                // an NT path when the link wasn't created with such NT path.
+                // Unlike SubstituteName and GetFinalPathNameByHandle(), PrintName doesn't start with a prefix.
+                // Another nuance is that SubstituteName does not contain redundant path segments while PrintName does.
+                // PrintName can ONLY return a NT path if the link was created explicitly targeting a file/folder in such way.
+                //   e.g: mklink /D linkName \??\C:\path\to\target.
+
                 if (rbSymlink.ReparseTag == Interop.Kernel32.IOReparseOptions.IO_REPARSE_TAG_SYMLINK)
                 {
-                    // We use PrintName instead of SubstituteName given that we don't want to return a NT path when the link wasn't created with such NT path.
-                    // Unlike SubstituteName and GetFinalPathNameByHandle(), PrintName doesn't start with a prefix.
-                    // Another nuance is that SubstituteName does not contain redundant path segments while PrintName does.
-                    // PrintName can ONLY return a NT path if the link was created explicitly targeting a file/folder in such way. e.g: mklink /D linkName \??\C:\path\to\target.
-
-                    int printNameNameOffset = sizeof(Interop.Kernel32.SymbolicLinkReparseBuffer) + rbSymlink.PrintNameOffset;
-                    int printNameNameLength = rbSymlink.PrintNameLength;
+                    int printNameOffset = sizeof(Interop.Kernel32.SymbolicLinkReparseBuffer) + rbSymlink.PrintNameOffset;
+                    int printNameLength = rbSymlink.PrintNameLength;
 
-                    Span<char> targetPathSymlink = MemoryMarshal.Cast<byte, char>(bufferSpan.Slice(printNameNameOffset, printNameNameLength));
+                    Span<char> targetPathSymlink = MemoryMarshal.Cast<byte, char>(bufferSpan.Slice(printNameOffset, printNameLength));
                     Debug.Assert((rbSymlink.Flags & Interop.Kernel32.SYMLINK_FLAG_RELATIVE) == 0 || !PathInternal.IsExtended(targetPathSymlink));
 
                     if (returnFullPath && (rbSymlink.Flags & Interop.Kernel32.SYMLINK_FLAG_RELATIVE) != 0)
@@ -528,12 +530,13 @@ internal static void CreateSymbolicLink(string path, string pathToTarget, bool i
                     success = MemoryMarshal.TryRead(bufferSpan, out Interop.Kernel32.MountPointReparseBuffer rbMountPoint);
                     Debug.Assert(success);
 
-                    int printNameNameOffset = sizeof(Interop.Kernel32.MountPointReparseBuffer) + rbMountPoint.PrintNameOffset;
-                    int printNameNameLength = rbMountPoint.PrintNameLength;
+                    int printNameOffset = sizeof(Interop.Kernel32.MountPointReparseBuffer) + rbMountPoint.PrintNameOffset;
+                    int printNameLength = rbMountPoint.PrintNameLength;
 
-                    Span<char> targetPathMountPoint = MemoryMarshal.Cast<byte, char>(bufferSpan.Slice(printNameNameOffset, printNameNameLength));
-                    Debug.Assert(!PathInternal.IsExtended(targetPathMountPoint));
+                    Span<char> targetPathMountPoint = MemoryMarshal.Cast<byte, char>(bufferSpan.Slice(printNameOffset, printNameLength));
 
+                    // Unlink symlinks, mount point paths cannot be relative
+                    Debug.Assert(!PathInternal.IsExtended(targetPathMountPoint));
                     return targetPathMountPoint.ToString();
                 }