migrate dependencies to vcpkg

.azdo/ci.yml

@@ -22,15 +22,32 @@ stages:
       - ImageOverride -equals PSMMS2022-OpenSSH-Secure
 
     steps:
-    - powershell: |
-        $powerShellPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'powershell'
-        Invoke-WebRequest -Uri https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.ps1 -outfile ./install-powershell.ps1
-        ./install-powershell.ps1 -Destination $powerShellPath
-        $vstsCommandString = "vso[task.setvariable variable=PATH]$powerShellPath;$env:PATH"
-        Write-Host "sending " + $vstsCommandString
-        Write-Host "##$vstsCommandString"
-      displayName: Install PowerShell Core
-
+    - pwsh: |
+        # Compare LibreSSL versions in vcpkg.json and add-resource-file.patch
+        $vcpkgObj = Get-Content "$(Build.SourcesDirectory)/contrib/win32/openssh/vcpkg.json" | ConvertFrom-Json
+        $libresslVersionJson = $vcpkgObj | Select-Object -ExpandProperty overrides | Where-Object { $_.name -eq 'libressl' } | Select-Object -ExpandProperty version
+
+        # resource file version needs to be trimmed (e.g. 4.0.0.0 to 4.0.0)
+        $patchContent = Get-Content "$(Build.SourcesDirectory)/contrib/win32/openssh/vcpkg_overlay_ports/libressl/add-version-file.patch"
+        $libresslVersionPatch = ($patchContent -join "`n" | Select-String -Pattern '"FileVersion",\s*"(\d+\.\d+\.\d+\.\d+)"' -AllMatches).Matches | ForEach-Object { $_.Groups[1].Value }
+        $libresslVersionPatchParts = $libresslVersionPatch -split '\.'
+        $libresslVersionPatchShort = ($libresslVersionPatchParts[0..2] -join '.')
+
+        if ($libresslVersionJson -ne $libresslVersionPatchShort) {
+          Write-Error "LibreSSL version mismatch: vcpkg.json has $libresslVersionJson, patch file has $libresslVersionPatch"
+          exit 1
+        } else {
+          Write-Verbose -Verbose "LibreSSL versions match: $libresslVersionJson"
+        }
+      displayName: 'Verify version info'
+
+    - pwsh: |-
+        git clone https://github.com/microsoft/vcpkg
+        cd vcpkg
+        & ./bootstrap-vcpkg.bat
+        & ./vcpkg.exe integrate install
+      displayName: Install vcpkg
+
     - pwsh: |
         Import-Module -Name "$(Build.SourcesDirectory)/contrib/win32/openssh/AzDOBuildTools" -Force
         Invoke-AzDOBuild
@@ -81,6 +98,26 @@ stages:
         Write-Host "##vso[artifact.upload containerfolder=$artifactName;artifactname=$artifactName;]$configFilePath"
       displayName: Upload Win32-OpenSSH build artifacts
 
+    - pwsh: |
+        $logFileNames = @("OpenSSHReleasex64.log", "OpenSSHReleasex86.log")
+        $uniqueLines = [System.Collections.Generic.HashSet[string]]::new()
+        forEach ($logFile in $logFileNames) {
+          $logFilePath = "$(Build.SourcesDirectory)/contrib/win32/openssh/$logFile"
+          $logLines = Get-Content $logFilePath
+          $buildSucceededIndex = $logLines.IndexOf("Build succeeded.")
+          $linesToCheck = $logLines[($buildSucceededIndex + 1)..$logLines.Length]
+          forEach ($line in $linesToCheck) {
+            if ($line -match "warning C") {
+              $uniqueLines.Add($line) | Out-Null
+            }
+          }
+        }
+        forEach ($uniqueLine in $uniqueLines) {
+          Write-Output $uniqueLine
+          Write-Host "##vso[task.logissue type=warning]$uniqueLine"
+        }
+      displayName: Surface Warnings from Build Logs
+
 - stage: Test
   displayName: Test Win32-OpenSSH
   dependsOn: Build
@@ -92,15 +129,6 @@ stages:
     variables:
       testFilesDrivePath: '**'
     steps:
