tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-23 22:05:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

use latest sdk in build script

Browse Source
This commit is contained in:
Tess Gauthier 2023-04-04 15:48:27 -04:00
parent 1e901dd60e
commit ada0f40a07
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -768,7 +768,7 @@ function Get-BuildToolPath
function Get-Windows10SDKVersion function Get-Windows10SDKVersion
{ {
#Temporary fix - Onecore builds are failing with latest windows 10 SDK (10.0.18362.0) #Temporary fix - Onecore builds are failing with latest windows 10 SDK (10.0.18362.0)
$requiredSDKVersion = [version]"10.0.17763.0" $requiredSDKVersion = [version]"10.0.22621.0"
## Search for latest windows sdk available on the machine ## Search for latest windows sdk available on the machine
$windowsSDKPath = Join-Path ${env:ProgramFiles(x86)} "Windows Kits\10\bin\$requiredSDKVersion\x86\register_app.vbs" $windowsSDKPath = Join-Path ${env:ProgramFiles(x86)} "Windows Kits\10\bin\$requiredSDKVersion\x86\register_app.vbs"
if (test-path $windowsSDKPath) { if (test-path $windowsSDKPath) {

10
contrib/win32/openssh/paths.targets
View File

@ -10,10 +10,10 @@
<!--libcbor version is not used in the bulid; it is needed for pipeline compliance tasks--> <!--libcbor version is not used in the bulid; it is needed for pipeline compliance tasks-->
<libcborVersion>0.10.1</libcborVersion> <libcborVersion>0.10.1</libcborVersion>
<LibreSSL-Path>$(SolutionDir)\LibreSSL\sdk\</LibreSSL-Path> <LibreSSL-Path>$(SolutionDir)\LibreSSL\sdk\</LibreSSL-Path>
<LibreSSL-x86-Path>$(SolutionDir)\LibreSSL\bin\onecore\x86\</LibreSSL-x86-Path> <LibreSSL-x86-Path>$(SolutionDir)\LibreSSL\bin\desktop\x86\</LibreSSL-x86-Path>
<LibreSSL-x64-Path>$(SolutionDir)\LibreSSL\bin\onecore\x64\</LibreSSL-x64-Path> <LibreSSL-x64-Path>$(SolutionDir)\LibreSSL\bin\desktop\x64\</LibreSSL-x64-Path>
<LibreSSL-arm64-Path>$(SolutionDir)\LibreSSL\bin\onecore\arm64\</LibreSSL-arm64-Path> <LibreSSL-arm64-Path>$(SolutionDir)\LibreSSL\bin\desktop\arm64\</LibreSSL-arm64-Path>
<LibreSSL-arm-Path>$(SolutionDir)\LibreSSL\bin\onecore\arm\</LibreSSL-arm-Path> <LibreSSL-arm-Path>$(SolutionDir)\LibreSSL\bin\desktop\arm\</LibreSSL-arm-Path>
<fido2-Path>$(SolutionDir)\libfido2\</fido2-Path> <fido2-Path>$(SolutionDir)\libfido2\</fido2-Path>
<fido2-x86-Path>$(SolutionDir)\libfido2\Win32\Release\static\</fido2-x86-Path> <fido2-x86-Path>$(SolutionDir)\libfido2\Win32\Release\static\</fido2-x86-Path>
<fido2-x64-Path>$(SolutionDir)\libfido2\Win64\Release\static\</fido2-x64-Path> <fido2-x64-Path>$(SolutionDir)\libfido2\Win64\Release\static\</fido2-x64-Path>
@ -26,7 +26,7 @@
<ZLib-arm-Path>$(SolutionDir)\ZLib\bin\arm\</ZLib-arm-Path> <ZLib-arm-Path>$(SolutionDir)\ZLib\bin\arm\</ZLib-arm-Path>
<UseOpenSSL>true</UseOpenSSL> <UseOpenSSL>true</UseOpenSSL>
<SSLLib>libcrypto.lib;</SSLLib> <SSLLib>libcrypto.lib;</SSLLib>
<WindowsSDKVersion>10.0.17763.0</WindowsSDKVersion> <WindowsSDKVersion>10.0.22621.0</WindowsSDKVersion>
<AdditionalDependentLibs>bcrypt.lib;Userenv.lib;Crypt32.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;Rpcrt4.lib;ntdll.lib</AdditionalDependentLibs> <AdditionalDependentLibs>bcrypt.lib;Userenv.lib;Crypt32.lib;Ws2_32.lib;Secur32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Netapi32.lib;Rpcrt4.lib;ntdll.lib</AdditionalDependentLibs>
<MinimalCoreWin>false</MinimalCoreWin> <MinimalCoreWin>false</MinimalCoreWin>
</PropertyGroup> </PropertyGroup>