Skip to content

Merge nuspec and CommonAssemblyInfo into csproj #1256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jan 28, 2024
Merged

Merge nuspec and CommonAssemblyInfo into csproj #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
317c38c
GeneratePackageOnBuild
scott-xu Dec 2, 2023
4eb2360
Add packages to artifacts
scott-xu Dec 2, 2023
1593dd2
Merge branch 'develop' into generate-nuget-package
scott-xu Dec 2, 2023
3c0f4ed
Merge branch 'develop' into generate-nuget-package
scott-xu Dec 2, 2023
f33918a
Update src/Renci.SshNet/Renci.SshNet.csproj
scott-xu Dec 3, 2023
8bad9d6
Merge branch 'develop' into generate-nuget-package
scott-xu Dec 3, 2023
e58ae57
Merge branch 'develop' into generate-nuget-package
scott-xu Dec 4, 2023
2a74e7a
Update Renci.SshNet.csproj
scott-xu Dec 4, 2023
2b47495
Merge branch 'develop' into generate-nuget-package
scott-xu Dec 9, 2023
83f522d
Merge branch 'develop' into generate-nuget-package
scott-xu Jan 7, 2024
dc4deb3
Merge branch 'develop' into generate-nuget-package
scott-xu Jan 7, 2024
faae7d6
Delete build/nuget/SSH.NET.nuspec
scott-xu Jan 7, 2024
196789c
Delete SSH.NET.nuspec from .sln file
scott-xu Jan 28, 2024
f0af300
Merge branch 'develop' into generate-nuget-package
scott-xu Jan 28, 2024
28ad3c1
Update Renci.SshNet.csproj
scott-xu Jan 28, 2024
366c324
Update build.proj
scott-xu Jan 28, 2024
505bd4d
Merge branch 'sshnet:develop' into generate-nuget-package
scott-xu Jan 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Renci.SshNet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,7 @@ for:
# - ps: Push-AppveyorArtifact artifacts/tcpdump.pcap

artifacts:
- path: 'src\**\*.nupkg'
- path: 'src\**\*.snupkg'
- path: artifacts
name: artifacts
4 changes: 2 additions & 2 deletions build/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</Target>

<Target Name="CreateNuGetPackage" DependsOnTargets="ValidatePackage;CheckNuGetPackageDirectory;CheckReleaseVersion">
<Exec Command="$(NuGetExe) pack $(MSBuildThisFileDirectory)nuget\SSH.NET.nuspec -OutputDirectory &quot;$(MSBuildThisFileDirectory)target&quot; -Version &quot;$(ReleaseVersion)&quot; -Properties &quot;copyright=2012-$([System.DateTime]::Now.Year), RENCI&quot; -BasePath &quot;$(NuGetPackageDirectory)&quot; -NonInteractive"/>
<Exec Command="dotnet pack $(MSBuildThisFileDirectory)..\src\Renci.SshNet\Renci.SshNet.csproj --no-build --output &quot;$(MSBuildThisFileDirectory)target&quot;"/>
</Target>

<Target Name="GenerateHelpFile" DependsOnTargets="CheckReleaseVersion">
Expand Down Expand Up @@ -160,4 +160,4 @@
</Code>
</Task>
</UsingTask>
</Project>
</Project>
40 changes: 0 additions & 40 deletions build/nuget/SSH.NET.nuspec
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/Renci.SshNet/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")]
Expand Down
26 changes: 0 additions & 26 deletions src/Renci.SshNet/Properties/CommonAssemblyInfo.cs
View file
Open in desktop

This file was deleted.

33 changes: 31 additions & 2 deletions src/Renci.SshNet/Renci.SshNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyName>Renci.SshNet</AssemblyName>
<Product>SSH.NET</Product>
<AssemblyTitle>SSH.NET</AssemblyTitle>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
<PackageId>SSH.NET</PackageId>
<Title>SSH.NET</Title>
<Version>2023.0.1</Version>
<Description>SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism.</Description>
<Copyright>Copyright © Renci 2010-$([System.DateTime]::UtcNow.Year)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Authors>Renci</Authors>
<PackageIcon>SS-NET-icon-h500.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageTags>ssh; scp; sftp</PackageTags>
<PackageReleaseNotes>https://github.com/sshnet/SSH.NET/releases/tag/$(Version)</PackageReleaseNotes>
<IncludeSymbols>True</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0')) ">
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
Expand All @@ -22,4 +39,16 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
</ItemGroup>
</Project>

<ItemGroup>
<None Include="..\..\images\logo\png\SS-NET-icon-h500.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

</Project>