Skip to content

Commit e8eb6ba

Browse files
committed
Add .NET10.0 as TFM
1 parent fd8331f commit e8eb6ba

3 files changed

Lines changed: 29 additions & 4 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,31 @@ jobs:
6565
isARM:
6666
- ${{ contains(github.event.pull_request.labels.*.name, 'arch:arm32') || contains(github.event.pull_request.labels.*.name, 'arch:arm64') }}
6767
options:
68+
- os: ubuntu-latest
69+
framework: net10.0
70+
sdk: 10.0.x
71+
sdk-preview: true
72+
runtime: -x64
73+
codecov: false
74+
- os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
75+
framework: net10.0
76+
sdk: 10.0.x
77+
sdk-preview: true
78+
runtime: -x64
79+
codecov: false
80+
- os: windows-latest
81+
framework: net10.0
82+
sdk: 10.0.x
83+
sdk-preview: true
84+
runtime: -x64
85+
codecov: false
86+
- os: buildjet-4vcpu-ubuntu-2204-arm
87+
framework: net10.0
88+
sdk: 10.0.x
89+
sdk-preview: true
90+
runtime: -x64
91+
codecov: false
92+
6893
- os: ubuntu-latest
6994
framework: net9.0
7095
sdk: 9.0.x
@@ -163,14 +188,14 @@ jobs:
163188
uses: actions/setup-dotnet@v4
164189
with:
165190
dotnet-version: |
166-
8.0.x
191+
${{matrix.options.sdk}}
167192
168193
- name: DotNet Setup Preview
169194
if: ${{ matrix.options.sdk-preview == true }}
170195
uses: actions/setup-dotnet@v4
171196
with:
172197
dotnet-version: |
173-
9.0.x
198+
${{matrix.options.sdk}}
174199
175200
- name: DotNet Build
176201
if: ${{ matrix.options.sdk-preview != true }}

src/ImageSharp/ImageSharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Choose>
3131
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
3232
<PropertyGroup>
33-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
33+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
3434
</PropertyGroup>
3535
</When>
3636
<Otherwise>

tests/ImageSharp.Tests/ImageSharp.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Choose>
1313
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
1414
<PropertyGroup>
15-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
15+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
1616
</PropertyGroup>
1717
</When>
1818
<Otherwise>

0 commit comments

Comments
 (0)