From 2c3c204d763920acd9bdea3869a006c9d6257f81 Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Wed, 15 Apr 2026 16:39:55 +0100 Subject: [PATCH 1/6] Update to netstandard2.0 --- .gitignore | 1 + .../Slack.Webhooks.Tests.csproj | 75 +++++++------------ src/Slack.Webhooks.Tests/packages.config | 41 ---------- src/Slack.Webhooks/Slack.Webhooks.csproj | 35 +++------ 4 files changed, 41 insertions(+), 111 deletions(-) delete mode 100644 src/Slack.Webhooks.Tests/packages.config diff --git a/.gitignore b/.gitignore index 99c0218..586e545 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ Backup*/ UpgradeLog*.XML /src/.vs/Slack.Webhooks/v15/Server/sqlite3 /.vs +.idea/ \ No newline at end of file diff --git a/src/Slack.Webhooks.Tests/Slack.Webhooks.Tests.csproj b/src/Slack.Webhooks.Tests/Slack.Webhooks.Tests.csproj index 6ae39a5..34d693e 100644 --- a/src/Slack.Webhooks.Tests/Slack.Webhooks.Tests.csproj +++ b/src/Slack.Webhooks.Tests/Slack.Webhooks.Tests.csproj @@ -1,49 +1,30 @@ - - net45;netcoreapp2 - False - False - - - - - - - - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - - - - - - - - - - - {53751b1b-a63e-4e4f-988c-bc783e68b15f} - Slack.Webhooks - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + net10.0 + False + False + + + + + + + {53751b1b-a63e-4e4f-988c-bc783e68b15f} + Slack.Webhooks + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + \ No newline at end of file diff --git a/src/Slack.Webhooks.Tests/packages.config b/src/Slack.Webhooks.Tests/packages.config deleted file mode 100644 index c274243..0000000 --- a/src/Slack.Webhooks.Tests/packages.config +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Slack.Webhooks/Slack.Webhooks.csproj b/src/Slack.Webhooks/Slack.Webhooks.csproj index ccc484b..022c66a 100644 --- a/src/Slack.Webhooks/Slack.Webhooks.csproj +++ b/src/Slack.Webhooks/Slack.Webhooks.csproj @@ -1,26 +1,15 @@  - - net45;netstandard1.3 - False - False - https://github.com/mrb0nj/Slack.Webhooks.git - - - - - - - - - - - - - - - - - - + + netstandard2.0 + False + False + https://github.com/mrb0nj/Slack.Webhooks.git + + + + + + + \ No newline at end of file From c3cd855d6ebe49a2a8ba2d0395d16b2df444984d Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Wed, 15 Apr 2026 16:43:22 +0100 Subject: [PATCH 2/6] update github actions versions --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8070df4..a306501 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,16 +14,16 @@ jobs: runs-on: windows-latest name: Dotnet build steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 - run: | git fetch --prune --unshallow - run: | git branch master origin/master if: github.event_name != 'push' || (github.event_name == 'push' && github.ref != 'refs/heads/master') - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: - dotnet-version: "2.2.103" + dotnet-version: 10.* - name: Build run: .\build.ps1 shell: pwsh @@ -32,7 +32,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NUGET_TOKEN: ${{ secrets.NugetKey }} - name: Add artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build.outputs.nupkg_name }} path: ${{ steps.build.outputs.nupkg }} From 2bb854c237a80619ecf285167d1b004a5618a366 Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Wed, 15 Apr 2026 16:49:05 +0100 Subject: [PATCH 3/6] remove testing against net45 --- build.cake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/build.cake b/build.cake index 78e9018..4a0bb9a 100644 --- a/build.cake +++ b/build.cake @@ -143,17 +143,6 @@ Task("Test") .IsDependentOn("TestFramework") .IsDependentOn("TestCore"); -Task("TestFramework") - .IsDependentOn("Build") - .Does(() => -{ - var testAssemblies = GetFiles($"./src/**/bin/{configuration}/net45/*.Tests.dll"); - XUnit2(testAssemblies, new XUnit2Settings { - Parallelism = ParallelismOption.All, - NoAppDomain = true - }); -}); - Task("TestCore") .IsDependentOn("Build") .Does(() => From f80011721b5772e6fe46885f72b64b842bc1118a Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Wed, 15 Apr 2026 16:52:57 +0100 Subject: [PATCH 4/6] Remove testfwk ref --- build.cake | 1 - 1 file changed, 1 deletion(-) diff --git a/build.cake b/build.cake index 4a0bb9a..be5a2f0 100644 --- a/build.cake +++ b/build.cake @@ -140,7 +140,6 @@ Task("DeployNuGet") }); Task("Test") - .IsDependentOn("TestFramework") .IsDependentOn("TestCore"); Task("TestCore") From 3337fcdefa0b7d221bd2e774c5a25b32d10726bf Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Wed, 15 Apr 2026 16:56:56 +0100 Subject: [PATCH 5/6] set tests fwk in cake --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index be5a2f0..d3e9072 100644 --- a/build.cake +++ b/build.cake @@ -155,7 +155,7 @@ Task("TestCore") DotNetCoreTest("./src/Slack.Webhooks.Tests/Slack.Webhooks.Tests.csproj", new DotNetCoreTestSettings { NoBuild = true, - Framework = "netcoreapp2", + Framework = "net10.0", Configuration = configuration }, coverletSettings); }); From f1d835af9fe4af85e30f716049217a2a8d480e21 Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Wed, 15 Apr 2026 17:16:57 +0100 Subject: [PATCH 6/6] update nuspec --- src/Slack.Webhooks/Slack.Webhooks.nuspec | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/Slack.Webhooks/Slack.Webhooks.nuspec b/src/Slack.Webhooks/Slack.Webhooks.nuspec index f31e413..31fc6ab 100644 --- a/src/Slack.Webhooks/Slack.Webhooks.nuspec +++ b/src/Slack.Webhooks/Slack.Webhooks.nuspec @@ -33,30 +33,15 @@ ]]> - - - - - - + + + - - - - - - - - - - - - - +