updated CI 14

Author: ayousuf23

.azdevops/TestsTemplate.yml

@@ -84,11 +84,11 @@ jobs:
             $content = 7z.exe a archive.zip .azdevops
             $content | Write-Verbose -Verbose
           }
-          Get-ChildItem $(PowerShellPreviewExecutablePath) | Write-Verbose 
           "$(PowerShellPreviewExecutablePath) .azdevops/RunTests.ps1" | Invoke-Expression
           if ("${{ parameters.vmImageName }}" -like 'macos-*')
           {
             "pwsh .azdevops/RunTests.ps1" | Invoke-Expression
+            "pwsh-preview .azdevops/RunTests.ps1" | Invoke-Expression
           }
         displayName: Run Tests
         

src/PathHelper.cs

@@ -126,6 +126,8 @@ private string GetEntryName(FileSystemInfo fileSystemInfo, out bool doesPreserve
                 Debug.Assert(relativePath is not null);
                 doesPreservePathStructure = true;
                 entryName = relativePath;
+
+                _cmdlet.WriteVerbose($"Relative path, entry name: {entryName}");
             }
             // Otherwise, return the name of the directory or file
             else 
@@ -137,6 +139,8 @@ private string GetEntryName(FileSystemInfo fileSystemInfo, out bool doesPreserve
             {
                 entryName += System.IO.Path.DirectorySeparatorChar;
             }
+
+
             return entryName;
         }
 
@@ -198,7 +202,14 @@ private static string GetPrefixForPath(System.IO.DirectoryInfo directoryInfo)
         /// <returns></returns>
         private bool TryGetPathRelativeToCurrentWorkingDirectory(string path, out string? relativePathToWorkingDirectory)
         {
-            string relativePath = System.IO.Path.GetRelativePath(_cmdlet.SessionState.Path.CurrentFileSystemLocation.Path, path);
+            Debug.Assert(!string.IsNullOrEmpty(path));
+            string? workingDirectoryRoot = Path.GetPathRoot(_cmdlet.SessionState.Path.CurrentFileSystemLocation.Path);
+            string? pathRoot = Path.GetPathRoot(path);
+            if (workingDirectoryRoot != pathRoot) {
+                relativePathToWorkingDirectory = null;
+                return false;
+            }
+            string relativePath = Path.GetRelativePath(_cmdlet.SessionState.Path.CurrentFileSystemLocation.Path, path);
             relativePathToWorkingDirectory = relativePath.Contains("..") ? null : relativePath;
             return relativePathToWorkingDirectory is not null;
         }