From f205bba17f88fb70134089e473adf16d1c167dd0 Mon Sep 17 00:00:00 2001
From: Mihail Gribkov <61027276+Misha-133@users.noreply.github.com>
Date: Tue, 11 Nov 2025 22:34:40 +0300
Subject: [PATCH] Add net10.0 build target, update deps (#3200)
---
.github/workflows/docs.yml | 12 ++++++------
.github/workflows/dotnet.yml | 12 ++++++------
docs/README.md | 2 +-
.../Discord.Net.BuildOverrides.csproj | 2 +-
samples/BasicBot/_BasicBot.csproj | 2 +-
.../_InteractionFramework.csproj | 14 +++++++-------
samples/ShardedClient/_ShardedClient.csproj | 4 ++--
.../_TextCommandFramework.csproj | 6 +++---
samples/WebhookClient/_WebhookClient.csproj | 2 +-
samples/idn/idn.csproj | 2 +-
.../Discord.Net.Commands.csproj | 4 ++--
src/Discord.Net.Core/Discord.Net.Core.csproj | 4 ++--
.../Discord.Net.Interactions.csproj | 4 ++--
src/Discord.Net.Rest/Discord.Net.Rest.csproj | 2 +-
.../Discord.Net.WebSocket.csproj | 2 +-
src/Discord.Net.Webhook/Discord.Net.Webhook.csproj | 2 +-
src/Discord.Net/Discord.Net.nuspec | 8 ++++++++
.../Discord.Net.Tests.Integration.csproj | 4 ++--
.../Discord.Net.Tests.Unit.csproj | 4 ++--
19 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index ffb1c533..73731c65 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -19,21 +19,21 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v5
- name: Setup .NET
- uses: actions/setup-dotnet@v4
+ uses: actions/setup-dotnet@v5
with:
- dotnet-version: 9.0.x
+ dotnet-version: 10.0.x
- name: Setup DocFX
- run: dotnet tool install -g docfx --version 2.78.3
+ run: dotnet tool install -g docfx --version 2.78.4
- name: Build DNet docs
run: docfx docs/docfx.json
- name: Upload Artifacts
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v5
with:
name: static-docs
path: docs/_site
@@ -45,7 +45,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
steps:
- name: Download Artifacts
- uses: actions/download-artifact@v4
+ uses: actions/download-artifact@v6
with:
name: static-docs
path: output/
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index c3a0c819..bf4104d0 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -20,12 +20,12 @@ jobs:
IsTagBuild: false
DOTNET_INSTALL_DIR: "/usr/share/dotnet"
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v5
- name: Setup .NET
- uses: actions/setup-dotnet@v4
+ uses: actions/setup-dotnet@v5
with:
- dotnet-version: 9.0.x
+ dotnet-version: 10.0.x
- name: Is Tag Build
if: startsWith(github.ref, 'refs/tags/')
@@ -69,7 +69,7 @@ jobs:
# dotnet pack "experiment\Discord.Net.BuildOverrides\Discord.Net.BuildOverrides.csproj" --no-restore --no-build -v minimal -c Release -o ${{ env.ArtifactStagingDirectory }} /p:BuildNumber=${{ env.Suffix }} /p:IsTagBuild=${{ env.IsTagBuild }}
- name: Publish Artifacts
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v5
with:
name: discord-net
path: ${{ env.ArtifactStagingDirectory }}/*
@@ -84,7 +84,7 @@ jobs:
ArtifactStagingDirectory: "artifacts"
REPOSITORY_URL: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v5
- name: Is Tag Build
if: startsWith(github.ref, 'refs/tags/')
@@ -106,7 +106,7 @@ jobs:
nuget-version: '6.x'
- name: Download artifacts
- uses: actions/download-artifact@v4
+ uses: actions/download-artifact@v6
with:
name: discord-net
path: ${{ env.ArtifactStagingDirectory }}
diff --git a/docs/README.md b/docs/README.md
index d52550c6..34d01854 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -4,7 +4,7 @@ The documentation for the Discord.Net library uses [DocFX][docfx-main].
Instructions for installing this tool can be found [here][docfx-installing].
> [!IMPORTANT]
-> You must use DocFX version **2.78.3** for everything to work correctly.
+> You must use DocFX version **2.78.4** for everything to work correctly.
1. Navigate to the root of the repository.
2. Build the docs using `docfx docs/docfx.json`. Add the `--serve`
diff --git a/experiment/Discord.Net.BuildOverrides/Discord.Net.BuildOverrides.csproj b/experiment/Discord.Net.BuildOverrides/Discord.Net.BuildOverrides.csproj
index 37e53fad..4e57e7c0 100644
--- a/experiment/Discord.Net.BuildOverrides/Discord.Net.BuildOverrides.csproj
+++ b/experiment/Discord.Net.BuildOverrides/Discord.Net.BuildOverrides.csproj
@@ -5,7 +5,7 @@
Discord.Net.BuildOverrides
Discord.BuildOverrides
A Discord.Net extension adding a way to add build overrides for testing.
- net8.0;net9.0;
+ net8.0;net9.0;net10.0;
false
false
true
diff --git a/samples/BasicBot/_BasicBot.csproj b/samples/BasicBot/_BasicBot.csproj
index adaf3bf1..ac80e133 100644
--- a/samples/BasicBot/_BasicBot.csproj
+++ b/samples/BasicBot/_BasicBot.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/samples/InteractionFramework/_InteractionFramework.csproj b/samples/InteractionFramework/_InteractionFramework.csproj
index 7a2f044f..67845190 100644
--- a/samples/InteractionFramework/_InteractionFramework.csproj
+++ b/samples/InteractionFramework/_InteractionFramework.csproj
@@ -8,13 +8,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/samples/ShardedClient/_ShardedClient.csproj b/samples/ShardedClient/_ShardedClient.csproj
index c432b299..fa91a30c 100644
--- a/samples/ShardedClient/_ShardedClient.csproj
+++ b/samples/ShardedClient/_ShardedClient.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/samples/TextCommandFramework/_TextCommandFramework.csproj b/samples/TextCommandFramework/_TextCommandFramework.csproj
index 1d458bcb..d5dbde90 100644
--- a/samples/TextCommandFramework/_TextCommandFramework.csproj
+++ b/samples/TextCommandFramework/_TextCommandFramework.csproj
@@ -7,9 +7,9 @@
-
-
-
+
+
+
diff --git a/samples/WebhookClient/_WebhookClient.csproj b/samples/WebhookClient/_WebhookClient.csproj
index f7ccc0b6..f60ba0f0 100644
--- a/samples/WebhookClient/_WebhookClient.csproj
+++ b/samples/WebhookClient/_WebhookClient.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/samples/idn/idn.csproj b/samples/idn/idn.csproj
index af062f39..3a4718c4 100644
--- a/samples/idn/idn.csproj
+++ b/samples/idn/idn.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/src/Discord.Net.Commands/Discord.Net.Commands.csproj b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
index 835e78c7..21dc0ace 100644
--- a/src/Discord.Net.Commands/Discord.Net.Commands.csproj
+++ b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
@@ -5,7 +5,7 @@
Discord.Net.Commands
Discord.Commands
A Discord.Net extension adding support for bot commands.
- net9.0;net8.0;
+ net10.0;net9.0;net8.0;
5
True
false
@@ -17,6 +17,6 @@
-
+
diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj
index 0cd6a2a1..632f00ad 100644
--- a/src/Discord.Net.Core/Discord.Net.Core.csproj
+++ b/src/Discord.Net.Core/Discord.Net.Core.csproj
@@ -5,7 +5,7 @@
Discord.Net.Core
Discord
The core components for the Discord.Net library.
- net9.0;net8.0;
+ net10.0;net9.0;net8.0;
5
True
false
@@ -15,7 +15,7 @@
-
+
all
diff --git a/src/Discord.Net.Interactions/Discord.Net.Interactions.csproj b/src/Discord.Net.Interactions/Discord.Net.Interactions.csproj
index 69d8287c..9f129967 100644
--- a/src/Discord.Net.Interactions/Discord.Net.Interactions.csproj
+++ b/src/Discord.Net.Interactions/Discord.Net.Interactions.csproj
@@ -2,7 +2,7 @@
- net9.0;net8.0;
+ net10.0;net9.0;net8.0;
Discord.Interactions
Discord.Net.Interactions
A Discord.Net extension adding support for Application Commands.
@@ -20,7 +20,7 @@
-
+
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
index 220707d4..9537fa5c 100644
--- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
@@ -5,7 +5,7 @@
Discord.Net.Rest
Discord.Rest
A core Discord.Net library containing the REST client and models.
- net9.0;net8.0;
+ net10.0;net9.0;net8.0;
5
True
false
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
index 46bcb0ee..b7d628f7 100644
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
@@ -5,7 +5,7 @@
Discord.Net.WebSocket
Discord.WebSocket
A core Discord.Net library containing the WebSocket client and models.
- net9.0;net8.0;
+ net10.0;net9.0;net8.0;
true
5
True
diff --git a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
index 45a02c79..5bb14e7b 100644
--- a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
+++ b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
@@ -5,7 +5,7 @@
Discord.Net.Webhook
Discord.Webhook
A core Discord.Net library containing the Webhook client and models.
- net9.0;net8.0;
+ net10.0;net9.0;net8.0;
5
True
false
diff --git a/src/Discord.Net/Discord.Net.nuspec b/src/Discord.Net/Discord.Net.nuspec
index 4e4a290f..14ae43ab 100644
--- a/src/Discord.Net/Discord.Net.nuspec
+++ b/src/Discord.Net/Discord.Net.nuspec
@@ -14,6 +14,14 @@
PackageLogo.png
NUGET_README.md
+
+
+
+
+
+
+
+
diff --git a/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj b/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj
index 6ff690ef..5ba59175 100644
--- a/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj
+++ b/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj
@@ -1,7 +1,7 @@
- net9.0
+ net10.0
false
@@ -14,7 +14,7 @@
-
+
diff --git a/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj b/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj
index 339a1d5e..83d863f5 100644
--- a/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj
+++ b/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj
@@ -1,7 +1,7 @@
- net9.0
+ net10.0
false
@@ -12,7 +12,7 @@
-
+