Skip to content

Commit 2c461bb

Browse files
driesengdrieseng
committed
Use new csproj format introduced in VS 2017.
Added support for .NET Standard 2.0.
1 parent 25bb64f commit 2c461bb

File tree

3 files changed

+42
-124
lines changed

3 files changed

+42
-124
lines changed

‎build/build.proj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
<OutputDirectory>Renci.SshNet.NETCore\bin\$(Configuration)\netstandard1.3</OutputDirectory>
3838
<Moniker>netstandard1.3</Moniker>
3939
</TargetFramework>
40+
<TargetFramework Include=".NETStandard 2.0">
41+
<OutputDirectory>Renci.SshNet.NETCore\bin\$(Configuration)\netstandard2.0</OutputDirectory>
42+
<Moniker>netstandard2.0</Moniker>
43+
</TargetFramework>
4044
<TargetFramework Include="Windows Phone Silverlight 7.1">
4145
<OutputDirectory>Renci.SshNet.WindowsPhone\bin\$(Configuration)</OutputDirectory>
4246
<Moniker>wp71</Moniker>

‎build/nuget/SSH.NET.nuspec

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>SSH.NET</id>
5-
<version>2016.1.0-beta4</version>
5+
<version>2017.0.0-beta1</version>
66
<title>SSH.NET</title>
77
<authors>Renci</authors>
88
<owners>olegkap,drieseng</owners>
99
<licenseUrl>https://github.com/sshnet/SSH.NET/blob/master/LICENSE</licenseUrl>
1010
<projectUrl>https://github.com/sshnet/SSH.NET/</projectUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism and with broad framework support.</description>
13-
<releaseNotes>https://github.com/sshnet/SSH.NET/releases/tag/2016.1.0-beta4</releaseNotes>
13+
<releaseNotes>https://github.com/sshnet/SSH.NET/releases/tag/2017.0.0-beta1</releaseNotes>
1414
<summary>A Secure Shell (SSH) library for .NET, optimized for parallelism.</summary>
1515
<copyright>2012-2017, RENCI</copyright>
1616
<language>en-US</language>
@@ -19,44 +19,34 @@
1919
<group targetFramework="net35" />
2020
<group targetFramework="net40" />
2121
<group targetFramework="netstandard1.3">
22-
<dependency id="Microsoft.CSharp" version="4.0.1" />
23-
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
24-
<dependency id="System.Diagnostics.Debug" version="4.0.11" />
25-
<dependency id="System.Diagnostics.Tools" version="4.0.1" />
26-
<dependency id="System.Diagnostics.TraceSource" version="4.0.0" />
27-
<dependency id="System.Globalization" version="4.0.11" />
28-
<dependency id="System.IO" version="4.1.0" />
29-
<dependency id="System.IO.FileSystem" version="4.0.1" />
30-
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1" />
31-
<dependency id="System.Linq" version="4.1.0" />
32-
<dependency id="System.Net.NameResolution" version="4.0.0" />
33-
<dependency id="System.Net.Sockets" version="4.1.0" />
34-
<dependency id="System.Reflection.Extensions" version="4.0.1" />
35-
<dependency id="System.Runtime.Extensions" version="4.1.0" />
36-
<dependency id="System.Security.Cryptography.Algorithms" version="4.2.0" />
37-
<dependency id="System.Text.RegularExpressions" version="4.1.0" />
38-
<dependency id="System.Threading" version="4.0.11" />
39-
<dependency id="System.Threading.Thread" version="4.0.0" />
40-
<dependency id="System.Threading.ThreadPool" version="4.0.10" />
41-
<dependency id="System.Threading.Timer" version="4.0.1" />
42-
<dependency id="System.Xml.XmlDocument" version="4.0.1" />
43-
<dependency id="System.Xml.XPath.XmlDocument" version="4.0.1" />
22+
<dependency id="SshNet.Security.Cryptography" version="[1.3.0]" />
23+
<dependency id="System.Diagnostics.TraceSource" version="4.3.0" />
24+
<dependency id="System.Net.NameResolution" version="4.3.0" />
25+
<dependency id="System.Net.Sockets" version="4.3.0" />
26+
<dependency id="System.Threading.Thread" version="4.3.0" />
27+
<dependency id="System.Threading.ThreadPool" version="4.3.0" />
28+
<dependency id="System.Threading.Timer" version="4.3.0" />
29+
<dependency id="System.Xml.XmlDocument" version="4.3.0" />
30+
<dependency id="System.Xml.XPath.XmlDocument" version="4.3.0" />
31+
</group>
32+
<group targetFramework="netstandard2.0">
33+
<dependency id="SshNet.Security.Cryptography" version="[1.3.0]" />
4434
</group>
4535
<group targetFramework="sl4">
46-
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
36+
<dependency id="SshNet.Security.Cryptography" version="[1.3.0]" />
4737
</group>
4838
<group targetFramework="sl5">
49-
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
39+
<dependency id="SshNet.Security.Cryptography" version="[1.3.0]" />
5040
</group>
5141
<group targetFramework="wp71">
52-
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
42+
<dependency id="SshNet.Security.Cryptography" version="[1.3.0]" />
5343
</group>
5444
<group targetFramework="wp8">
55-
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
45+
<dependency id="SshNet.Security.Cryptography" version="[1.3.0]" />
5646
</group>
5747
<group targetFramework="uap10.0">
58-
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
59-
<dependency id="System.Xml.XPath.XmlDocument" version="4.0.1" />
48+
<dependency id="SshNet.Security.Cryptography" version="[1.3.0]" />
49+
<dependency id="System.Xml.XPath.XmlDocument" version="4.3.0" />
6050
</group>
6151
</dependencies>
6252
</metadata>

