diff --git a/appveyor.yml b/appveyor.yml index fa036f06b..48ca412d7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 7.6.0.0.{build} +version: 7.6.1.0.{build} image: Visual Studio 2015 branches: diff --git a/contrib/win32/openssh/uninstall-sshd.ps1 b/contrib/win32/openssh/uninstall-sshd.ps1 index 7ccff620d..99d5dfe81 100644 --- a/contrib/win32/openssh/uninstall-sshd.ps1 +++ b/contrib/win32/openssh/uninstall-sshd.ps1 @@ -1,4 +1,8 @@ -if (Get-Service sshd -ErrorAction SilentlyContinue) +$scriptpath = $MyInvocation.MyCommand.Path +$scriptdir = Split-Path $scriptpath +$etwman = Join-Path $scriptdir "openssh-events.man" + +if (Get-Service sshd -ErrorAction SilentlyContinue) { Stop-Service sshd sc.exe delete sshd 1>$null @@ -8,6 +12,9 @@ else { Write-Host -ForegroundColor Yellow "sshd service is not installed" } +# unregister etw provider +wevtutil um `"$etwman`" + if (Get-Service ssh-agent -ErrorAction SilentlyContinue) { Stop-Service ssh-agent diff --git a/contrib/win32/openssh/version.rc b/contrib/win32/openssh/version.rc index 043771e65..be0859a4c 100644 --- a/contrib/win32/openssh/version.rc +++ b/contrib/win32/openssh/version.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,6,0,1 - PRODUCTVERSION 7,6,0,1 + FILEVERSION 7,6,1,0 + PRODUCTVERSION 7,6,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,7 +67,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "FileVersion", "7.6.0.1" + VALUE "FileVersion", "7.6.1.0" VALUE "ProductName", "OpenSSH for Windows" VALUE "ProductVersion", "OpenSSH_7.6p1 for Windows" END