Skip to content

Commit 4b1749c

Browse files
wokketwokket
authored
feat #676: Add support for net10, and remove support for unsupported net6/net7 (#683)
1 parent 087331d commit 4b1749c

5 files changed

Lines changed: 40 additions & 51 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
#is-release: 'true'
2121

2222
steps:
23-
- name: Setup .NET 9
23+
- name: Setup .NET 10
2424
uses: actions/setup-dotnet@v5
2525
with:
26-
dotnet-version: 9.0.x
26+
dotnet-version: 10.0.x
2727
- name: Checkout
2828
uses: actions/checkout@v5
2929
with:
@@ -46,14 +46,13 @@ jobs:
4646
contents: write
4747
steps:
4848
- uses: actions/checkout@v5
49-
- name: Setup .NET 9
49+
- name: Setup .NET 10
5050
uses: actions/setup-dotnet@v5
5151
with:
52-
dotnet-version: 9.0.x
52+
dotnet-version: 10.0.x
5353
- name: Restore dependencies
5454
run: dotnet restore
5555
- name: Build
56-
#run: dotnet pack ./grate/grate.csproj -c release -p:PackAsTool=true -p:PackageOutputPath=/tmp/grate/nupkg
5756
run: dotnet pack ./src/grate/grate.csproj -p:SelfContained=false -p:PackAsTool=true -p:PackageOutputPath=/tmp/grate/nupkg
5857
env:
5958
VERSION: ${{ needs.set-version-number.outputs.nuGetVersion }}
@@ -98,14 +97,13 @@ jobs:
9897
steps:
9998
- uses: actions/checkout@v5
10099

101-
- name: Setup .NET 9 and earlier
100+
- name: Setup .NET 10 and earlier
102101
uses: actions/setup-dotnet@v5
103102
with:
104103
dotnet-version: |
105-
6.0.x
106-
7.0.x
107104
8.0.x
108105
9.0.x
106+
10.0.x
109107
110108
- name: Restore dependencies
111109
run: dotnet restore
@@ -142,16 +140,16 @@ jobs:
142140
contents: write
143141
steps:
144142
- uses: actions/checkout@v5
145-
- name: Setup .NET 9
143+
- name: Setup .NET 10
146144
uses: actions/setup-dotnet@v5
147145
with:
148-
dotnet-version: 9.0.x
146+
dotnet-version: 10.0.x
149147

150148
- name: Publish self-contained ${{ matrix.arch }}
151149
run: dotnet publish ./src/grate/grate.csproj -r ${{ matrix.arch }} -c release --self-contained -p:SelfContained=true -o ./publish/${{ matrix.arch }}/self-contained
152150
env:
153151
VERSION: ${{ needs.set-version-number.outputs.nuGetVersion }}
154-
TargetFramework: net9.0
152+
TargetFramework: net10.0
155153

156154

157155
- name: Upload self-contained ${{ matrix.arch }}
@@ -190,16 +188,16 @@ jobs:
190188
contents: write
191189
steps:
192190
- uses: actions/checkout@v5
193-
- name: Setup .NET 9
191+
- name: Setup .NET 10
194192
uses: actions/setup-dotnet@v5
195193
with:
196-
dotnet-version: 9.0.x
194+
dotnet-version: 10.0.x
197195

198196
- name: Publish self-contained ${{ matrix.arch }}
199197
run: dotnet publish ./src/grate/grate.csproj -r ${{ matrix.arch }} -c release --self-contained -p:SelfContained=true -o ./publish/${{ matrix.arch }}/self-contained
200198
env:
201199
VERSION: ${{ needs.set-version-number.outputs.nuGetVersion }}
202-
TargetFramework: net9.0
200+
TargetFramework: net10.0
203201

204202
- name: Upload self-contained ${{ matrix.arch }}
205203
#if: ${{ needs.set-version-number.outputs.is-release == 'true' }}
@@ -381,14 +379,13 @@ jobs:
381379

382380
steps:
383381
- uses: actions/checkout@v5
384-
- name: Setup .NET 9 and earlier
382+
- name: Setup .NET 10 and earlier
385383
uses: actions/setup-dotnet@v5
386384
with:
387385
dotnet-version: |
388-
6.0.x
389-
7.0.x
390386
8.0.x
391387
9.0.x
388+
10.0.x
392389
- name: Test
393390
run: >
394391
dotnet test

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v5
24-
- name: Setup .NET 9 and earlier
24+
- name: Setup .NET 10 and earlier
2525
uses: actions/setup-dotnet@v5
2626
with:
2727
dotnet-version: |
28-
6.0.x
29-
7.0.x
3028
8.0.x
3129
9.0.x
30+
10.0.x
3231
- name: Restore dependencies
3332
run: |
3433
dotnet restore -r linux-x64 grate.sln
@@ -48,14 +47,13 @@ jobs:
4847
- name: Checkout repository
4948
uses: actions/checkout@v5
5049

51-
- name: Setup .NET 9 and earlier
50+
- name: Setup .NET 10 and earlier
5251
uses: actions/setup-dotnet@v5
5352
with:
5453
dotnet-version: |
55-
6.0.x
56-
7.0.x
5754
8.0.x
5855
9.0.x
56+
10.0.x
5957
# Initializes the CodeQL tools for scanning.
6058
- name: Initialize CodeQL
6159
uses: github/codeql-action/init@v4
@@ -80,14 +78,13 @@ jobs:
8078

8179
steps:
8280
- uses: actions/checkout@v5
83-
- name: Setup .NET 9
81+
- name: Setup .NET 10 and earlier
8482
uses: actions/setup-dotnet@v5
8583
with:
8684
dotnet-version: |
87-
6.0.x
88-
7.0.x
8985
8.0.x
9086
9.0.x
87+
10.0.x
9188
- name: Test
9289
run: |
9390
dotnet test \