‎src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj

Lines changed: 18 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,37 @@
1-
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<AssemblyTitle>SSH.NET</AssemblyTitle>
4-
<TargetFramework>netstandard1.3</TargetFramework>
5-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3+
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
65
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<AssemblyName>Renci.SshNet</AssemblyName>
88
<AssemblyOriginatorKeyFile>../Renci.SshNet.snk</AssemblyOriginatorKeyFile>
99
<LangVersion>5</LangVersion>
1010
<SignAssembly>true</SignAssembly>
11-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
12-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
13-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
14-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
15-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
16-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
17-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
18-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
19-
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
20-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
2111
</PropertyGroup>
2212
<ItemGroup>
2313
<Compile Include="..\Renci.SshNet\**\*.cs" Exclude="..\Renci.SshNet\Properties\AssemblyInfo.cs">
2414
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
2515
</Compile>
2616
</ItemGroup>
27-
<ItemGroup>
28-
<PackageReference Include="NETStandard.Library">
29-
<Version>1.6.0</Version>
30-
</PackageReference>
31-
</ItemGroup>
3217
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
33-
<PackageReference Include="Microsoft.CSharp">
34-
<Version>4.0.1</Version>
35-
</PackageReference>
36-
<PackageReference Include="SshNet.Security.Cryptography">
37-
<Version>[1.2.0]</Version>
38-
</PackageReference>
39-
<PackageReference Include="System.Diagnostics.Debug">
40-
<Version>4.0.11</Version>
41-
</PackageReference>
42-
<PackageReference Include="System.Diagnostics.Tools">
43-
<Version>4.0.1</Version>
44-
</PackageReference>
45-
<PackageReference Include="System.Diagnostics.TraceSource">
46-
<Version>4.0.0</Version>
47-
</PackageReference>
48-
<PackageReference Include="System.Globalization">
49-
<Version>4.0.11</Version>
50-
</PackageReference>
51-
<PackageReference Include="System.IO">
52-
<Version>4.1.0</Version>
53-
</PackageReference>
54-
<PackageReference Include="System.IO.FileSystem">
55-
<Version>4.0.1</Version>
56-
</PackageReference>
57-
<PackageReference Include="System.IO.FileSystem.Primitives">
58-
<Version>4.0.1</Version>
59-
</PackageReference>
60-
<PackageReference Include="System.Linq">
61-
<Version>4.1.0</Version>
62-
</PackageReference>
63-
<PackageReference Include="System.Net.NameResolution">
64-
<Version>4.0.0</Version>
65-
</PackageReference>
66-
<PackageReference Include="System.Net.Sockets">
67-
<Version>4.1.0</Version>
68-
</PackageReference>
69-
<PackageReference Include="System.Reflection.Extensions">
70-
<Version>4.0.1</Version>
71-
</PackageReference>
72-
<PackageReference Include="System.Runtime.Extensions">
73-
<Version>4.1.0</Version>
74-
</PackageReference>
75-
<PackageReference Include="System.Security.Cryptography.Algorithms">
76-
<Version>4.2.0</Version>
77-
</PackageReference>
78-
<PackageReference Include="System.Text.RegularExpressions">
79-
<Version>4.1.0</Version>
80-
</PackageReference>
81-
<PackageReference Include="System.Threading">
82-
<Version>4.0.11</Version>
83-
</PackageReference>
84-
<PackageReference Include="System.Threading.Thread">
85-
<Version>4.0.0</Version>
86-
</PackageReference>
87-
<PackageReference Include="System.Threading.ThreadPool">
88-
<Version>4.0.10</Version>
89-
</PackageReference>
90-
<PackageReference Include="System.Threading.Timer">
91-
<Version>4.0.1</Version>
92-
</PackageReference>
93-
<PackageReference Include="System.Xml.XmlDocument">
94-
<Version>4.0.1</Version>
95-
</PackageReference>
96-
<PackageReference Include="System.Xml.XPath.XmlDocument">
97-
<Version>4.0.1</Version>
98-
</PackageReference>
18+
<PackageReference Include="SshNet.Security.Cryptography" Version="[1.3.0]" />
19+
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
20+
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
21+
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
22+
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
23+
<PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
24+
<PackageReference Include="System.Threading.Timer" Version="4.3.0" />
25+
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
26+
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
9927
</ItemGroup>
100-
<ItemGroup>
101-
<Compile Update="..\Renci.SshNet\Sftp\ISftpMessageFactory.cs" Link="Sftp\ISftpResponseFactory.cs" />
102-
<Compile Update="..\Renci.SshNet\Sftp\SftpMessageFactory.cs" Link="Sftp\SftpResponseFactory.cs" />
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
29+
<PackageReference Include="SshNet.Security.Cryptography" Version="[1.3.0]" />
10330
</ItemGroup>
10431
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
105-
<DefineConstants>FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_SOCKET_DISPOSE;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_WAITHANDLE_DISPOSE;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
106-
</PropertyGroup>
107-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
108-
<DebugType>portable</DebugType>
32+
<DefineConstants>FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_SOCKET_DISPOSE;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_WAITHANDLE_DISPOSE;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
10933
</PropertyGroup>
110-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
111-
<DebugType>none</DebugType>
34+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
35+
<DefineConstants>FEATURE_ENCODING_ASCII;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_RNG_CREATE;FEATURE_SOCKET_TAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_SELECT;FEATURE_SOCKET_POLL;FEATURE_SOCKET_DISPOSE;FEATURE_DNS_SYNC;FEATURE_DNS_APM;FEATURE_DNS_TAP;FEATURE_STREAM_APM;FEATURE_STREAM_TAP;FEATURE_THREAD_COUNTDOWNEVENT;FEATURE_THREAD_TAP;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_WAITHANDLE_DISPOSE;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512</DefineConstants>
11236
</PropertyGroup>
11337
</Project>

0 commit comments

Comments
 (0)