Skip to content

Commit

Permalink
Updated dependencies. (#1328)
Browse files Browse the repository at this point in the history
* Updated dependencies.

* Reverted Microsoft.Bcl.AsyncInterfaces back to version 1.0.0.

Also added a note so we no longer try to upgrade it.

* Reverted back to Moq.

---------

Co-authored-by: Wojciech Nagórski <wojtpl2@gmail.com>
  • Loading branch information
jscarle and WojciechNagorski authored Feb 20, 2024
1 parent 4b9c3bf commit b47b35c
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
-->
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.103" PrivateAssets="all" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.16.0.82469" PrivateAssets="all" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.141" PrivateAssets="all" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.19.0.84025" PrivateAssets="all" />
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion src/Renci.SshNet/Renci.SshNet.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>Renci.SshNet</AssemblyName>
<Product>SSH.NET</Product>
Expand Down Expand Up @@ -33,6 +34,7 @@
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' ">
<!-- Must be kept at version 1.0.0, see https://github.com/sshnet/SSH.NET/pull/1288 for details. -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
</ItemGroup>

Expand All @@ -47,4 +49,4 @@
</None>
</ItemGroup>

</Project>
</Project>
3 changes: 2 additions & 1 deletion test/Renci.SshNet.Benchmarks/Renci.SshNet.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
Expand All @@ -7,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions test/Renci.SshNet.IntegrationBenchmarks/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,7 @@ dotnet_diagnostic.MA0053.severity = suggestion
# CA2000: Dispose objects before losing scope
# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca2000
dotnet_diagnostic.CA2000.severity = suggestion

# Error CS8892: Method 'TestingPlatformEntryPoint.Main(string[])' will not be used as an entry point because a synchronous entry point 'Program.Main(string[])' was found.
# https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-messages/warning-waves#cs8892---method-will-not-be-used-as-an-entry-point-because-a-synchronous-entry-point-method-was-found
dotnet_diagnostic.CS8892.severity = suggestion
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
<!-- <PackageReference Include="SSH.NET" Version="2023.0.0" /> -->
<PackageReference Include="SSH.NET" Version="2023.0.0" ExcludeAssets="All" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Include="Testcontainers" Version="3.6.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
<PackageReference Include="Testcontainers" Version="3.7.0" />
<!--
Testcontainers has a dependency on SSH.NET which causes build warnings during assembly resolution:
Expand All @@ -23,7 +23,7 @@
To fix, we explicitly exclude the SSH.NET nuget package from this project's dependencies.
-->
<PackageReference Include="SSH.NET" Version="2023.0.0" ExcludeAssets="All" />
<PackageReference Include="SSH.NET" Version="2023.0.1" ExcludeAssets="All" />

<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
<PackageReference Include="LiquidTestReports.Markdown" Version="1.0.9" />
Expand All @@ -46,4 +46,5 @@
<EmbeddedResource Include="..\Data\*" LinkBase="Data" />
<EmbeddedResource Include="resources\issue #70.png" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<NoWarn>$(NoWarn);SYSLIB0021;SYSLIB1045</NoWarn>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Properties\**" />
<EmbeddedResource Remove="Properties\**" />
<None Remove="Properties\**" />
</ItemGroup>
</Project>

</Project>
10 changes: 5 additions & 5 deletions test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462;net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
Expand All @@ -8,11 +9,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
<PackageReference Include="Moq" Version="4.18.4" />

<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
<PackageReference Include="LiquidTestReports.Markdown" Version="1.0.9" />
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
Expand All @@ -23,10 +23,10 @@
<IncludeAssets>build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Renci.SshNet\Renci.SshNet.csproj" />
</ItemGroup>

</Project>

0 comments on commit b47b35c

Please sign in to comment.