Merge branch 'latestw_all' of https://github.com/PowerShell/openssh-portable into git_ps_latestw_all

Author: bagajjal

contrib/win32/openssh/OpenSSHBuildHelper.psm1

@@ -322,7 +322,7 @@ function Start-OpenSSHPackage
     $payload += "sftp-server.exe", "scp.exe", "ssh-shellhost.exe", "ssh-keygen.exe", "ssh-keyscan.exe" 
     $payload += "sshd_config_default", "install-sshd.ps1", "uninstall-sshd.ps1"
     $payload += "FixHostFilePermissions.ps1", "FixUserFilePermissions.ps1", "OpenSSHUtils.psm1", "OpenSSHUtils.psd1"
-    $payload += "openssh-events.man", "moduli"
+    $payload += "openssh-events.man", "moduli", "LICENSE.txt"
 
     $packageName = "OpenSSH-Win64"
     if ($NativeHostArch -ieq 'x86') {

contrib/win32/openssh/config.vcxproj

@@ -200,6 +200,7 @@ copy /Y "$(SolutionDir)OpenSSHUtils.ps*1" "$(OutDir)"
 copy /Y "$(SolutionDir)Fix*FilePermissions.ps1" "$(OutDir)"
 copy /Y "$(SolutionDir)sshd_config" "$(OutDir)sshd_config_default"
 copy /Y "$(OpenSSH-Src-Path)moduli" "$(OutDir)moduli"
+copy /Y "$(OpenSSH-Src-Path)LICENCE" "$(OutDir)LICENSE.txt"
 copy /Y "$(SolutionDir)openssh-events.man" "$(OutDir)"</Command>
       <Message>Copy install-sshd.ps1, uninstall-sshd.ps1, OpenSSHUtils.psm1, OpenSSHUtils.psd1, FixHostFilePermissions.ps1, FixUserFilePermissions.ps1,  ssh-add-hostkey.ps1, sshd_config (as sshd_config_default), openssh-events.man, moduli to build directory</Message>
     </PostBuildEvent>
@@ -236,6 +237,7 @@ copy /Y "$(SolutionDir)OpenSSHUtils.ps*1" "$(OutDir)"
 copy /Y "$(SolutionDir)Fix*FilePermissions.ps1" "$(OutDir)"
 copy /Y "$(SolutionDir)sshd_config" "$(OutDir)sshd_config_default"
 copy /Y "$(OpenSSH-Src-Path)moduli" "$(OutDir)moduli"
+copy /Y "$(OpenSSH-Src-Path)LICENCE" "$(OutDir)LICENSE.txt"
 copy /Y "$(SolutionDir)openssh-events.man" "$(OutDir)"</Command>
       <Message>Copy install-sshd.ps1, uninstall-sshd.ps1, OpenSSHUtils.psm1, OpenSSHUtils.psd1, FixHostFilePermissions.ps1, FixUserFilePermissions.ps1,  ssh-add-hostkey.ps1, sshd_config (as sshd_config_default), openssh-events.man, moduli to build directory</Message>
     </PostBuildEvent>
@@ -272,6 +274,7 @@ copy /Y "$(SolutionDir)OpenSSHUtils.ps*1" "$(OutDir)"
 copy /Y "$(SolutionDir)Fix*FilePermissions.ps1" "$(OutDir)"
 copy /Y "$(SolutionDir)sshd_config" "$(OutDir)sshd_config_default"
 copy /Y "$(OpenSSH-Src-Path)moduli" "$(OutDir)moduli"
+copy /Y "$(OpenSSH-Src-Path)LICENCE" "$(OutDir)LICENSE.txt"
 copy /Y "$(SolutionDir)openssh-events.man" "$(OutDir)"</Command>
       <Message>Copy install-sshd.ps1, uninstall-sshd.ps1, OpenSSHUtils.psm1, OpenSSHUtils.psd1, FixHostFilePermissions.ps1, FixUserFilePermissions.ps1,  ssh-add-hostkey.ps1, sshd_config (as sshd_config_default), openssh-events.man, moduli to build directory</Message>
     </PostBuildEvent>
@@ -308,6 +311,7 @@ copy /Y "$(SolutionDir)OpenSSHUtils.ps*1" "$(OutDir)"
 copy /Y "$(SolutionDir)Fix*FilePermissions.ps1" "$(OutDir)"
 copy /Y "$(SolutionDir)sshd_config" "$(OutDir)sshd_config_default"
 copy /Y "$(OpenSSH-Src-Path)moduli" "$(OutDir)moduli"
+copy /Y "$(OpenSSH-Src-Path)LICENCE" "$(OutDir)LICENSE.txt"
 copy /Y "$(SolutionDir)openssh-events.man" "$(OutDir)"</Command>
       <Message>Copy install-sshd.ps1, uninstall-sshd.ps1, OpenSSHUtils.psm1, OpenSSHUtils.psd1, FixHostFilePermissions.ps1, FixUserFilePermissions.ps1,  ssh-add-hostkey.ps1, sshd_config (as sshd_config_default), openssh-events.man, moduli to build directory</Message>
     </PostBuildEvent>
@@ -348,6 +352,7 @@ copy /Y "$(SolutionDir)OpenSSHUtils.ps*1" "$(OutDir)"
 copy /Y "$(SolutionDir)Fix*FilePermissions.ps1" "$(OutDir)"
 copy /Y "$(SolutionDir)sshd_config" "$(OutDir)sshd_config_default"
 copy /Y "$(OpenSSH-Src-Path)moduli" "$(OutDir)moduli"
+copy /Y "$(OpenSSH-Src-Path)LICENCE" "$(OutDir)LICENSE.txt"
 copy /Y "$(SolutionDir)openssh-events.man" "$(OutDir)"</Command>
       <Message>Copy install-sshd.ps1, uninstall-sshd.ps1, OpenSSHUtils.psm1, OpenSSHUtils.psd1, FixHostFilePermissions.ps1, FixUserFilePermissions.ps1,  ssh-add-hostkey.ps1, sshd_config (as sshd_config_default), openssh-events.man, moduli to build directory</Message>
     </PostBuildEvent>
@@ -388,6 +393,7 @@ copy /Y "$(SolutionDir)OpenSSHUtils.ps*1" "$(OutDir)"
 copy /Y "$(SolutionDir)Fix*FilePermissions.ps1" "$(OutDir)"
 copy /Y "$(SolutionDir)sshd_config" "$(OutDir)sshd_config_default"
 copy /Y "$(OpenSSH-Src-Path)moduli" "$(OutDir)moduli"
+copy /Y "$(OpenSSH-Src-Path)LICENCE" "$(OutDir)LICENSE.txt"
 copy /Y "$(SolutionDir)openssh-events.man" "$(OutDir)"</Command>
       <Message>Copy install-sshd.ps1, uninstall-sshd.ps1, OpenSSHUtils.psm1, OpenSSHUtils.psd1, FixHostFilePermissions.ps1, FixUserFilePermissions.ps1,  ssh-add-hostkey.ps1, sshd_config (as sshd_config_default), openssh-events.man, moduli to build directory</Message>
     </PostBuildEvent>
@@ -428,6 +434,7 @@ copy /Y "$(SolutionDir)OpenSSHUtils.ps*1" "$(OutDir)"
 copy /Y "$(SolutionDir)Fix*FilePermissions.ps1" "$(OutDir)"
 copy /Y "$(SolutionDir)sshd_config" "$(OutDir)sshd_config_default"
 copy /Y "$(OpenSSH-Src-Path)moduli" "$(OutDir)moduli"
+copy /Y "$(OpenSSH-Src-Path)LICENCE" "$(OutDir)LICENSE.txt"
 copy /Y "$(SolutionDir)openssh-events.man" "$(OutDir)"</Command>
       <Message>Copy install-sshd.ps1, uninstall-sshd.ps1, OpenSSHUtils.psm1, OpenSSHUtils.psd1, FixHostFilePermissions.ps1, FixUserFilePermissions.ps1,  ssh-add-hostkey.ps1, sshd_config (as sshd_config_default), openssh-events.man, moduli to build directory</Message>
     </PostBuildEvent>
@@ -468,6 +475,7 @@ copy /Y "$(SolutionDir)OpenSSHUtils.ps*1" "$(OutDir)"
 copy /Y "$(SolutionDir)Fix*FilePermissions.ps1" "$(OutDir)"
 copy /Y "$(SolutionDir)sshd_config" "$(OutDir)sshd_config_default"
 copy /Y "$(OpenSSH-Src-Path)moduli" "$(OutDir)moduli"
+copy /Y "$(OpenSSH-Src-Path)LICENCE" "$(OutDir)LICENSE.txt"
 copy /Y "$(SolutionDir)openssh-events.man" "$(OutDir)"</Command>
       <Message>Copy install-sshd.ps1, uninstall-sshd.ps1, OpenSSHUtils.psm1, OpenSSHUtils.psd1, FixHostFilePermissions.ps1, FixUserFilePermissions.ps1,  ssh-add-hostkey.ps1, sshd_config (as sshd_config_default), openssh-events.man, moduli to build directory</Message>
     </PostBuildEvent>