From 3fc78f8467766c7651a253a48f29081de6a6ec20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 20:54:14 +0000 Subject: [PATCH 1/5] Bump the dependencies group with 5 updates Bumps the dependencies group with 5 updates: | Package | From | To | | --- | --- | --- | | [Meziantou.Analyzer](https://github.com/meziantou/Meziantou.Analyzer) | `2.0.188` | `2.0.189` | | [Microsoft.NETFramework.ReferenceAssemblies](https://github.com/Microsoft/dotnet) | `1.0.3` | `1.0.3` | | [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime) | `6.0.0` | `6.0.4` | | [Microsoft.Extensions.Logging.Console](https://github.com/dotnet/runtime) | `9.0.2` | `9.0.3` | | [MSTest.TestFramework](https://github.com/microsoft/testfx) | `3.8.2` | `3.8.3` | Updates `Meziantou.Analyzer` from 2.0.188 to 2.0.189 - [Release notes](https://github.com/meziantou/Meziantou.Analyzer/releases) - [Commits](https://github.com/meziantou/Meziantou.Analyzer/compare/2.0.188...2.0.189) Updates `Microsoft.NETFramework.ReferenceAssemblies` from 1.0.3 to 1.0.3 - [Commits](https://github.com/Microsoft/dotnet/commits) Updates `Microsoft.Extensions.Logging.Abstractions` from 6.0.0 to 6.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v6.0.0...v6.0.4) Updates `Microsoft.NETFramework.ReferenceAssemblies` from 1.0.3 to 1.0.3 - [Commits](https://github.com/Microsoft/dotnet/commits) Updates `Microsoft.Extensions.Logging.Console` from 9.0.2 to 9.0.3 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.2...v9.0.3) Updates `Microsoft.NETFramework.ReferenceAssemblies` from 1.0.3 to 1.0.3 - [Commits](https://github.com/Microsoft/dotnet/commits) Updates `MSTest.TestFramework` from 3.8.2 to 3.8.3 - [Release notes](https://github.com/microsoft/testfx/releases) - [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md) - [Commits](https://github.com/microsoft/testfx/compare/v3.8.2...v3.8.3) --- updated-dependencies: - dependency-name: Meziantou.Analyzer dependency-version: 2.0.189 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: Microsoft.NETFramework.ReferenceAssemblies dependency-version: 1.0.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-version: 6.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: Microsoft.NETFramework.ReferenceAssemblies dependency-version: 1.0.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: Microsoft.Extensions.Logging.Console dependency-version: 9.0.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: Microsoft.NETFramework.ReferenceAssemblies dependency-version: 1.0.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: MSTest.TestFramework dependency-version: 3.8.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 3320e0fde..785e70b72 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,17 +12,17 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + - - + + - + From bdef967c96fb52e95ff63482bd8fa9cc04dfc381 Mon Sep 17 00:00:00 2001 From: Rob Hague Date: Fri, 4 Apr 2025 20:30:59 +0200 Subject: [PATCH 2/5] use MEL 8.0.3 --- Directory.Packages.props | 7 ++----- src/Renci.SshNet/Renci.SshNet.csproj | 7 +------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 785e70b72..e6c244225 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -14,11 +14,8 @@ - - - - - + + diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj index c6ab62f32..a76bbafe2 100644 --- a/src/Renci.SshNet/Renci.SshNet.csproj +++ b/src/Renci.SshNet/Renci.SshNet.csproj @@ -49,12 +49,7 @@ - - - - - - + From 42b9dad111f78abda03134647db01aebe0e46e44 Mon Sep 17 00:00:00 2001 From: Rob Hague Date: Sat, 5 Apr 2025 14:52:35 +0200 Subject: [PATCH 3/5] use MSTest meta package --- Directory.Packages.props | 11 +++-------- .../Renci.SshNet.IntegrationTests.csproj | 4 +--- test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj | 4 +--- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e6c244225..cad8bbd6c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,18 +8,13 @@ - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + - - - + diff --git a/test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj b/test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj index e3334796a..8755ffb44 100644 --- a/test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj +++ b/test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj @@ -18,9 +18,7 @@ all - - - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj index 1f8c5bcaa..1a7145aa3 100644 --- a/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj +++ b/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj @@ -13,9 +13,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + runtime; build; native; contentfiles; analyzers; buildtransitive From 3b85f76e16212470901275e12fe5d942f3027d9a Mon Sep 17 00:00:00 2001 From: Rob Hague Date: Sat, 5 Apr 2025 16:31:10 +0200 Subject: [PATCH 4/5] revert Meziantou due to NRE --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index cad8bbd6c..34016a3f4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ - + From 788952ad141939a195adc5902a8e804d46735246 Mon Sep 17 00:00:00 2001 From: Rob Hague Date: Sat, 5 Apr 2025 18:44:43 +0200 Subject: [PATCH 5/5] add a more useful global.json and pin third party action --- .github/workflows/build.yml | 8 +------- .github/workflows/docs.yml | 4 +--- global.json | 6 ++++++ 3 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 global.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e8eb3095..6c373e3eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,6 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 - with: - dotnet-version: 9.0.x - name: Build Unit Tests .NET run: dotnet build -f net9.0 test/Renci.SshNet.Tests/ @@ -65,8 +63,6 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 - with: - dotnet-version: 9.0.x - name: Build Solution run: dotnet build Renci.SshNet.sln @@ -118,11 +114,9 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 - with: - dotnet-version: 9.0.x - name: Setup WSL2 - uses: Vampire/setup-wsl@v5 + uses: Vampire/setup-wsl@f40fb59d850112c9a292b0218bca8271305b9127 # v5.0.0 with: distribution: Ubuntu-24.04 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c99625e89..6c2d26aeb 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -27,10 +27,8 @@ jobs: - name: Setup Pages uses: actions/configure-pages@v5 - - name: Setup .NET 8.0 + - name: Setup .NET uses: actions/setup-dotnet@v4 - with: - dotnet-version: 8.x - name: Setup docfx run: dotnet tool update -g docfx diff --git a/global.json b/global.json new file mode 100644 index 000000000..a02bac5a2 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "9.0.200", + "rollForward": "latestFeature" + } +}