diff --git a/Renci.SshNet.sln b/Renci.SshNet.sln index 40103f6d6..2ccb88b37 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 @@ -224,7 +219,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} 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 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 + 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 - - - - - - - - - - - - - - - - - - - - - - - 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 91f2149e2..567f5aef9 100644 --- a/src/Renci.SshNet/Renci.SshNet.csproj +++ b/src/Renci.SshNet/Renci.SshNet.csproj @@ -1,10 +1,27 @@  - false Renci.SshNet + SSH.NET + SSH.NET net462;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0 + + SSH.NET + SSH.NET + 2023.0.1 + SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism. + Copyright © Renci 2010-$([System.DateTime]::UtcNow.Year) + MIT + Renci + SS-NET-icon-h500.png + README.md + ssh; scp; sftp + https://github.com/sshnet/SSH.NET/releases/tag/$(Version) + True + snupkg + + true true @@ -22,4 +39,16 @@ - + + + + True + \ + + + True + \ + + + + \ No newline at end of file