From 2c461bbfb2094be253eda4c46c4dd5e1c07d91cc Mon Sep 17 00:00:00 2001 From: Gert Driesen Date: Mon, 30 Oct 2017 12:39:24 +0100 Subject: [PATCH 1/3] Use new csproj format introduced in VS 2017. Added support for .NET Standard 2.0. --- build/build.proj | 4 + build/nuget/SSH.NET.nuspec | 50 ++++---- .../Renci.SshNet.NETCore.csproj | 112 +++--------------- 3 files changed, 42 insertions(+), 124 deletions(-) diff --git a/build/build.proj b/build/build.proj index 96708a6c..ee7ab919 100644 --- a/build/build.proj +++ b/build/build.proj @@ -37,6 +37,10 @@ Renci.SshNet.NETCore\bin\$(Configuration)\netstandard1.3 netstandard1.3 + + Renci.SshNet.NETCore\bin\$(Configuration)\netstandard2.0 + netstandard2.0 + Renci.SshNet.WindowsPhone\bin\$(Configuration) wp71 diff --git a/build/nuget/SSH.NET.nuspec b/build/nuget/SSH.NET.nuspec index 039a9e11..a3520842 100644 --- a/build/nuget/SSH.NET.nuspec +++ b/build/nuget/SSH.NET.nuspec @@ -2,7 +2,7 @@ SSH.NET - 2016.1.0-beta4 + 2017.0.0-beta1 SSH.NET Renci olegkap,drieseng @@ -10,7 +10,7 @@ https://github.com/sshnet/SSH.NET/ false SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism and with broad framework support. - https://github.com/sshnet/SSH.NET/releases/tag/2016.1.0-beta4 + https://github.com/sshnet/SSH.NET/releases/tag/2017.0.0-beta1 A Secure Shell (SSH) library for .NET, optimized for parallelism. 2012-2017, RENCI en-US @@ -19,44 +19,34 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + - + - - + + diff --git a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj index d913f3d2..ba1c5b85 100644 --- a/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj +++ b/src/Renci.SshNet.NETCore/Renci.SshNet.NETCore.csproj @@ -1,113 +1,37 @@ - + - SSH.NET - netstandard1.3 - true + netstandard1.3;netstandard2.0 + true true + false Renci.SshNet ../Renci.SshNet.snk 5 true - true - false - false - false - false - false - false - false - false - false %(RecursiveDir)%(Filename)%(Extension) - - - 1.6.0 - - - - 4.0.1 - - - [1.2.0] - - - 4.0.11 - - - 4.0.1 - - - 4.0.0 - - - 4.0.11 - - - 4.1.0 - - - 4.0.1 - - - 4.0.1 - - - 4.1.0 - - - 4.0.0 - - - 4.1.0 - - - 4.0.1 - - - 4.1.0 - - - 4.2.0 - - - 4.1.0 - - - 4.0.11 - - - 4.0.0 - - - 4.0.10 - - - 4.0.1 - - - 4.0.1 - - - 4.0.1 - + + + + + + + + + - - - + + - 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 + 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 - - portable - - - none + + 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 \ No newline at end of file From e443594a291f434921dfa5fabdef0e6a8ab6ec04 Mon Sep 17 00:00:00 2001 From: Gert Driesen Date: Mon, 30 Oct 2017 18:02:56 +0100 Subject: [PATCH 2/3] Prepare for 2017.0.0 beta1. --- src/Renci.SshNet/Properties/CommonAssemblyInfo.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Renci.SshNet/Properties/CommonAssemblyInfo.cs b/src/Renci.SshNet/Properties/CommonAssemblyInfo.cs index 8497d5fb..0425d1fb 100644 --- a/src/Renci.SshNet/Properties/CommonAssemblyInfo.cs +++ b/src/Renci.SshNet/Properties/CommonAssemblyInfo.cs @@ -9,9 +9,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("2016.1.0")] -[assembly: AssemblyFileVersion("2016.1.0")] -[assembly: AssemblyInformationalVersion("2016.1.0-beta4")] +[assembly: AssemblyVersion("2017.0.0")] +[assembly: AssemblyFileVersion("2017.0.0")] +[assembly: AssemblyInformationalVersion("2017.0.0-beta1")] [assembly: CLSCompliant(false)] // Setting ComVisible to false makes the types in this assembly not visible From 8156b625f7457eb500ec4c3a649f449e70d51bed Mon Sep 17 00:00:00 2001 From: Gert Driesen Date: Mon, 30 Oct 2017 18:26:55 +0100 Subject: [PATCH 3/3] Build .NET Standard 2.0 assembly. Remove seperate build script. --- build/build.cmd | 12 ------------ build/build.proj | 34 +++++++++++++++++++--------------- src/Renci.SshNet.VS2012.sln | 1 - src/Renci.SshNet.VS2015.sln | 3 +-- 4 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 build/build.cmd diff --git a/build/build.cmd b/build/build.cmd deleted file mode 100644 index 146c26fb..00000000 --- a/build/build.cmd +++ /dev/null @@ -1,12 +0,0 @@ -@echo off - -set MSBUILD14_EXE=%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe -set MSBUILD15_EXE=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\\MSBuild\15.0\bin\MSBuild.exe - -call "%MSBUILD14_EXE%" build.proj /t:Clean -call "%MSBUILD15_EXE%" build.proj /t:Clean - -call "%MSBUILD14_EXE%" build.proj /t:Build -call "%MSBUILD15_EXE%" build.proj /t:Build - -call "%MSBUILD15_EXE%" build.proj /t:Package /p:ReleaseVersion=%1 \ No newline at end of file diff --git a/build/build.proj b/build/build.proj index ee7ab919..065a0070 100644 --- a/build/build.proj +++ b/build/build.proj @@ -1,5 +1,5 @@ - + Release @@ -11,17 +11,18 @@ $(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2012.sln - 14.0 - true + 14.0 + 14.0 $(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2015.sln - 14.0 - true + 14.0 + 14.0 $(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2017.sln - 15.0 + 15.0 + 15.0 @@ -62,15 +63,18 @@ uap10 - + + + + - - Configuration=Release + + Configuration=Release;VisualStudioVersion=%(VisualStudioVersion.VisualStudioVersion) - + @@ -79,17 +83,17 @@ FileName="$(MSBuildThisFileDirectory)target\nuget\nuget.exe"/> - - + + - - Configuration=Release + + Configuration=Release;VisualStudioVersion=%(VisualStudioVersion.VisualStudioVersion) - + diff --git a/src/Renci.SshNet.VS2012.sln b/src/Renci.SshNet.VS2012.sln index 93b4c3e8..394ac252 100644 --- a/src/Renci.SshNet.VS2012.sln +++ b/src/Renci.SshNet.VS2012.sln @@ -19,7 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Renci.SshNet.WindowsPhone8" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D}" ProjectSection(SolutionItems) = preProject - ..\build\build.cmd = ..\build\build.cmd ..\build\build.proj = ..\build\build.proj EndProjectSection EndProject diff --git a/src/Renci.SshNet.VS2015.sln b/src/Renci.SshNet.VS2015.sln index 8171be89..56a14c91 100644 --- a/src/Renci.SshNet.VS2015.sln +++ b/src/Renci.SshNet.VS2015.sln @@ -1,11 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D}" ProjectSection(SolutionItems) = preProject - ..\build\build.cmd = ..\build\build.cmd ..\build\build.proj = ..\build\build.proj EndProjectSection EndProject