Skip to content

Commit 82dedf1

Browse files
mnadareskimnadareski
committed
Add support for .NET 10
1 parent 395cded commit 82dedf1

File tree

29 files changed

+202
-206
lines changed

29 files changed

+202
-206
lines changed

‎.github/ISSUE_TEMPLATE/issue-report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ What version are you using?
2525
**Build**
2626
What runtime version are you using?
2727

28-
- [ ] .NET 9.0 running on (Operating System)
28+
- [ ] .NET 10 running on (Operating System)
2929

3030
**Describe the issue**
3131
A clear and concise description of what the bug is.

‎.github/workflows/build_and_test.yml‎

Lines changed: 54 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,59 @@
11
name: Build and Test
22

33
on:
4-
push:
5-
branches: [ "master" ]
4+
push:
5+
branches: ["master"]
66

77
jobs:
8-
build:
9-
runs-on: ubuntu-latest
10-
11-
steps:
12-
- name: Free Disk Space (Ubuntu)
13-
uses: jlumbroso/[email protected]
14-
with:
15-
dotnet: false
16-
17-
- uses: actions/checkout@v4
18-
with:
19-
fetch-depth: 0
20-
21-
- name: Setup .NET
22-
uses: actions/setup-dotnet@v4
23-
with:
24-
dotnet-version: |
25-
6.0.x
26-
8.0.x
27-
9.0.x
28-
10.0.x
29-
30-
- name: Run tests
31-
run: dotnet test
32-
33-
- name: Run publish script
34-
run: ./publish-nix.sh -dp
35-
36-
- name: Update rolling tag
37-
run: |
38-
git config user.name "github-actions[bot]"
39-
git config user.email "github-actions[bot]@users.noreply.github.com"
40-
git tag -f rolling
41-
git push origin :refs/tags/rolling || true
42-
git push origin rolling --force
43-
44-
- name: Upload to rolling
45-
uses: ncipollo/[email protected]
46-
with:
47-
allowUpdates: True
48-
artifacts: "*.nupkg,*.snupkg,*.zip"
49-
body: 'Last built commit: ${{ github.sha }}
50-
51-
## UI Builds
52-
53-
[Windows x64 UI Release](https://github.com/SabreTools/MPF/releases/download/rolling/MPF.UI_net9.0-windows_win-x64_release.zip)
54-
55-
[Windows x64 UI Debug](https://github.com/SabreTools/MPF/releases/download/rolling/MPF.UI_net9.0-windows_win-x64_debug.zip)'
56-
name: 'Rolling Release'
57-
prerelease: True
58-
replacesArtifacts: True
59-
tag: "rolling"
60-
updateOnlyUnreleased: True
8+
build:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Free Disk Space (Ubuntu)
13+
uses: jlumbroso/[email protected]
14+
with:
15+
dotnet: false
16+
17+
- uses: actions/checkout@v5
18+
with:
19+
fetch-depth: 0
20+
21+
- name: Setup .NET
22+
uses: actions/setup-dotnet@v5
23+
with:
24+
dotnet-version: |
25+
8.0.x
26+
9.0.x
27+
10.0.x
28+
29+
- name: Run tests
30+
run: dotnet test
31+
32+
- name: Run publish script
33+
run: ./publish-nix.sh -dp
34+
35+
- name: Update rolling tag
36+
run: |
37+
git config user.name "github-actions[bot]"
38+
git config user.email "github-actions[bot]@users.noreply.github.com"
39+
git tag -f rolling
40+
git push origin :refs/tags/rolling || true
41+
git push origin rolling --force
42+
43+
- name: Upload to rolling
44+
uses: ncipollo/[email protected]
45+
with:
46+
allowUpdates: True
47+
artifacts: "*.nupkg,*.snupkg,*.zip"
48+
body: "Last built commit: ${{ github.sha }}
49+
50+
## UI Builds
51+
52+
[Windows x64 UI Release](https://github.com/SabreTools/MPF/releases/download/rolling/MPF.UI_net10.0-windows_win-x64_release.zip)
53+
54+
[Windows x64 UI Debug](https://github.com/SabreTools/MPF/releases/download/rolling/MPF.UI_net10.0-windows_win-x64_debug.zip)"
55+
name: "Rolling Release"
56+
prerelease: True
57+
replacesArtifacts: True
58+
tag: "rolling"
59+
updateOnlyUnreleased: True

‎.github/workflows/check_pr.yml‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,29 @@ name: Build PR
33
on: [pull_request]
44

55
jobs:
6-
build:
7-
runs-on: ubuntu-latest
8-
steps:
9-
- name: Free Disk Space (Ubuntu)
10-
uses: jlumbroso/[email protected]
11-
with:
12-
dotnet: false
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Free Disk Space (Ubuntu)
10+
uses: jlumbroso/[email protected]
11+
with:
12+
dotnet: false
1313

14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

16-
- name: Setup .NET
17-
uses: actions/setup-dotnet@v4
18-
with:
19-
dotnet-version: |
20-
6.0.x
21-
8.0.x
22-
9.0.x
23-
10.0.x
16+
- name: Setup .NET
17+
uses: actions/setup-dotnet@v5
18+
with:
19+
dotnet-version: |
20+
8.0.x
21+
9.0.x
22+
10.0.x
2423
25-
- name: Restore dependencies
26-
run: dotnet restore
24+
- name: Restore dependencies
25+
run: dotnet restore
2726

28-
- name: Build
29-
run: dotnet build
27+
- name: Build
28+
run: dotnet build
3029

31-
- name: Test
32-
run: dotnet test
30+
- name: Test
31+
run: dotnet test

‎.vscode/launch.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"request": "launch",
1111
"preLaunchTask": "build",
1212
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/MPF.Check/bin/Debug/net9.0/MPF.Check.dll",
13+
"program": "${workspaceFolder}/MPF.Check/bin/Debug/net10.0/MPF.Check.dll",
1414
"args": [],
1515
"cwd": "${workspaceFolder}/MPF.Check",
1616
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
@@ -24,7 +24,7 @@
2424
"request": "launch",
2525
"preLaunchTask": "build",
2626
// If you have changed target frameworks, make sure to update the program path.
27-
"program": "${workspaceFolder}/MPF.CLI/bin/Debug/net9.0/MPF.CLI.dll",
27+
"program": "${workspaceFolder}/MPF.CLI/bin/Debug/net10.0/MPF.CLI.dll",
2828
"args": [],
2929
"cwd": "${workspaceFolder}/MPF.CLI",
3030
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
@@ -38,7 +38,7 @@
3838
"request": "launch",
3939
"preLaunchTask": "build",
4040
// If you have changed target frameworks, make sure to update the program path.
41-
"program": "${workspaceFolder}/MPF.UI/bin/Debug/net9.0-windows/MPF.dll",
41+
"program": "${workspaceFolder}/MPF.UI/bin/Debug/net10.0-windows/MPF.dll",
4242
"args": [],
4343
"cwd": "${workspaceFolder}/MPF.UI",
4444
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console

‎CHANGELIST.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
- Remove DPM identifier for StarForce Keyless
7676
- New Redumper Drive Pregap Start option
7777
- Clarify the unmounted device case
78+
- Add support for .NET 10
7879

7980
### 3.5.0 (2025-10-10)
8081

‎MPF.CLI/MPF.CLI.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- Assembly Properties -->
5-
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
<CheckEolTargetFramework>false</CheckEolTargetFramework>
88
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
@@ -31,20 +31,20 @@
3131
<PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
3232
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
3333
</PropertyGroup>
34-
<PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
34+
<PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`)) OR $(TargetFramework.StartsWith(`net10`))">
3535
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
38-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
38+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
3939
</PropertyGroup>
4040

4141
<ItemGroup>
4242
<ProjectReference Include="..\MPF.Frontend\MPF.Frontend.csproj" />
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="SabreTools.CommandLine" Version="[1.3.2]" />
47-
<PackageReference Include="SabreTools.RedumpLib" Version="[1.8.0]" />
46+
<PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
47+
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
4848
</ItemGroup>
4949

5050
</Project>

‎MPF.Check/MPF.Check.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- Assembly Properties -->
5-
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
<CheckEolTargetFramework>false</CheckEolTargetFramework>
88
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
@@ -31,20 +31,20 @@
3131
<PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
3232
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
3333
</PropertyGroup>
34-
<PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
34+
<PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`)) OR $(TargetFramework.StartsWith(`net10`))">
3535
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
38-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
38+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
3939
</PropertyGroup>
4040

4141
<ItemGroup>
4242
<ProjectReference Include="..\MPF.Frontend\MPF.Frontend.csproj" />
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="SabreTools.CommandLine" Version="[1.3.2]" />
47-
<PackageReference Include="SabreTools.RedumpLib" Version="[1.8.0]" />
46+
<PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
47+
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
4848
</ItemGroup>
4949

5050
</Project>

‎MPF.ExecutionContexts.Test/MPF.ExecutionContexts.Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<CheckEolTargetFramework>false</CheckEolTargetFramework>
66
<LangVersion>latest</LangVersion>
77
<Nullable>enable</Nullable>
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.CodeCoverage" Version="18.0.0" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
20-
<PackageReference Include="SabreTools.RedumpLib" Version="[1.8.0]" />
20+
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
2121
<PackageReference Include="xunit" Version="2.9.3" />
2222
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
2323
<PackageReference Include="xunit.analyzers" Version="1.25.0" />

‎MPF.ExecutionContexts/Aaru/EncodingStrings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ public static class EncodingStrings
4040
public const string WesternEuropeanMac = "macintosh";
4141
public const string WesternEuropeanRadix50 = "radix50";
4242
}
43-
}
43+
}

‎MPF.ExecutionContexts/MPF.ExecutionContexts.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- Assembly Properties -->
5-
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
66
<CheckEolTargetFramework>false</CheckEolTargetFramework>
77
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
88
<IncludeSymbols>true</IncludeSymbols>
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="SabreTools.RedumpLib" Version="[1.8.0]" />
35+
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
3636
</ItemGroup>
3737

3838
</Project>

0 commit comments

Comments
 (0)