updated CI to run tests using new assertion, updated README with Azure CI status, fixed a bug where a path is determined to be relative to the working directory if the working directory is on a different drive than the path

Author: ayousuf23

.azdevops/RunTests.ps1

@@ -1,36 +1,22 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-# Load the module
-$module = Get-Module -Name "Microsoft.PowerShell.Archive"
-if ($null -ne $module)
-{
-    Remove-Module $module
-}
-
 # Import the built module
 Import-Module "$env:PIPELINE_WORKSPACE/ModuleBuild/Microsoft.PowerShell.Archive.psd1"
 
-$pesterRequiredVersion = "5.3"
+Get-ChildItem "$env:PIPELINE_WORKSPACE/ModuleBuild" | Write-Verbose -Verbose
 
-# If Pester 5.3.3 is not installed, install it
-$shouldInstallPester = $true
-
-if ($pesterModules = Get-Module -Name "Pester" -ListAvailable) {
-    foreach ($module in $pesterModules) {
-        if ($module.Version.ToString() -eq $pesterRequiredVersion) {
-            $shouldInstallPester = $false
-            break
-        }
-    }
-}
+$pesterMinVersion = "5.3.0"
+$pesterMaxVersion = "5.3.9"
 
-if ($shouldInstallPester) {
-    Install-Module -Name "Pester" -RequiredVersion $pesterRequiredVersion -Force
+# If Pester 5.3.x is not installed, install it
+$pesterModule = Get-InstalledModule -Name "Pester" -MinimumVersion $pesterMinVersion -MaximumVersion $pesterMaxVersion
+if ($null -eq $pesterModule) {
+    Install-Module -Name "Pester" -MinimumVersion $pesterMinVersion -MaximumVersion $pesterMaxVersion -Force
 }
 
 # Load Pester
-Import-Module -Name "Pester" -RequiredVersion $pesterRequiredVersion
+Import-Module -Name "Pester" -MinimumVersion $pesterMinVersion -MaximumVersion $pesterMaxVersion
 
 # Run tests
 $OutputFile = "$PWD/build-unit-tests.xml"

.azdevops/TestsTemplate.yml

@@ -22,50 +22,65 @@ jobs:
 
       - pwsh: |
           Write-Output ${{ parameters.vmImageName }}
-          $url = "https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-x64.zip"
-          $isTar = $false
+          
+          if ("${{ parameters.vmImageName }}" -like 'windows-*')
+          {
+            $url = "https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-x64.zip"
+            $downloadFilename = "pwsh_download.msi"
+          }
+          
           if ("${{ parameters.vmImageName }}" -like 'macos-*')
           {
-            $url = "https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-x64.tar.gz"
-            $isTar = $true
-            Write-Output "Choose macOS"
+            $url = "https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-x64.pkg"
+            $downloadFilename = "pwsh_download.pkg"
           }
           if ("${{ parameters.vmImageName }}" -like 'ubuntu-*')
           {
             $url = "https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-linux-x64.tar.gz"
-            $isTar = $true
-            Write-Output "Choose Ubuntu"
+            $downloadFilename = "pwsh_download.tar.gz"
           }
-          $destination = "powershell-preview-archive"
-          if ($isTar) {
-            $destination += ".tar.gz"
-          } else {
-            $destination += ".zip"
+
+          $downloadDestination = Join-Path $pwd $downloadFilename
+          Invoke-WebRequest -Uri $url -OutFile $downloadDestination
+
+          # Installation steps for windows
+          if ("${{ parameters.vmImageName }}" -like 'windows-*') {
+            Expand-Archive -Path $downloadDestination -DestinationPath "pwsh-preview"
+            $powerShellPreview = Join-Path $pwd "pwsh-preview" "pwsh.exe"
           }
-          Invoke-WebRequest -Uri $url -OutFile $destination
-          ## unpack the downloaded file
-          $powershellPreview = Join-Path $pwd "powershell-preview"
-          mkdir $powershellPreview
-          if ($isTar)
+          if ("${{ parameters.vmImageName }}" -like 'ubuntu-*')
           {
-            gunzip -d $destination
-            $destination = $destination.Replace(".gz", "")
-            tar -x -f $destination -C $powershellPreview
-          } else {
-            Expand-Archive -Path $destination -DestinationPath $powershellPreview
+            gunzip -d $downloadDestination
+            $downloadDestination = $downloadDestination.Replace(".gz", "")
+            mkdir "pwsh-preview"
+            tar -x -f $downloadDestination -C "pwsh-preview"
+            $powerShellPreview = Join-Path $pwd "pwsh-preview" "pwsh"
           }
-          # Print contents of $powershellPreview
-          #Get-ChildItem $powershellPreview | Format-Table "Name"
-          $powershellPreview = Join-Path $powershellPreview "pwsh"
-          if ("${{ parameters.vmImageName }}" -like 'windows-*')
+          if ("${{ parameters.vmImageName }}" -like 'macos-*')
           {
-            $powerShellPreview += ".exe"
+            sudo xattr -rd com.apple.quarantine "${downloadDestination}"
+            sudo installer -pkg "${downloadDestination}" -target /
+            $powerShellPreview = "pwsh-preview"
           }
           # Write the location of PowerShell Preview
           Write-Host "##vso[task.setvariable variable=PowerShellPreviewExecutablePath;]$powershellPreview"
         displayName: Download and Install PowerShell Preview
 
       - pwsh: |
+          $destination = Join-Path $pwd "7z.exe"
+          $installUrl = "https://www.7-zip.org/a/7z2201-x64.exe"
+          Invoke-WebRequest -Uri $installUrl -OutFile $destination
+          # Run the installer in silent mode
+          .$destination /S /D="C:\Program Files\7-Zip"
+        displayName: Install 7-zip
+        condition: and(succeeded(), startswith('${{ parameters.vmImageName }}', 'windows'))
+
+      - pwsh: |
+          if ("${{ parameters.vmImageName }}" -like 'windows-*')
+          {
+            # Add 7-zip to PATH on Windows
+            [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+';C:\Program Files\7-zip')
+          }
           "$(PowerShellPreviewExecutablePath) .azdevops/RunTests.ps1" | Invoke-Expression
         displayName: Run Tests
         

README.md

@@ -1,10 +1,9 @@
 # Microsoft.PowerShell.Archive Module
 [Microsoft.PowerShell.Archive module](https://technet.microsoft.com/en-us/library/dn818910.aspx) contains cmdlets that let you create and extract ZIP archives.
 
-|AppVeyor (Windows)   | Travis CI (Linux)  |
-|:-------------------:|:------------------:|
-|[![Build status](https://ci.appveyor.com/api/projects/status/npvhboe2nbdbtteg/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/microsoft-powershell-archive/branch/master)|[![Build Status](https://travis-ci.org/PowerShell/Microsoft.PowerShell.Archive.svg?branch=master)](https://travis-ci.org/PowerShell/Microsoft.PowerShell.Archive)|
-
+| Azure CI  |
+|:-------------------:|
+|[![Build Status](https://dev.azure.com/powershell/Archive/_apis/build/status/PowerShell.Microsoft.PowerShell.Archive?repoName=PowerShell%2FMicrosoft.PowerShell.Archive&branchName=refs%2Fpull%2F131%2Fmerge)](https://dev.azure.com/powershell/Archive/_build/latest?definitionId=130&repoName=PowerShell%2FMicrosoft.PowerShell.Archive&branchName=refs%2Fpull%2F131%2Fmerge)|
 ## [Compress-Archive](https://technet.microsoft.com/library/dn841358.aspx) examples
 1. Create an archive from an entire folder including subdirectories: `Compress-Archive -Path C:\Reference -DestinationPath C:\Archives\Draft.zip`
 2. Update an existing archive file: `Compress-Archive -Path C:\Reference\* -DestinationPath C:\Archives\Draft.zip -Update`

Tests/Assertions/Should-BeZipArchiveOnlyContaining.psm1

@@ -48,7 +48,11 @@ function Should-BeZipArchiveOnlyContaining {
     }
 
     # Get 7-zip to list the contents of the archive
-    $output = 7z.exe l $ActualValue -ba
+    if ($IsWindows) {
+        $output = 7z.exe l $ActualValue -ba
+    } else {
+        $output = 7z l $ActualValue -ba
+    }
 
     # Check if the output is null
     if ($null -eq $output) {

Tests/Compress-Archive.Tests.ps1

@@ -58,9 +58,9 @@ BeforeDiscovery {
         }
 
         It "Validate errors from Compress-Archive when invalid path is supplied for Path or LiteralPath parameters" -ForEach @(
-            @{ Path = "Env:/Path" }
-            @{ Path = @("TestDrive:/", "Env:/Path") }
-        ) -Tag this1 {
+            @{ Path = "Variable:/PWD" }
+            @{ Path = @("TestDrive:/", "Variable:/PWD") }
+        ) {
             $DestinationPath = "TestDrive:/archive2.zip"
 
             Compress-Archive -Path $Path -DestinationPath $DestinationPath -ErrorAction SilentlyContinue -ErrorVariable error
@@ -249,8 +249,14 @@ BeforeDiscovery {
         It "-WriteMode Create works" -Tag td1 {
             $sourcePath = "TestDrive:/SourceDir"
             $destinationPath = "TestDrive:/archive1.zip"
-            Compress-Archive -Path $sourcePath -DestinationPath $destinationPath
+            Compress-Archive -Path $sourcePath -DestinationPath $destinationPath -Verbose
+            if ($IsWindows) {
+                $t = Convert-Path $destinationPath
+                7z l "${t}" | Write-Verbose -Verbose
+            }
             $destinationPath | Should -BeZipArchiveOnlyContaining @('SourceDir/', 'SourceDir/Sample-1.txt')
+
+            
         }
     }
 

Tests/Install-7Zip.ps1

@@ -137,6 +137,8 @@ private string GetEntryName(FileSystemInfo fileSystemInfo, out bool doesPreserve
             {
                 entryName += System.IO.Path.DirectorySeparatorChar;
             }
+
+
             return entryName;
         }
 
@@ -198,7 +200,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;
         }