-    - powershell: |
-        $powerShellPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'powershell'
-        Invoke-WebRequest -Uri https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.ps1 -outfile ./install-powershell.ps1
-        ./install-powershell.ps1 -Destination $powerShellPath
-        $vstsCommandString = "vso[task.setvariable variable=PATH]$powerShellPath;$env:PATH"
-        Write-Host "sending " + $vstsCommandString
-        Write-Host "##$vstsCommandString"
-      displayName: 'Install PowerShell Core'
-
     - task: DownloadBuildArtifacts@0
       displayName: 'Download build artifacts'
       inputs:

.gitignore

@@ -45,6 +45,7 @@ tags
 /contrib/win32/openssh/LibreSSL
 /contrib/win32/openssh/ZLib
 /contrib/win32/openssh/libfido2
+/contrib/win32/openssh/vcpkg_installed
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 

contrib/win32/openssh/AzDOBuildTools/AzDOBuildTools.psm1

@@ -47,7 +47,7 @@ function Invoke-AzDOBuild
 function Install-OpenSSH
 {
     [CmdletBinding()]
-    param ( 
+    param (
         [Parameter(Mandatory=$true)]
         [string]$SourceDir,
 
@@ -62,7 +62,7 @@ function Install-OpenSSH
 
     Copy-Item -Path "$SourceDir/*" -Destination $OpenSSHDir -Recurse -Force -Verbose
 
-    Push-Location $OpenSSHDir 
+    Push-Location $OpenSSHDir
 
     try
     {
@@ -81,8 +81,8 @@ function Install-OpenSSH
         {
             [Environment]::SetEnvironmentVariable('Path', $newMachineEnvironmentPath, 'MACHINE')
         }
-        
-        Start-Service -Name sshd 
+
+        Start-Service -Name sshd
         Start-Service -Name ssh-agent
     }
     finally
@@ -100,7 +100,7 @@ function Install-OpenSSH
 function UnInstall-OpenSSH
 {
     [CmdletBinding()]
-    param ( 
+    param (
         [string]$OpenSSHDir = "$env:SystemDrive\OpenSSH"
     )
 
@@ -117,15 +117,15 @@ function UnInstall-OpenSSH
             Stop-Service ssh-agent -Force
         }
         & "$OpenSSHDir\uninstall-sshd.ps1"
-            
+
         $machinePath = [Environment]::GetEnvironmentVariable('Path', 'MACHINE')
         $newMachineEnvironmentPath = $machinePath
         if ($machinePath.ToLower().Contains($OpenSSHDir.ToLower()))
-        {        
+        {
             $newMachineEnvironmentPath = $newMachineEnvironmentPath.Replace("$OpenSSHDir;", '')
             $env:Path = $env:Path.Replace("$OpenSSHDir;", '')
         }
-        
+
         if ($newMachineEnvironmentPath -ne $machinePath)
         {
             [Environment]::SetEnvironmentVariable('Path', $newMachineEnvironmentPath, 'MACHINE')
@@ -136,7 +136,7 @@ function UnInstall-OpenSSH
         Pop-Location
     }
 
-    Remove-Item -Path $OpenSSHDir -Recurse -Force -ErrorAction SilentlyContinue    
+    Remove-Item -Path $OpenSSHDir -Recurse -Force -ErrorAction SilentlyContinue
 }
 
 #
@@ -181,7 +181,7 @@ function Invoke-OpenSSHTests
     }
 
     $xml = [xml](Get-Content $OpenSSHTestInfo["SetupTestResultsFile"] | out-string)
-    if ([int]$xml.'test-results'.failures -gt 0) 
+    if ([int]$xml.'test-results'.failures -gt 0)
     {
         $errorMessage = "$($xml.'test-results'.failures) Setup Tests in regress\pesterTests failed. Detail test log is at $($OpenSSHTestInfo["SetupTestResultsFile"])."
         Write-BuildMessage -Message $errorMessage -Category Error
@@ -306,7 +306,7 @@ function Invoke-OpenSSHTests
     else
     {
         $xml = [xml](Get-Content $OpenSSHTestInfo["UninstallTestResultsFile"] | out-string)
-        if ([int]$xml.'test-results'.failures -gt 0) 
+        if ([int]$xml.'test-results'.failures -gt 0)
         {
             $errorMessage = "$($xml.'test-results'.failures) uninstall tests in regress\pesterTests failed. Detail test log is at $($OpenSSHTestInfo["UninstallTestResultsFile"])."
             Write-BuildMessage -Message $errorMessage -Category Error
@@ -318,7 +318,7 @@ function Invoke-OpenSSHTests
     $OpenSSHTestInfo | Export-Clixml -Path "$repoRoot/OpenSSHTestInfo.xml" -Depth 10
 
     # Writing out warning when the $Error.Count is non-zero. Tests Should clean $Error after success.
-    if ($Error.Count -gt 0) 
+    if ($Error.Count -gt 0)
     {
         Write-BuildMessage -Message "Tests Should always clean $Error variable after success." -Category Warning
     }
@@ -339,7 +339,7 @@ function Invoke-OpenSSHTests
       Collect OpenSSH pester test results into one directory
 #>
 function Copy-OpenSSHTestResults
-{ 
+{
     param (
         [Parameter(Mandatory=$true)]
         [string] $ResultsPath
@@ -352,7 +352,7 @@ function Copy-OpenSSHTestResults
 
     Write-Verbose -Verbose "Creating test results directory for artifacts upload: $ResultsPath"
     $null = New-Item -Path $ResultsPath -ItemType Directory -Force
-    
+
     if (! (Test-Path -Path $ResultsPath))
     {
         Write-BuildMessage -Message "Unable to write to test results path for test artifacts upload: $ResultsPath" -Category Error
@@ -498,7 +498,7 @@ function Copy-UnitTests
 function Install-UnitTests
 {
     [CmdletBinding()]
-    param ( 
+    param (
         [Parameter(Mandatory=$true)]
         [string]$SourceDir,
 

contrib/win32/openssh/OpenSSHBuildHelper.psm1

@@ -365,19 +365,12 @@ function Start-OpenSSHPackage
     }
 
     #copy libcrypto dll
-    $libreSSLPath = Join-Path $PSScriptRoot "LibreSSL"
+    $libreSSLPath = Join-Path $PSScriptRoot "vcpkg_installed" 
     if (-not $NoOpenSSL.IsPresent)
     {        
-        if($OneCore)
-        {
-            Copy-Item -Path $(Join-Path $libreSSLPath "bin\onecore\$NativeHostArch\libcrypto.dll") -Destination $packageDir -Force -ErrorAction Stop
-            Copy-Item -Path $(Join-Path $libreSSLPath "bin\onecore\$NativeHostArch\libcrypto.pdb") -Destination $symbolsDir -Force -ErrorAction Stop
-        }
-        else
-        {
-            Copy-Item -Path $(Join-Path $libreSSLPath "bin\desktop\$NativeHostArch\libcrypto.dll") -Destination $packageDir -Force -ErrorAction Stop
-            Copy-Item -Path $(Join-Path $libreSSLPath "bin\desktop\$NativeHostArch\libcrypto.pdb") -Destination $symbolsDir -Force -ErrorAction Stop
-        }
+        $subPath = $NativeHostArch + "-custom\" + $NativeHostArch + "-custom\bin\"
+        Copy-Item -Path $(Join-Path $libreSSLPath "$subPath\libcrypto.dll") -Destination $packageDir -Force -ErrorAction Stop
+        Copy-Item -Path $(Join-Path $libreSSLPath "$subPath\libcrypto.pdb") -Destination $symbolsDir -Force -ErrorAction Stop
     }    
 
     if ($DestinationPath -ne "") {
@@ -554,12 +547,6 @@ function Start-OpenSSHBuild
         $xml.Project.PropertyGroup.AdditionalDependentLibs = 'onecore.lib;shlwapi.lib'
         $xml.Project.PropertyGroup.MinimalCoreWin = 'true'
 
-        #Use onecore libcrypto binaries
-        $xml.Project.PropertyGroup."LibreSSL-x86-Path" = '$(SolutionDir)\LibreSSL\bin\onecore\x86\'
-        $xml.Project.PropertyGroup."LibreSSL-x64-Path" = '$(SolutionDir)\LibreSSL\bin\onecore\x64\'
-        $xml.Project.PropertyGroup."LibreSSL-arm-Path" = '$(SolutionDir)\LibreSSL\bin\onecore\arm\'
-        $xml.Project.PropertyGroup."LibreSSL-arm64-Path" = '$(SolutionDir)\LibreSSL\bin\onecore\arm64\'
-
         $xml.Save($PathTargets)
     }