Skip to content

Commit 46de259

Browse files
authored
Merge pull request #727 from adamralph/net10-sdk
switch to .NET 10 SDK for build and test
2 parents b20a32f + 61bf52c commit 46de259

11 files changed

Lines changed: 380 additions & 249 deletions

File tree

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,7 @@ indent_style = tab
3434

3535
[build]
3636
end_of_line = lf
37+
38+
[packages.lock.json]
39+
end_of_line = unset
40+
insert_final_newline = unset

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
dotnet-version: |
3030
8.0.416
3131
9.0.308
32+
10.0.101
3233
- uses: actions/checkout@v4.2.2
3334
with:
3435
fetch-depth: 0

.github/workflows/infer-sharp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/setup-dotnet@v4.3.1
1313
with:
14-
dotnet-version: '9.0.308'
14+
dotnet-version: '10.0.101'
1515
- uses: actions/checkout@v4.2.2
1616
- run: dotnet build
1717
- run: ls -al

.github/workflows/lint.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ jobs:
2121
DEFAULT_BRANCH: main
2222
FILTER_REGEX_EXCLUDE: \bcodeql-analysis\.yml$|\bLICENSE$
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
VALIDATE_DOTNET_SLN_FORMAT_ANALYZERS: false
25+
VALIDATE_DOTNET_SLN_FORMAT_STYLE: false
26+
VALIDATE_DOTNET_SLN_FORMAT_WHITESPACE: false
2427
VALIDATE_JSON_PRETTIER: false
2528
VALIDATE_MARKDOWN_PRETTIER: false
2629
VALIDATE_SHELL_SHFMT: false

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/setup-dotnet@v4.3.1
1515
with:
16-
dotnet-version: 9.0.308
16+
dotnet-version: 10.0.101
1717
- uses: actions/checkout@v4.2.2
1818
- run: dotnet build --configuration Release --nologo
1919
- name: push

SimpleExecTester/SimpleExecTester.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<LangVersion>default</LangVersion>
66
<OutputType>Exe</OutputType>
77
<RollForward>major</RollForward>
8-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
8+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
99
</PropertyGroup>
1010

1111
</Project>
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
{
2-
"version": 1,
3-
"dependencies": {
4-
"net8.0": {},
5-
"net9.0": {}
6-
}
7-
}
1+
{
2+
"version": 1,
3+
"dependencies": {
4+
"net10.0": {},
5+
"net8.0": {},
6+
"net9.0": {}
7+
}
8+
}

SimpleExecTests/Infra/Tester.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,10 @@ internal static class Tester
1515
#if NET9_0 && RELEASE
1616
"../../../../SimpleExecTester/bin/Release/net9.0/SimpleExecTester.dll";
1717
#endif
18+
#if NET10_0 && DEBUG
19+
"../../../../SimpleExecTester/bin/Debug/net10.0/SimpleExecTester.dll";
20+
#endif
21+
#if NET10_0 && RELEASE
22+
"../../../../SimpleExecTester/bin/Release/net10.0/SimpleExecTester.dll";
23+
#endif
1824
}

SimpleExecTests/SimpleExecTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- https://github.com/dotnet/roslyn-analyzers/issues/7192 -->
66
<NoWarn>$(NoWarn);CA1515</NoWarn>
77
<RollForward>major</RollForward>
8-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
8+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
99
</PropertyGroup>
1010

1111
<ItemGroup>

0 commit comments

Comments
 (0)