diff --git a/contrib/win32/openssh/AppveyorHelper.psm1 b/contrib/win32/openssh/AppveyorHelper.psm1 index 243b36d4e..c136ab77b 100644 --- a/contrib/win32/openssh/AppveyorHelper.psm1 +++ b/contrib/win32/openssh/AppveyorHelper.psm1 @@ -162,6 +162,7 @@ function Install-OpenSSH $NativeHostArch = 'x86' } } + UnInstall-OpenSSH -OpenSSHDir $OpenSSHDir Start-OpenSSHPackage -NativeHostArch $NativeHostArch -Configuration $Configuration -DestinationPath $OpenSSHDir diff --git a/contrib/win32/openssh/OpenSSHTestHelper.psm1 b/contrib/win32/openssh/OpenSSHTestHelper.psm1 index 37b043bb9..3ec843450 100644 --- a/contrib/win32/openssh/OpenSSHTestHelper.psm1 +++ b/contrib/win32/openssh/OpenSSHTestHelper.psm1 @@ -72,7 +72,7 @@ function Set-OpenSSHTestEnvironment "PubKeyUser"= $PubKeyUser; # test user to be used with explicit key for key auth "PasswdUser"= $PasswdUser; # common password for all test accounts "TestAccountPW"= $OpenSSHTestAccountsPassword; # common password for all test accounts - "TestDataPath" = $TestDataPath; # openssh tests path + "TestDataPath" = $TestDataPath; # openssh tests path "TestSetupLogFile" = $Script:TestSetupLogFile; # openssh test setup log file "E2ETestResultsFile" = $Script:E2ETestResultsFile; # openssh E2E test results file "UnitTestResultsFile" = $Script:UnitTestResultsFile; # openssh unittest test results file @@ -133,6 +133,8 @@ function Set-OpenSSHTestEnvironment { $Script:WindowsInBox = $true $Global:OpenSSHTestInfo.Add("WindowsInBox", $true) + $Global:OpenSSHTestInfo["EnableAppVerifier"] = $false + $Script:EnableAppVerifier = $false } $description = @" @@ -166,11 +168,11 @@ WARNING: Following changes will be made to OpenSSH configuration } $backupConfigPath = Join-Path $OpenSSHConfigPath sshd_config.ori - #Backup existing OpenSSH configuration - if (-not (Test-Path $backupConfigPath -PathType Leaf)) { - Copy-Item (Join-Path $OpenSSHConfigPath sshd_config) $backupConfigPath -Force - } $targetsshdConfig = Join-Path $OpenSSHConfigPath sshd_config + #Backup existing OpenSSH configuration + if ((Test-Path $targetsshdConfig -PathType Leaf) -and (-not (Test-Path $backupConfigPath -PathType Leaf))) { + Copy-Item $targetsshdConfig $backupConfigPath -Force + } # copy new sshd_config Copy-Item (Join-Path $Script:E2ETestDirectory sshd_config) $targetsshdConfig -Force if($DebugMode) { @@ -262,7 +264,7 @@ WARNING: Following changes will be made to OpenSSH configuration cmd /c "ssh-add $testPriKeypath 2>&1 >> $Script:TestSetupLogFile" #Enable AppVerifier - if($EnableAppVerifier) + if($Script:EnableAppVerifier) { # clear all applications in application verifier first & $env:windir\System32\appverif.exe -disable * -for * | out-null diff --git a/contrib/win32/openssh/keygen.vcxproj b/contrib/win32/openssh/keygen.vcxproj index 68b8bffa9..c39d0882e 100644 --- a/contrib/win32/openssh/keygen.vcxproj +++ b/contrib/win32/openssh/keygen.vcxproj @@ -185,6 +185,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -192,6 +193,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -206,6 +208,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -213,6 +216,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -227,6 +231,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -234,6 +239,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -248,6 +254,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -255,6 +262,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -270,6 +278,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -280,6 +289,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -295,6 +305,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -305,6 +316,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -320,6 +332,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -330,6 +343,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -345,6 +359,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -355,6 +370,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) diff --git a/contrib/win32/openssh/libssh.vcxproj b/contrib/win32/openssh/libssh.vcxproj index 3b0d93a26..7c0725c55 100644 --- a/contrib/win32/openssh/libssh.vcxproj +++ b/contrib/win32/openssh/libssh.vcxproj @@ -177,6 +177,7 @@ CompileAsC ProgramDatabase false + /Gy %(AdditionalOptions) Windows @@ -196,6 +197,7 @@ CompileAsC ProgramDatabase false + /Gy %(AdditionalOptions) Windows @@ -215,6 +217,7 @@ CompileAsC ProgramDatabase false + /Gy %(AdditionalOptions) Windows @@ -237,6 +240,7 @@ CompileAsC ProgramDatabase false + /Gy %(AdditionalOptions) Windows @@ -258,6 +262,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded false + /Gy %(AdditionalOptions) Windows @@ -279,6 +284,7 @@ MultiThreaded true false + /Gy %(AdditionalOptions) Windows @@ -300,6 +306,7 @@ MultiThreaded true false + /Gy %(AdditionalOptions) Windows @@ -324,6 +331,7 @@ MultiThreaded true false + /Gy %(AdditionalOptions) Windows diff --git a/contrib/win32/openssh/openbsd_compat.vcxproj b/contrib/win32/openssh/openbsd_compat.vcxproj index 58096ccbd..d76397e02 100644 --- a/contrib/win32/openssh/openbsd_compat.vcxproj +++ b/contrib/win32/openssh/openbsd_compat.vcxproj @@ -275,6 +275,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Windows @@ -292,6 +293,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Windows @@ -309,6 +311,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Windows @@ -329,6 +332,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Windows @@ -350,6 +354,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)openbsd-compat;$(OpenSSH-Src-Path)libkrb;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Windows @@ -371,6 +376,7 @@ MultiThreaded true Guard + /Gy %(AdditionalOptions) Windows @@ -392,6 +398,7 @@ MultiThreaded true Guard + /Gy %(AdditionalOptions) Windows @@ -416,6 +423,7 @@ MultiThreaded true Guard + /Gy %(AdditionalOptions) Windows diff --git a/contrib/win32/openssh/scp.vcxproj b/contrib/win32/openssh/scp.vcxproj index 4bc3ece67..de89b3928 100644 --- a/contrib/win32/openssh/scp.vcxproj +++ b/contrib/win32/openssh/scp.vcxproj @@ -193,6 +193,7 @@ MultiThreadedDebug Guard ProgramDatabase + /Gy %(AdditionalOptions) Console @@ -200,6 +201,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -214,6 +216,7 @@ MultiThreadedDebug Guard ProgramDatabase + /Gy %(AdditionalOptions) Console @@ -221,6 +224,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -235,6 +239,7 @@ MultiThreadedDebug Guard ProgramDatabase + /Gy %(AdditionalOptions) Console @@ -242,6 +247,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -256,6 +262,7 @@ MultiThreadedDebug Guard ProgramDatabase + /Gy %(AdditionalOptions) Console @@ -263,6 +270,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -278,6 +286,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -288,6 +297,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -303,6 +313,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -313,6 +324,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -328,6 +340,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -338,6 +351,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -353,6 +367,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -363,6 +378,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) diff --git a/contrib/win32/openssh/sftp-server.vcxproj b/contrib/win32/openssh/sftp-server.vcxproj index 67e8395d0..5f6de9434 100644 --- a/contrib/win32/openssh/sftp-server.vcxproj +++ b/contrib/win32/openssh/sftp-server.vcxproj @@ -194,6 +194,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -201,6 +202,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -215,6 +217,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -222,6 +225,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -236,6 +240,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -243,6 +248,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -257,6 +263,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -264,6 +271,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -279,6 +287,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -289,6 +298,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -304,6 +314,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -314,6 +325,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -329,6 +341,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -339,6 +352,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -354,6 +368,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -364,6 +379,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) diff --git a/contrib/win32/openssh/sftp.vcxproj b/contrib/win32/openssh/sftp.vcxproj index 49c2fffe6..cde9e4fb6 100644 --- a/contrib/win32/openssh/sftp.vcxproj +++ b/contrib/win32/openssh/sftp.vcxproj @@ -52,8 +52,8 @@ Win32Proj keygen $(WindowsSDKVersion) - sftp - + sftp + Application @@ -197,6 +197,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -204,6 +205,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -218,6 +220,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -225,6 +228,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -239,6 +243,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -246,6 +251,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -260,6 +266,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -267,6 +274,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -282,6 +290,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -292,6 +301,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -307,6 +317,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -317,6 +328,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -332,6 +344,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -342,6 +355,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -357,6 +371,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -367,6 +382,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) diff --git a/contrib/win32/openssh/ssh-add.vcxproj b/contrib/win32/openssh/ssh-add.vcxproj index ba1de60c1..b21e8a241 100644 --- a/contrib/win32/openssh/ssh-add.vcxproj +++ b/contrib/win32/openssh/ssh-add.vcxproj @@ -195,6 +195,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -202,6 +203,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -216,6 +218,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -223,6 +226,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -237,6 +241,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -244,6 +249,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -258,6 +264,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -265,6 +272,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -280,6 +288,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -290,6 +299,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -305,6 +315,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -315,6 +326,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -330,6 +342,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -340,6 +353,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -355,6 +369,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -365,6 +380,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) diff --git a/contrib/win32/openssh/ssh-agent.vcxproj b/contrib/win32/openssh/ssh-agent.vcxproj index c01664dc5..390416289 100644 --- a/contrib/win32/openssh/ssh-agent.vcxproj +++ b/contrib/win32/openssh/ssh-agent.vcxproj @@ -194,12 +194,14 @@ Sync ProgramDatabase Guard + /Gy %(AdditionalOptions) Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -217,12 +219,14 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -240,12 +244,14 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -263,12 +269,14 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -286,6 +294,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories);$(OpenSSH-Src-Path)contrib\win32\ssh-pubkey MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -295,6 +304,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -313,6 +323,7 @@ MultiThreaded true Guard + /Gy %(AdditionalOptions) Console @@ -322,6 +333,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -340,6 +352,7 @@ MultiThreaded true Guard + /Gy %(AdditionalOptions) Console @@ -349,6 +362,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -367,6 +381,7 @@ MultiThreaded true Guard + /Gy %(AdditionalOptions) Console @@ -376,6 +391,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest diff --git a/contrib/win32/openssh/ssh-keyscan.vcxproj b/contrib/win32/openssh/ssh-keyscan.vcxproj index 7f7e24555..8d59b7809 100644 --- a/contrib/win32/openssh/ssh-keyscan.vcxproj +++ b/contrib/win32/openssh/ssh-keyscan.vcxproj @@ -184,6 +184,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -191,6 +192,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -207,6 +209,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -214,6 +217,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -230,6 +234,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -237,6 +242,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -253,6 +259,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -260,6 +267,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -277,6 +285,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -287,6 +296,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -305,6 +315,7 @@ MultiThreaded false Guard + /Gy %(AdditionalOptions) Console @@ -315,6 +326,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -333,6 +345,7 @@ MultiThreaded false Guard + /Gy %(AdditionalOptions) Console @@ -343,6 +356,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -361,6 +375,7 @@ MultiThreaded false Guard + /Gy %(AdditionalOptions) Console @@ -371,6 +386,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest diff --git a/contrib/win32/openssh/ssh-shellhost.vcxproj b/contrib/win32/openssh/ssh-shellhost.vcxproj index 8ec6d7ac9..e7ecbc18a 100644 --- a/contrib/win32/openssh/ssh-shellhost.vcxproj +++ b/contrib/win32/openssh/ssh-shellhost.vcxproj @@ -185,12 +185,14 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console true openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -206,12 +208,14 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console true openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -227,12 +231,14 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console true openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -248,12 +254,14 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console true openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -270,6 +278,7 @@ MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -279,6 +288,7 @@ openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -295,6 +305,7 @@ MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -304,6 +315,7 @@ openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -320,6 +332,7 @@ MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -329,6 +342,7 @@ openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) @@ -345,6 +359,7 @@ MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -354,6 +369,7 @@ openbsd_compat.lib;$(AdditionalDependentLibs);%(AdditionalDependencies) true $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) diff --git a/contrib/win32/openssh/ssh.vcxproj b/contrib/win32/openssh/ssh.vcxproj index fb007f068..626115602 100644 --- a/contrib/win32/openssh/ssh.vcxproj +++ b/contrib/win32/openssh/ssh.vcxproj @@ -194,6 +194,7 @@ Sync ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -201,6 +202,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x86-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -218,6 +220,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -225,6 +228,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-x64-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -242,6 +246,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -249,6 +254,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm64-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -266,6 +272,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -273,6 +280,7 @@ $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);$(LibreSSL-arm-Path);%(AdditionalLibraryDirectories) posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -290,6 +298,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -300,6 +309,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -318,6 +328,7 @@ MultiThreaded true Guard + /Gy %(AdditionalOptions) Console @@ -328,6 +339,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -346,6 +358,7 @@ MultiThreaded true Guard + /Gy %(AdditionalOptions) Console @@ -356,6 +369,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -374,6 +388,7 @@ MultiThreaded true Guard + /Gy %(AdditionalOptions) Console @@ -384,6 +399,7 @@ posix_compat.lib;libssh.lib;openbsd_compat.lib;$(SSLLib)$(AdditionalDependentLibs);%(AdditionalDependencies) wmainCRTStartup true + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest diff --git a/contrib/win32/openssh/sshd.vcxproj b/contrib/win32/openssh/sshd.vcxproj index f280bf1b0..7a0a92649 100644 --- a/contrib/win32/openssh/sshd.vcxproj +++ b/contrib/win32/openssh/sshd.vcxproj @@ -185,6 +185,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -194,6 +195,7 @@ MultiplyDefinedSymbolOnly wmainCRTStartup NotSet + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -211,6 +213,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -220,6 +223,7 @@ MultiplyDefinedSymbolOnly wmainCRTStartup NotSet + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -237,6 +241,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -246,6 +251,7 @@ MultiplyDefinedSymbolOnly wmainCRTStartup NotSet + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -263,6 +269,7 @@ MultiThreadedDebug ProgramDatabase Guard + /Gy %(AdditionalOptions) Console @@ -272,6 +279,7 @@ MultiplyDefinedSymbolOnly wmainCRTStartup NotSet + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -290,6 +298,7 @@ $(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories) MultiThreaded Guard + /Gy %(AdditionalOptions) Console @@ -302,6 +311,7 @@ wmainCRTStartup true NotSet + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -321,6 +331,7 @@ MultiThreaded false Guard + /Gy %(AdditionalOptions) Console @@ -333,6 +344,7 @@ wmainCRTStartup true NotSet + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -352,6 +364,7 @@ MultiThreaded false Guard + /Gy %(AdditionalOptions) Console @@ -364,6 +377,7 @@ wmainCRTStartup true NotSet + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest @@ -383,6 +397,7 @@ MultiThreaded false Guard + /Gy %(AdditionalOptions) Console @@ -395,6 +410,7 @@ wmainCRTStartup true NotSet + /debug /debugtype:cv,fixup /opt:ref /opt:icf /incremental:no %(AdditionalOptions) targetos.manifest diff --git a/contrib/win32/openssh/win32iocompat.vcxproj b/contrib/win32/openssh/win32iocompat.vcxproj index ba1c27bc4..d18fe5943 100644 --- a/contrib/win32/openssh/win32iocompat.vcxproj +++ b/contrib/win32/openssh/win32iocompat.vcxproj @@ -165,6 +165,7 @@ false false Guard + /Gy %(AdditionalOptions) @@ -180,6 +181,7 @@ ProgramDatabase false Guard + /Gy %(AdditionalOptions) @@ -195,6 +197,7 @@ ProgramDatabase false Guard + /Gy %(AdditionalOptions) @@ -210,6 +213,7 @@ ProgramDatabase false Guard + /Gy %(AdditionalOptions) @@ -223,6 +227,7 @@ ProgramDatabase false Guard + /Gy %(AdditionalOptions) @@ -239,6 +244,7 @@ false true Guard + /Gy %(AdditionalOptions) @@ -255,6 +261,7 @@ false true Guard + /Gy %(AdditionalOptions) @@ -271,6 +278,7 @@ false true Guard + /Gy %(AdditionalOptions)