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

Remove two properties from projects (#240)

This commit is contained in:
Yanbing 2017-11-17 13:07:54 -08:00 committed by GitHub
parent 549d532c09
commit 495119e23f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -500,6 +500,19 @@ function Start-OpenSSHBuild
$win10SDKVer = Get-Windows10SDKVersion
[XML]$xml = Get-Content $PathTargets
$xml.Project.PropertyGroup.WindowsSDKVersion = $win10SDKVer.ToString()
$arch = $NativeHostArch.ToUpper()
$nodeName = "WindowsSDKDesktop$($arch)Support"
$node = $xml.Project.PropertyGroup.ChildNodes | where {$_.Name -eq $nodeName}
if($node -eq $null)
{
$newElement =$xml.CreateElement($nodeName, $xml.Project.xmlns)
$newNode = $xml.Project.PropertyGroup.AppendChild($newElement)
$null = $newNode.AppendChild($xml.CreateTextNode("true"))
}
else
{
$node.InnerText = "true"
}
$xml.Save($PathTargets)
}

2
contrib/win32/openssh/config.vcxproj
View File

@ -44,8 +44,6 @@
<RootNamespace>config</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>config</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/keygen.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>keygen</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>ssh-keygen</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/libssh.vcxproj
View File

@ -40,8 +40,6 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>libssh</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/openbsd_compat.vcxproj
View File

@ -140,8 +140,6 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>openbsd_compat</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/scp.vcxproj
View File

@ -49,8 +49,6 @@
<RootNamespace>keygen</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>scp</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/sftp-server.vcxproj
View File

@ -50,8 +50,6 @@
<RootNamespace>keygen</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>sftp-server</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

4
contrib/win32/openssh/sftp.vcxproj
View File

@ -52,9 +52,7 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>keygen</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>sftp</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
<ProjectName>sftp</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/ssh-add.vcxproj
View File

@ -51,8 +51,6 @@
<RootNamespace>keygen</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>ssh-add</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/ssh-agent.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>Win32OpenSSH</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>ssh-agent</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/ssh-keyscan.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>sshkeyscan</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>ssh-keyscan</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/ssh-shellhost.vcxproj
View File

@ -48,8 +48,6 @@
<RootNamespace>shellhost</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>ssh-shellhost</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/ssh.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>Win32OpenSSH</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>ssh</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/sshd.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>keygen</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>sshd</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/unittest-bitmap.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>Win32OpenSSH</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>unittest-bitmap</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/unittest-hostkeys.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>Win32OpenSSH</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>unittest-hostkeys</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/unittest-kex.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>Win32OpenSSH</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>unittest-kex</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/unittest-match.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>Win32OpenSSH</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>unittest-match</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/unittest-sshbuf.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>Win32OpenSSH</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>unittest-sshbuf</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/unittest-sshkey.vcxproj
View File

@ -41,8 +41,6 @@
<RootNamespace>Win32OpenSSH</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>unittest-sshkey</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/unittest-win32compat.vcxproj
View File

@ -70,8 +70,6 @@
<RootNamespace>Win32OpenSSH</RootNamespace>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>unittest-win32compat</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
contrib/win32/openssh/win32iocompat.vcxproj
View File

@ -41,8 +41,6 @@
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>
<ProjectName>posix_compat</ProjectName>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">