tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update docker file and build helper (#436)

This commit is contained in:
bagajjal 2020-03-18 05:23:04 +00:00 committed by GitHub
parent be6a7c80d8
commit f4498b7c5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/win32/openssh/DockerFile
View File

@ -1,7 +1,6 @@
# escape=` # escape=`
#0.3.6 (no powershell 6) #0.3.6 (no powershell 6)
#FROM travisez13/microsoft.windowsservercore.build-tools:latest FROM balu1202/openssh-dockerbuildimage-ltsc2019-new:latest
FROM balu1202/winservercore_openssh:latest
SHELL ["PowerShell.exe", "-command"] SHELL ["PowerShell.exe", "-command"]
RUN Set-ExecutionPolicy Unrestricted RUN Set-ExecutionPolicy Unrestricted

4
contrib/win32/openssh/OpenSSHBuildHelper.psm1
View File

@ -627,7 +627,9 @@ function Get-Windows10SDKVersion
$windowsSDKPath = Join-Path ${env:ProgramFiles(x86)} "Windows Kits\10\Lib" $windowsSDKPath = Join-Path ${env:ProgramFiles(x86)} "Windows Kits\10\Lib"
$minSDKVersion = [version]"10.0.14393.0" $minSDKVersion = [version]"10.0.14393.0"
$versionsAvailable = @() $versionsAvailable = @()
$versionsAvailable += Get-ChildItem $windowsSDKPath | ? {$_.Name.StartsWith("10.")} | % {$version = [version]$_.Name; if($version.CompareTo($minSDKVersion) -ge 0) {$version}} #Temporary fix - Onecore builds are failing with latest widows 10 SDK (10.0.18362.0)
$maxSDKVersion = [version]"10.0.17763.0"
$versionsAvailable = Get-ChildItem $windowsSDKPath | ? {$_.Name.StartsWith("10.")} | % {$version = [version]$_.Name; if(($version.CompareTo($minSDKVersion) -ge 0) -and ($version.CompareTo($maxSDKVersion) -le 0)) {$version}}
if(0 -eq $versionsAvailable.count) if(0 -eq $versionsAvailable.count)
{ {
return $null return $null

2
regress/unittests/test_helper/test_helper.c
View File

@ -147,7 +147,7 @@ main(int argc, char **argv)
swprintf_s(moduli_default_path, PATH_MAX, L"%s\\..\\%s", __wprogdir, L"moduli"); swprintf_s(moduli_default_path, PATH_MAX, L"%s\\..\\%s", __wprogdir, L"moduli");
if (CopyFileW(moduli_default_path, programdata_moduli_path, TRUE) == 0) { if (CopyFileW(moduli_default_path, programdata_moduli_path, TRUE) == 0) {
printf("Failed to copy %s to %s, error:%d", moduli_default_path, programdata_moduli_path, GetLastError()); printf("Failed to copy %ls to %ls, error:%d", moduli_default_path, programdata_moduli_path, GetLastError());
exit(255); exit(255);
} }
isModuliFileCopied = 1; isModuliFileCopied = 1;