Skip to content

Commit cdcf748

Browse files
committed
Bump .NET SDK to 10
1 parent 7e684df commit cdcf748

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v4
1515

16-
- name: Install .NET 8
16+
- name: Install .NET SDK
1717
uses: actions/setup-dotnet@v4
1818
with:
19-
dotnet-version: "8"
19+
dotnet-version: "10"
2020

2121
- name: Debug build with analyzers
2222
run: Dist/BuildDebug.sh -p:ContinuousIntegrationBuild=true -warnaserror
@@ -37,10 +37,10 @@ jobs:
3737
- name: Checkout
3838
uses: actions/checkout@v4
3939

40-
- name: Install .NET 8
40+
- name: Install .NET SDK
4141
uses: actions/setup-dotnet@v4
4242
with:
43-
dotnet-version: "8"
43+
dotnet-version: "10"
4444

4545
- name: Test
4646
run: dotnet test BizHawk.sln -c Release -p:ContinuousIntegrationBuild=true -p:RunStyleCop=false
@@ -53,10 +53,10 @@ jobs:
5353
- name: Checkout
5454
uses: actions/checkout@v4
5555

56-
- name: Install .NET 8
56+
- name: Install .NET SDK
5757
uses: actions/setup-dotnet@v4
5858
with:
59-
dotnet-version: "8"
59+
dotnet-version: "10"
6060

6161
- name: Build solution
6262
run: Dist/BuildRelease.sh

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v4
1515

16-
- name: Install .NET 8
16+
- name: Install .NET SDK
1717
uses: actions/setup-dotnet@v4
1818
with:
19-
dotnet-version: "8"
19+
dotnet-version: "10"
2020

2121
- name: Get BizHawk version
2222
run: echo "BIZHAWK_VERSION=$(grep -Po "MainVersion = \"\K(.*)(?=\")" src/BizHawk.Common/VersionInfo.cs)" >> $GITHUB_ENV

.gitlab-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ build_asms_debug:
2929
name: "$CI_HAWK_TMPARTIFACT_NAME"
3030
paths:
3131
- output
32-
image: mcr.microsoft.com/dotnet/sdk:8.0
32+
image: mcr.microsoft.com/dotnet/sdk:10.0
3333
script:
3434
- Dist/BuildDebug.sh -v normal
3535
stage: build
@@ -40,15 +40,15 @@ build_asms_release:
4040
name: "$CI_HAWK_TMPARTIFACT_NAME"
4141
paths:
4242
- output
43-
image: mcr.microsoft.com/dotnet/sdk:8.0
43+
image: mcr.microsoft.com/dotnet/sdk:10.0
4444
script:
4545
- if [ "$CI_COMMIT_REF_SLUG" == "release" ]; then Dist/UpdateVersionInfoForRelease.sh; fi
4646
- Dist/BuildRelease.sh -v normal
4747
stage: build
4848

4949
build_ext_projs:
5050
allow_failure: true
51-
image: mcr.microsoft.com/dotnet/sdk:8.0
51+
image: mcr.microsoft.com/dotnet/sdk:10.0
5252
rules:
5353
- if: '$CI_PIPELINE_SOURCE == "schedule"'
5454
when: always
@@ -58,7 +58,7 @@ build_ext_projs:
5858

5959
build_ext_tools:
6060
allow_failure: true
61-
image: mcr.microsoft.com/dotnet/sdk:8.0
61+
image: mcr.microsoft.com/dotnet/sdk:10.0
6262
needs:
6363
- build_asms_release
6464
rules:
@@ -91,7 +91,7 @@ build_nix_prev_release:
9191
stage: test
9292

9393
check_style:
94-
image: mcr.microsoft.com/dotnet/sdk:8.0
94+
image: mcr.microsoft.com/dotnet/sdk:10.0
9595
needs:
9696
- job: build_asms_release
9797
artifacts: false
@@ -196,7 +196,7 @@ run_tests:
196196
reports:
197197
junit:
198198
- test_output/*.coverage.xml
199-
image: mcr.microsoft.com/dotnet/sdk:8.0
199+
image: mcr.microsoft.com/dotnet/sdk:10.0
200200
needs:
201201
- job: build_asms_release
202202
artifacts: false

contributing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ It's probably a good idea to get the .NET SDK, even if you're not working on a .
6868
## For any: .NET project
6969

7070
- Linux
71-
- Install the .NET 8 SDK (package name is usually `dotnet-sdk-8.0`, see [full instructions](https://learn.microsoft.com/dotnet/core/install/linux)).
71+
- Install the .NET 10 SDK (package name is usually `dotnet-sdk-10.0`, see [full instructions](https://learn.microsoft.com/dotnet/core/install/linux)).
7272
- VS Community isn't available for Linux, but Rider and VS Code are.
7373
- Nix/NixOS users can get the .NET SDK ephemerally with the provided `shell.nix`. For IDE setup and more, see the [Nix-specific docs](Dist/nix_expr_usage_docs.md#ide-setup).
7474
- macOS
7575
- Note that EmuHawk does not currently support macOS.
76-
- Install the .NET 8 SDK [manually](https://learn.microsoft.com/dotnet/core/install/macos) or with Homebrew.
76+
- Install the .NET 10 SDK [manually](https://learn.microsoft.com/dotnet/core/install/macos) or with Homebrew.
7777
- VS Community isn't available for macOS, but Rider and VS Code are.
7878
- Windows
79-
- The .NET 8 SDK comes with [VS Community 2022](https://visualstudio.microsoft.com/vs/community) (see [full instructions](https://learn.microsoft.com/dotnet/core/install/windows)).
79+
- The .NET 10 SDK comes with [VS Community 2022](https://visualstudio.microsoft.com/vs/community) (see [full instructions](https://learn.microsoft.com/dotnet/core/install/windows)).
8080
- You can also use Rider, VS Code, or something else instead of VS Community.
8181

82-
For EmuHawk and libraries in the main solution, which do not target .NET 8, we have [this page](https://github.com/TASEmulators/BizHawk/wiki/Available-C%23-and-.NET-features) documenting which features are actually available to use.
82+
For EmuHawk and libraries in the main solution, which do not target .NET 10, we have [this page](https://github.com/TASEmulators/BizHawk/wiki/Available-C%23-and-.NET-features) documenting which features are actually available to use.
8383
We also have [supplemental docs](https://github.com/TASEmulators/BizHawk/wiki/C%23-and-.NET-docs-supplement) on some of the language's footguns.
8484

8585

default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ in {
2727
src = builtins.path { path = ./.; name = "BizHawk-${version}"; }; # source derivation; did have filter here for speed, but it wasn't faster and it wasn't correct and it couldn't be made correct and I'm mad
2828
}
2929
# makedeps
30+
#, dotnet-sdk_10 ? pkgs.dotnet-sdk_10 #TODO
3031
, dotnet-sdk_8 ? pkgs.dotnet-sdk_8
3132
, dotnet-sdk_6 ? pkgs.dotnet-sdk_6
3233
, dotnet-sdk_5 ? let result = builtins.tryEval pkgs.dotnet-sdk_5; in if result.success

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "8.0.0",
3+
"version": "10.0.0",
44
"allowPrerelease": true,
5-
"rollForward": "latestMajor"
5+
"rollForward": "latestMinor"
66
}
77
}

0 commit comments

Comments
 (0)