Skip to content

Commit f205bba

Browse files
Misha-133Misha-133
authored
Add net10.0 build target, update deps (#3200)
1 parent 0aff637 commit f205bba

File tree

19 files changed

+50
-42
lines changed

19 files changed

+50
-42
lines changed

‎.github/workflows/docs.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323

2424
- name: Setup .NET
25-
uses: actions/setup-dotnet@v4
25+
uses: actions/setup-dotnet@v5
2626
with:
27-
dotnet-version: 9.0.x
27+
dotnet-version: 10.0.x
2828

2929
- name: Setup DocFX
30-
run: dotnet tool install -g docfx --version 2.78.3
30+
run: dotnet tool install -g docfx --version 2.78.4
3131

3232
- name: Build DNet docs
3333
run: docfx docs/docfx.json
3434

3535
- name: Upload Artifacts
36-
uses: actions/upload-artifact@v4
36+
uses: actions/upload-artifact@v5
3737
with:
3838
name: static-docs
3939
path: docs/_site
@@ -45,7 +45,7 @@ jobs:
4545
if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
4646
steps:
4747
- name: Download Artifacts
48-
uses: actions/download-artifact@v4
48+
uses: actions/download-artifact@v6
4949
with:
5050
name: static-docs
5151
path: output/

‎.github/workflows/dotnet.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
IsTagBuild: false
2121
DOTNET_INSTALL_DIR: "/usr/share/dotnet"
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424

2525
- name: Setup .NET
26-
uses: actions/setup-dotnet@v4
26+
uses: actions/setup-dotnet@v5
2727
with:
28-
dotnet-version: 9.0.x
28+
dotnet-version: 10.0.x
2929

3030
- name: Is Tag Build
3131
if: startsWith(github.ref, 'refs/tags/')
@@ -69,7 +69,7 @@ jobs:
6969
# 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 }}
7070

7171
- name: Publish Artifacts
72-
uses: actions/upload-artifact@v4
72+
uses: actions/upload-artifact@v5
7373
with:
7474
name: discord-net
7575
path: ${{ env.ArtifactStagingDirectory }}/*
@@ -84,7 +84,7 @@ jobs:
8484
ArtifactStagingDirectory: "artifacts"
8585
REPOSITORY_URL: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
8686
steps:
87-
- uses: actions/checkout@v4
87+
- uses: actions/checkout@v5
8888

8989
- name: Is Tag Build
9090
if: startsWith(github.ref, 'refs/tags/')
@@ -106,7 +106,7 @@ jobs:
106106
nuget-version: '6.x'
107107

108108
- name: Download artifacts
109-
uses: actions/download-artifact@v4
109+
uses: actions/download-artifact@v6
110110
with:
111111
name: discord-net
112112
path: ${{ env.ArtifactStagingDirectory }}

‎docs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The documentation for the Discord.Net library uses [DocFX][docfx-main].
44
Instructions for installing this tool can be found [here][docfx-installing].
55

66
> [!IMPORTANT]
7-
> You must use DocFX version **2.78.3** for everything to work correctly.
7+
> You must use DocFX version **2.78.4** for everything to work correctly.
88
99
1. Navigate to the root of the repository.
1010
2. Build the docs using `docfx docs/docfx.json`. Add the `--serve`

‎experiment/Discord.Net.BuildOverrides/Discord.Net.BuildOverrides.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AssemblyName>Discord.Net.BuildOverrides</AssemblyName>
66
<RootNamespace>Discord.BuildOverrides</RootNamespace>
77
<Description>A Discord.Net extension adding a way to add build overrides for testing.</Description>
8-
<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
8+
<TargetFrameworks>net8.0;net9.0;net10.0;</TargetFrameworks>
99
<IsTrimmable>false</IsTrimmable>
1010
<IsAotCompatible>false</IsAotCompatible>
1111
<IncludeSymbols>true</IncludeSymbols>

‎samples/BasicBot/_BasicBot.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Discord.Net.WebSocket" Version="3.17.0" />
9+
<PackageReference Include="Discord.Net.WebSocket" Version="3.18.0" />
1010
</ItemGroup>
1111

1212
</Project>

‎samples/InteractionFramework/_InteractionFramework.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
16-
<PackageReference Include="Discord.Net.WebSocket" Version="3.17.0" />
17-
<PackageReference Include="Discord.Net.Interactions" Version="3.17.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
16+
<PackageReference Include="Discord.Net.WebSocket" Version="3.18.0" />
17+
<PackageReference Include="Discord.Net.Interactions" Version="3.18.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎samples/ShardedClient/_ShardedClient.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
11-
<PackageReference Include="Discord.Net" Version="3.17.0" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
11+
<PackageReference Include="Discord.Net" Version="3.18.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎samples/TextCommandFramework/_TextCommandFramework.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
11-
<PackageReference Include="Discord.Net.Commands" Version="3.17.0" />
12-
<PackageReference Include="Discord.Net.Websocket" Version="3.17.0" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
11+
<PackageReference Include="Discord.Net.Commands" Version="3.18.0" />
12+
<PackageReference Include="Discord.Net.Websocket" Version="3.18.0" />
1313
</ItemGroup>
1414

1515
</Project>

‎samples/WebhookClient/_WebhookClient.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Discord.Net.Webhook" Version="3.17.0" />
10+
<PackageReference Include="Discord.Net.Webhook" Version="3.18.0" />
1111
</ItemGroup>
1212

1313
</Project>

‎samples/idn/idn.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
9+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

0 commit comments

Comments
 (0)