‎.github/workflows/integration-tests.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
#is-release: 'true'
3131

3232
steps:
33-
- name: Setup .NET 9
33+
- name: Setup .NET 10
3434
uses: actions/setup-dotnet@v5
3535
with:
36-
dotnet-version: 9.0.x
36+
dotnet-version: 10.0.x
3737
- name: Checkout
3838
uses: actions/checkout@v5
3939
with:
@@ -64,10 +64,10 @@ jobs:
6464
# - osx-x64
6565
steps:
6666
- uses: actions/checkout@v5
67-
- name: Setup .NET 9
67+
- name: Setup .NET 10
6868
uses: actions/setup-dotnet@v5
6969
with:
70-
dotnet-version: 9.0.x
70+
dotnet-version: 10.0.x
7171

7272
- name: Publish self-contained ${{ matrix.arch }}
7373
run: dotnet publish -f net9.0 ./src/grate/grate.csproj -r ${{ matrix.arch }} -c release --self-contained -p:SelfContained=true -o ./publish/${{ matrix.arch }}/self-contained
@@ -98,10 +98,10 @@ jobs:
9898

9999
steps:
100100
- uses: actions/checkout@v5
101-
- name: Setup .NET 9
101+
- name: Setup .NET 10
102102
uses: actions/setup-dotnet@v5
103103
with:
104-
dotnet-version: 9.0.x
104+
dotnet-version: 10.0.x
105105

106106
- name: Publish self-contained ${{ matrix.arch }}
107107
run: dotnet publish -f net9.0 ./src/grate/grate.csproj -r ${{ matrix.arch }} -c release --self-contained -p:SelfContained=true -o ./publish/${{ matrix.arch }}/self-contained
@@ -127,14 +127,13 @@ jobs:
127127
#- osx-x64
128128
steps:
129129
- uses: actions/checkout@v5
130-
- name: Setup .NET 9
130+
- name: Setup .NET 10 and earlier
131131
uses: actions/setup-dotnet@v5
132132
with:
133133
dotnet-version: |
134-
6.0.x
135-
7.0.x
136134
8.0.x
137135
9.0.x
136+
10.0.x
138137
139138
- name: Build Test DLLs ${{ matrix.arch }}
140139
run: |
@@ -162,17 +161,18 @@ jobs:
162161

163162
steps:
164163
- uses: actions/checkout@v5
165-
- name: Setup .NET 8 & 9
164+
- name: Setup .NET 10 and earlier
166165
uses: actions/setup-dotnet@v5
167166
with:
168167
dotnet-version: |
169168
8.0.x
170169
9.0.x
170+
10.0.x
171171
172172
- name: Build Test DLLs ${{ matrix.arch }}
173173
run: |
174174
dotnet restore -r ${{ matrix.arch }} unittests/UnitTests.slnf
175-
dotnet publish -f net9.0 -r ${{ matrix.arch }} -c release --no-restore ./unittests/UnitTests.slnf -o ./integration-tests/${{ matrix.arch }}
175+
dotnet publish -f net10.0 -r ${{ matrix.arch }} -c release --no-restore ./unittests/UnitTests.slnf -o ./integration-tests/${{ matrix.arch }}
176176
177177
env:
178178
VERSION: ${{ needs.set-version-number.outputs.nuGetVersion }}
@@ -340,10 +340,10 @@ jobs:
340340
name: integration-tests-linux-x64-${{ needs.set-version-number.outputs.nuGetVersion }}
341341
path: integration-tests/linux-x64
342342

343-
- name: Setup .NET 9
343+
- name: Setup .NET 10
344344
uses: actions/setup-dotnet@v5
345345
with:
346-
dotnet-version: 9.0.x
346+
dotnet-version: 10.0.x
347347

348348
- name: chmod u+x
349349
run: chmod u+x $GrateExecutablePath
@@ -451,10 +451,10 @@ jobs:
451451
name: integration-tests-${{ matrix.os.arch }}-${{ needs.set-version-number.outputs.nuGetVersion }}
452452
path: integration-tests/${{ matrix.os.arch }}
453453

454-
- name: Setup .NET 9
454+
- name: Setup .NET 10
455455
uses: actions/setup-dotnet@v5
456456
with:
457-
dotnet-version: 9.0.x
457+
dotnet-version: 10.0.x
458458

459459
- name: chmod u+x
460460
run: chmod u+x $GrateExecutablePath

‎Directory.Build.props‎

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

2222

2323
<PropertyGroup>
24-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
25-
</PropertyGroup>
26-
27-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">
28-
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
29-
<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
24+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
3025
</PropertyGroup>
3126

3227
<PropertyGroup>
@@ -38,7 +33,7 @@
3833
grate - sql for the 20s
3934

4035
grate is a no-code, low-fi database migration tool, inspired heavily by RoundhousE. It's written from the ground
41-
up using modern .NET 6/7/8/9. </Description>
36+
up using modern .NET 8/9/10. </Description>
4237
<Copyright>© Erik A. Brandstadmoen. All rights reserved.</Copyright>
4338
<PackageProjectUrl>https://erikbra.github.io/grate/</PackageProjectUrl>
4439
<RepositoryUrl>https://github.com/erikbra/grate</RepositoryUrl>

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
4-
"allowPrerelease": false,
5-
"rollForward": "major"
3+
"version": "10.0.0",
4+
"rollForward": "major",
5+
"allowPrerelease": false
66
}
77
}

0 commit comments

Comments
 (0)