Skip to content

Commit 58eaeec

Browse files
Bump the dependencies (#1625)
* Bump the dependencies group with 5 updates * use MEL 8.0.3 * use MSTest meta package * revert Meziantou due to NRE * add a more useful global.json and pin third party action --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob Hague <[email protected]>
1 parent ad17482 commit 58eaeec

File tree

7 files changed

+16
-35
lines changed

7 files changed

+16
-35
lines changed

.github/workflows/build.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ jobs:
1616

1717
- name: Setup .NET
1818
uses: actions/setup-dotnet@v4
19-
with:
20-
dotnet-version: 9.0.x
2119

2220
- name: Build Unit Tests .NET
2321
run: dotnet build -f net9.0 test/Renci.SshNet.Tests/
@@ -65,8 +63,6 @@ jobs:
6563

6664
- name: Setup .NET
6765
uses: actions/setup-dotnet@v4
68-
with:
69-
dotnet-version: 9.0.x
7066

7167
- name: Build Solution
7268
run: dotnet build Renci.SshNet.sln
@@ -118,11 +114,9 @@ jobs:
118114

119115
- name: Setup .NET
120116
uses: actions/setup-dotnet@v4
121-
with:
122-
dotnet-version: 9.0.x
123117

124118
- name: Setup WSL2
125-
uses: Vampire/setup-wsl@v5
119+
uses: Vampire/setup-wsl@f40fb59d850112c9a292b0218bca8271305b9127 # v5.0.0
126120
with:
127121
distribution: Ubuntu-24.04
128122

.github/workflows/docs.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ jobs:
2727
- name: Setup Pages
2828
uses: actions/configure-pages@v5
2929

30-
- name: Setup .NET 8.0
30+
- name: Setup .NET
3131
uses: actions/setup-dotnet@v4
32-
with:
33-
dotnet-version: 8.x
3432

3533
- name: Setup docfx
3634
run: dotnet tool update -g docfx

Directory.Packages.props

+5-13
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,13 @@
88
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.5.1" />
99
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
1010
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
11-
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1">
12-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13-
<PrivateAssets>all</PrivateAssets>
14-
</PackageVersion>
11+
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
1512
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.188" />
1613

17-
<!-- Must be kept at version 1.0.0, see https://github.com/sshnet/SSH.NET/pull/1288 for details. -->
18-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
19-
20-
<!-- No reason to require later than 6.0.0 at this time. -->
21-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
22-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.2" />
23-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
24-
<PackageVersion Include="MSTest.TestAdapter" Version="3.8.2" />
25-
<PackageVersion Include="MSTest.TestFramework" Version="3.8.2" />
14+
<!-- Should stay on LTS .NET releases. -->
15+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
16+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
17+
<PackageVersion Include="MSTest" Version="3.8.3" />
2618
<PackageVersion Include="Moq" Version="4.20.72" />
2719
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.115" />
2820
<PackageVersion Include="PolySharp" Version="1.15.0" />

global.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "9.0.200",
4+
"rollForward": "latestFeature"
5+
}
6+
}

src/Renci.SshNet/Renci.SshNet.csproj

+1-6
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@
4949
</PackageReference>
5050
</ItemGroup>
5151

52-
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' ">
53-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
54-
<PackageReference Include="System.Formats.Asn1" />
55-
</ItemGroup>
56-
57-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
52+
<ItemGroup Condition=" !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) ">
5853
<PackageReference Include="System.Formats.Asn1" />
5954
</ItemGroup>
6055

test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
2020
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
22-
<PackageReference Include="MSTest.TestAdapter" />
23-
<PackageReference Include="MSTest.TestFramework" />
21+
<PackageReference Include="MSTest" />
2422
<PackageReference Include="Testcontainers" />
2523
<PackageReference Include="coverlet.msbuild">
2624
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
<PrivateAssets>all</PrivateAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
17-
<PackageReference Include="MSTest.TestAdapter" />
18-
<PackageReference Include="MSTest.TestFramework" />
16+
<PackageReference Include="MSTest" />
1917
<PackageReference Include="Moq" />
2018
<PackageReference Include="coverlet.msbuild">
2119
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)