Skip to content

Commit ad31139

Browse files
mnadareskimnadareski
committed
Add support for .NET 10
1 parent f2f0d0f commit ad31139

File tree

215 files changed

+440
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+440
-345
lines changed

‎.github/workflows/build_and_test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
with:
1414
fetch-depth: 0
1515

1616
- name: Setup .NET
17-
uses: actions/setup-dotnet@v4
17+
uses: actions/setup-dotnet@v5
1818
with:
1919
dotnet-version: |
20-
6.0.x
2120
8.0.x
2221
9.0.x
22+
10.0.x
2323
2424
- name: Run tests
2525
run: dotnet test
@@ -36,7 +36,7 @@ jobs:
3636
git push origin rolling --force
3737
3838
- name: Upload to rolling
39-
uses: ncipollo/release-action@v1.14.0
39+
uses: ncipollo/release-action@v1.20.0
4040
with:
4141
allowUpdates: True
4242
artifacts: "*.nupkg,*.snupkg,*.zip"

‎.github/workflows/check_pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v5
1010

1111
- name: Setup .NET
12-
uses: actions/setup-dotnet@v4
12+
uses: actions/setup-dotnet@v5
1313
with:
1414
dotnet-version: |
15-
6.0.x
1615
8.0.x
1716
9.0.x
17+
10.0.x
1818
1919
- name: Build
2020
run: dotnet build

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 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}/ExtractionTool/bin/Debug/net9.0/ExtractionTool.dll",
13+
"program": "${workspaceFolder}/ExtractionTool/bin/Debug/net10.0/ExtractionTool.dll",
1414
"args": [],
1515
"cwd": "${workspaceFolder}",
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}/InfoPrint/bin/Debug/net9.0/InfoPrint.dll",
27+
"program": "${workspaceFolder}/InfoPrint/bin/Debug/net10.0/InfoPrint.dll",
2828
"args": [],
2929
"cwd": "${workspaceFolder}",
3030
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console

‎ExtractionTool/ExtractionTool.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<CheckEolTargetFramework>false</CheckEolTargetFramework>
77
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
@@ -20,11 +20,11 @@
2020
<PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
2121
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
2222
</PropertyGroup>
23-
<PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
23+
<PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`)) OR $(TargetFramework.StartsWith(`net10`))">
2424
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
2525
</PropertyGroup>
2626
<PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
27-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
27+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
2828
</PropertyGroup>
2929

3030
<!-- These are needed for dealing with native Windows DLLs -->
@@ -48,9 +48,9 @@
4848
</ItemGroup>
4949

5050
<ItemGroup>
51-
<PackageReference Include="SabreTools.CommandLine" Version="[1.3.2]" />
52-
<PackageReference Include="SabreTools.IO" Version="[1.8.0]" />
53-
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
51+
<PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
52+
<PackageReference Include="SabreTools.IO" Version="[1.9.0]" />
53+
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
5454
</ItemGroup>
5555

5656
</Project>

‎ExtractionTool/Features/MainFeature.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ private void ExtractFile(string file)
294294
case XZP xzp:
295295
xzp.Extract(OutputPath, Debug);
296296
break;
297-
297+
298298
// ZSTD
299299
case ZSTD zstd:
300300
zstd.Extract(OutputPath, Debug);

‎InfoPrint/InfoPrint.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<CheckEolTargetFramework>false</CheckEolTargetFramework>
77
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
@@ -20,21 +20,21 @@
2020
<PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
2121
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
2222
</PropertyGroup>
23-
<PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
23+
<PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`)) OR $(TargetFramework.StartsWith(`net10`))">
2424
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
2525
</PropertyGroup>
2626
<PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
27-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
27+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
2828
</PropertyGroup>
2929

3030
<ItemGroup>
3131
<ProjectReference Include="..\SabreTools.Serialization\SabreTools.Serialization.csproj" />
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="SabreTools.CommandLine" Version="[1.3.2]" />
36-
<PackageReference Include="SabreTools.Hashing" Version="[1.5.1]" />
37-
<PackageReference Include="SabreTools.IO" Version="[1.8.0]" />
35+
<PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
36+
<PackageReference Include="SabreTools.Hashing" Version="[1.6.0]" />
37+
<PackageReference Include="SabreTools.IO" Version="[1.9.0]" />
3838
</ItemGroup>
3939

4040
</Project>

‎SabreTools.Serialization.Test/CrossModel/ArchiveDotOrgTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,4 +171,4 @@ private static void Validate(Data.Models.ArchiveDotOrg.File? file)
171171
Assert.Equal("XXXXXX", file.Width);
172172
}
173173
}
174-
}
174+
}

‎SabreTools.Serialization.Test/CrossModel/AttractModeTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ private static void Validate(Data.Models.AttractMode.Row? row)
109109
Assert.Equal("XXXXXX", row.FileIsAvailable);
110110
}
111111
}
112-
}
112+
}

‎SabreTools.Serialization.Test/CrossModel/ClrMameProTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,4 +498,4 @@ private static void Validate(Data.Models.ClrMamePro.Driver? driver)
498498
Assert.Equal("XXXXXX", driver.Blit);
499499
}
500500
}
501-
}
501+
}

‎SabreTools.Serialization.Test/CrossModel/DosCenterTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ private static void Validate(Data.Models.DosCenter.File? rom)
108108
Assert.Equal("XXXXXX", rom.Date);
109109
}
110110
}
111-
}
111+
}

0 commit comments

Comments
 (0)