From 317c38ca1b265eb117c07b8718ea6b7f4637c80d Mon Sep 17 00:00:00 2001 From: Scott Xu Date: Sat, 2 Dec 2023 10:09:37 +0800 Subject: [PATCH 1/8] GeneratePackageOnBuild IncludeSymbols --- src/Renci.SshNet/Properties/AssemblyInfo.cs | 4 +- .../Properties/CommonAssemblyInfo.cs | 26 ----------- src/Renci.SshNet/Renci.SshNet.csproj | 46 +++++++++++++++---- 3 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 src/Renci.SshNet/Properties/CommonAssemblyInfo.cs diff --git a/src/Renci.SshNet/Properties/AssemblyInfo.cs b/src/Renci.SshNet/Properties/AssemblyInfo.cs index fe5eac0d1..8c1693ede 100644 --- a/src/Renci.SshNet/Properties/AssemblyInfo.cs +++ b/src/Renci.SshNet/Properties/AssemblyInfo.cs @@ -1,8 +1,8 @@ -using System.Reflection; +using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("SSH.NET")] +[assembly: CLSCompliant(false)] [assembly: Guid("ad816c5e-6f13-4589-9f3e-59523f8b77a4")] [assembly: InternalsVisibleTo("Renci.SshNet.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f9194e1eb66b7e2575aaee115ee1d27bc100920e7150e43992d6f668f9737de8b9c7ae892b62b8a36dd1d57929ff1541665d101dc476d6e02390846efae7e5186eec409710fdb596e3f83740afef0d4443055937649bc5a773175b61c57615dac0f0fd10f52b52fedf76c17474cc567b3f7a79de95dde842509fb39aaf69c6c2")] [assembly: InternalsVisibleTo("Renci.SshNet.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f9194e1eb66b7e2575aaee115ee1d27bc100920e7150e43992d6f668f9737de8b9c7ae892b62b8a36dd1d57929ff1541665d101dc476d6e02390846efae7e5186eec409710fdb596e3f83740afef0d4443055937649bc5a773175b61c57615dac0f0fd10f52b52fedf76c17474cc567b3f7a79de95dde842509fb39aaf69c6c2")] diff --git a/src/Renci.SshNet/Properties/CommonAssemblyInfo.cs b/src/Renci.SshNet/Properties/CommonAssemblyInfo.cs deleted file mode 100644 index 31ae72dff..000000000 --- a/src/Renci.SshNet/Properties/CommonAssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyDescription("SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism.")] -[assembly: AssemblyCompany("Renci")] -[assembly: AssemblyProduct("SSH.NET")] -[assembly: AssemblyCopyright("Copyright � Renci 2010-2023")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: AssemblyVersion("2023.0.1")] -[assembly: AssemblyFileVersion("2023.0.1")] -[assembly: AssemblyInformationalVersion("2023.0.1")] -[assembly: CLSCompliant(false)] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -#if DEBUG -[assembly: AssemblyConfiguration("Debug")] -#else -[assembly: AssemblyConfiguration("Release")] -#endif diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj index 824ff52a7..21790c58d 100644 --- a/src/Renci.SshNet/Renci.SshNet.csproj +++ b/src/Renci.SshNet/Renci.SshNet.csproj @@ -1,23 +1,53 @@  - false Renci.SshNet - net462;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0 + SSH.NET + SSH.NET + net462;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0 + + + + True + SSH.NET + SSH.NET + 2023.0.1 + SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism. + Copyright © Renci 2010-2023 + MIT + Renci + SS-NET-icon-h500.png + README.md + ssh; scp; sftp + https://github.com/sshnet/SSH.NET/releases/tag/$(Version) + True + snupkg $(DefineConstants);FEATURE_BINARY_SERIALIZATION;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_DNS_SYNC;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_RIPEMD160 + + $(DefineConstants);FEATURE_SOCKET_TAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_EAP;FEATURE_DNS_SYNC;FEATURE_DNS_APM;FEATURE_DNS_TAP + + + + + + - - + + + True + \ + + + True + \ + - - $(DefineConstants);FEATURE_SOCKET_TAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_EAP;FEATURE_DNS_SYNC;FEATURE_DNS_APM;FEATURE_DNS_TAP - - + \ No newline at end of file From 4eb236007f49d6ba40eb81111c79c417a4bde5b6 Mon Sep 17 00:00:00 2001 From: Scott Xu Date: Sat, 2 Dec 2023 10:12:22 +0800 Subject: [PATCH 2/8] Add packages to artifacts --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 56f84c117..98487674e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,5 +55,7 @@ for: # - ps: Push-AppveyorArtifact artifacts/tcpdump.pcap artifacts: + - path: 'src\**\*.nupkg' + - path: 'src\**\*.snupkg' - path: artifacts name: artifacts From f33918a41daf01b50523f62d9eb9815b813f7a96 Mon Sep 17 00:00:00 2001 From: Scott Xu Date: Sun, 3 Dec 2023 12:01:20 +0800 Subject: [PATCH 3/8] Update src/Renci.SshNet/Renci.SshNet.csproj Co-authored-by: Rob Hague --- src/Renci.SshNet/Renci.SshNet.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj index 21790c58d..a04311fd1 100644 --- a/src/Renci.SshNet/Renci.SshNet.csproj +++ b/src/Renci.SshNet/Renci.SshNet.csproj @@ -7,7 +7,6 @@ - True SSH.NET SSH.NET 2023.0.1 From 2a74e7a27fa594bc983e31473466f2b95f6b3e02 Mon Sep 17 00:00:00 2001 From: Scott Xu Date: Tue, 5 Dec 2023 07:13:42 +0800 Subject: [PATCH 4/8] Update Renci.SshNet.csproj Co-authored-by: Rob Hague --- src/Renci.SshNet/Renci.SshNet.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj index a04311fd1..fe09880fa 100644 --- a/src/Renci.SshNet/Renci.SshNet.csproj +++ b/src/Renci.SshNet/Renci.SshNet.csproj @@ -11,7 +11,7 @@ SSH.NET 2023.0.1 SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism. - Copyright © Renci 2010-2023 + Copyright © Renci 2010-$([System.DateTime]::UtcNow.Year) MIT Renci SS-NET-icon-h500.png From faae7d6e2d7160ee2db203f383f745b7bc5c3634 Mon Sep 17 00:00:00 2001 From: Scott Xu Date: Sun, 7 Jan 2024 10:04:51 +0800 Subject: [PATCH 5/8] Delete build/nuget/SSH.NET.nuspec --- build/nuget/SSH.NET.nuspec | 40 -------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 build/nuget/SSH.NET.nuspec diff --git a/build/nuget/SSH.NET.nuspec b/build/nuget/SSH.NET.nuspec deleted file mode 100644 index a5b53b8e6..000000000 --- a/build/nuget/SSH.NET.nuspec +++ /dev/null @@ -1,40 +0,0 @@ - - - - SSH.NET - $version$ - SSH.NET - Renci - olegkap,drieseng - MIT - 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/$version$ - A Secure Shell (SSH) library for .NET, optimized for parallelism. - $copyright$ - en-US - ssh scp sftp - - - - - - - - - - - - - - - - - - - - - - - From 196789cafd85373a2e0f019006b3198ea027fe5c Mon Sep 17 00:00:00 2001 From: Scott Xu Date: Sun, 28 Jan 2024 17:38:29 +0800 Subject: [PATCH 6/8] Delete SSH.NET.nuspec from .sln file --- Renci.SshNet.sln | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Renci.SshNet.sln b/Renci.SshNet.sln index 0ca62c338..98c0988f6 100644 --- a/Renci.SshNet.sln +++ b/Renci.SshNet.sln @@ -5,11 +5,6 @@ VisualStudioVersion = 17.5.33326.253 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{94EE3919-19FA-4D9B-8DA9-249050B15232}" - ProjectSection(SolutionItems) = preProject - build\nuget\SSH.NET.nuspec = build\nuget\SSH.NET.nuspec - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sandcastle", "sandcastle", "{A6C3FFD3-16A5-44D3-8C1F-3613D6DD17D1}" ProjectSection(SolutionItems) = preProject build\sandcastle\SSH.NET.shfbproj = build\sandcastle\SSH.NET.shfbproj @@ -202,7 +197,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D} = {04E8CC26-116E-4116-9558-7ED542548E70} - {94EE3919-19FA-4D9B-8DA9-249050B15232} = {2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D} {A6C3FFD3-16A5-44D3-8C1F-3613D6DD17D1} = {2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D} {D21A4D03-0AC2-4613-BB6D-74D2D16A72CC} = {04E8CC26-116E-4116-9558-7ED542548E70} {2F4155AA-750A-4D33-B2E6-ED06660016CE} = {04E8CC26-116E-4116-9558-7ED542548E70} From 28ad3c13ddfe4149547cc4f07dddac240dd1dd8b Mon Sep 17 00:00:00 2001 From: Scott Xu Date: Sun, 28 Jan 2024 17:49:50 +0800 Subject: [PATCH 7/8] Update Renci.SshNet.csproj --- src/Renci.SshNet/Renci.SshNet.csproj | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj index 1939cc4a5..567f5aef9 100644 --- a/src/Renci.SshNet/Renci.SshNet.csproj +++ b/src/Renci.SshNet/Renci.SshNet.csproj @@ -32,18 +32,14 @@ $(DefineConstants);FEATURE_BINARY_SERIALIZATION;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_RIPEMD160 - - $(DefineConstants);FEATURE_SOCKET_TAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_EAP;FEATURE_DNS_SYNC;FEATURE_DNS_APM;FEATURE_DNS_TAP - + + + - - - - True From 366c3241c5537d1ae26d24384a4ecb261c808e35 Mon Sep 17 00:00:00 2001 From: Scott Xu Date: Sun, 28 Jan 2024 17:59:09 +0800 Subject: [PATCH 8/8] Update build.proj --- build/build.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build.proj b/build/build.proj index fc22896e1..96546aae6 100644 --- a/build/build.proj +++ b/build/build.proj @@ -83,7 +83,7 @@ - + @@ -160,4 +160,4 @@ - \ No newline at end of file +