Skip to content

Commit 0940f79

Browse files
rkoopmansrkoopmans
committed
Get rid of 6 in favour of 9
1 parent fdd0e59 commit 0940f79

File tree

3 files changed

+19
-22
lines changed

3 files changed

+19
-22
lines changed

‎.github/workflows/ci-cd.yml‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,16 @@ jobs:
2222
dotnet-target: "3.1.x"
2323
- os: windows-latest
2424
dotnet-target: "3.1.x"
25-
# Run 6.0.x and 8.0.x on all platforms
2625
- os: ubuntu-latest
27-
dotnet-target: "6.0.x"
26+
dotnet-target: "9.0.x"
2827
- os: ubuntu-latest
2928
dotnet-target: "8.0.x"
3029
- os: macOS-latest
31-
dotnet-target: "6.0.x"
30+
dotnet-target: "9.0.x"
3231
- os: macOS-latest
3332
dotnet-target: "8.0.x"
3433
- os: windows-latest
35-
dotnet-target: "6.0.x"
34+
dotnet-target: "9.0.x"
3635
- os: windows-latest
3736
dotnet-target: "8.0.x"
3837
steps:
@@ -44,16 +43,16 @@ jobs:
4443
with:
4544
dotnet-version: |
4645
3.1.x
47-
6.0.x
4846
8.0.x
47+
9.0.x
4948
if: ${{ !startsWith(matrix.os, 'macOS') }}
5049

5150
- name: Set up dotnet macOS ARM
5251
uses: actions/setup-dotnet@v4
5352
with:
5453
dotnet-version: |
55-
6.0.x
5654
8.0.x
55+
9.0.x
5756
if: startsWith(matrix.os, 'macOS')
5857

5958
- uses: actions/cache@v4
@@ -76,10 +75,10 @@ jobs:
7675
run: |
7776
if [ "${{ matrix.dotnet-target }}" == "3.1.x" ]; then
7877
dotnet test --configuration Release --no-build --verbosity normal --framework netcoreapp3.1 test/Tinify.Tests
79-
elif [ "${{ matrix.dotnet-target }}" == "6.0.x" ]; then
80-
dotnet test --configuration Release --no-build --verbosity normal --framework net6.0 test/Tinify.Tests
8178
elif [ "${{ matrix.dotnet-target }}" == "8.0.x" ]; then
8279
dotnet test --configuration Release --no-build --verbosity normal --framework net8.0 test/Tinify.Tests
80+
elif [ "${{ matrix.dotnet-target }}" == "9.0.x" ]; then
81+
dotnet test --configuration Release --no-build --verbosity normal --framework net9.0 test/Tinify.Tests
8382
else
8483
echo "Error: Unsupported .NET version ${{ matrix.dotnet-target }}" && exit 1
8584
fi
@@ -92,10 +91,10 @@ jobs:
9291
dotnet test --configuration Release --no-build --verbosity normal --framework netcoreapp3.1 test/Tinify.Tests
9392
} elseif ("${{ matrix.dotnet-target }}" -eq "5.0.x") {
9493
dotnet test --configuration Release --no-build --verbosity normal --framework net5.0 test/Tinify.Tests
95-
} elseif ("${{ matrix.dotnet-target }}" -eq "6.0.x") {
96-
dotnet test --configuration Release --no-build --verbosity normal --framework net6.0 test/Tinify.Tests
9794
} elseif ("${{ matrix.dotnet-target }}" -eq "8.0.x") {
9895
dotnet test --configuration Release --no-build --verbosity normal --framework net8.0 test/Tinify.Tests
96+
} elseif ("${{ matrix.dotnet-target }}" -eq "9.0.x") {
97+
dotnet test --configuration Release --no-build --verbosity normal --framework net9.0 test/Tinify.Tests
9998
} else {
10099
Write-Error "Unsupported .NET version $env:MATRIX_DOTNET_VERSION"
101100
exit 1
@@ -118,11 +117,11 @@ jobs:
118117
dotnet-version: "3.1.x"
119118
# Run 8.0.x on all platforms
120119
- os: ubuntu-latest
121-
dotnet-version: "8.0.x"
120+
dotnet-version: "9.0.x"
122121
- os: macOS-latest
123-
dotnet-version: "8.0.x"
122+
dotnet-version: "9.0.x"
124123
- os: windows-latest
125-
dotnet-version: "8.0.x"
124+
dotnet-version: "9.0.x"
126125
steps:
127126
- name: Checkout
128127
uses: actions/checkout@v4
@@ -154,8 +153,8 @@ jobs:
154153
run: |
155154
if [ ${{ matrix.dotnet-version }} == "3.1.x" ]; then
156155
dotnet test --configuration Release --no-build --verbosity normal --framework netcoreapp3.1 test/Tinify.Tests.Integration
157-
elif [ ${{ matrix.dotnet-version }} == "6.0.x" ]; then
158-
dotnet test --configuration Release --no-build --verbosity normal --framework net6.0 test/Tinify.Tests.Integration
156+
elif [ ${{ matrix.dotnet-version }} == "9.0.x" ]; then
157+
dotnet test --configuration Release --no-build --verbosity normal --framework net9.0 test/Tinify.Tests.Integration
159158
else
160159
dotnet test --configuration Release --no-build --verbosity normal --framework net8.0 test/Tinify.Tests.Integration
161160
fi
@@ -165,8 +164,8 @@ jobs:
165164
env:
166165
TINIFY_KEY: ${{ secrets.TINIFY_KEY }}
167166
run: |
168-
if ("${{ matrix.dotnet-version }}" -eq "6.0.x") {
169-
dotnet test --configuration Release --no-build --verbosity normal --framework net6.0 test/Tinify.Tests.Integration
167+
if ("${{ matrix.dotnet-version }}" -eq "9.0.x") {
168+
dotnet test --configuration Release --no-build --verbosity normal --framework net9.0 test/Tinify.Tests.Integration
170169
} elseif ("${{ matrix.dotnet-version }}" -eq "3.1.x") {
171170
dotnet test --configuration Release --no-build --verbosity normal --framework netcoreapp3.1 test/Tinify.Tests.Integration
172171
} elseif ("${{ matrix.dotnet-version }}" -eq "8.0.x") {
@@ -176,8 +175,6 @@ jobs:
176175
exit 1
177176
}
178177
179-
180-
181178
publish:
182179
if: |
183180
github.repository == 'tinify/tinify-net' &&
@@ -195,7 +192,7 @@ jobs:
195192
- name: Set up dotnet
196193
uses: actions/setup-dotnet@v4
197194
with:
198-
dotnet-version: 6.0.x
195+
dotnet-version: 9.0.x
199196

200197
- name: Check if properly tagged
201198
run: |

‎test/Tinify.Tests.Integration/Tinify.Tests.Integration.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;net472;net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net472;net48;netcoreapp3.1;net8.0;net9.0</TargetFrameworks>
55
<AssemblyName>Tinify.Tests.Integration</AssemblyName>
66
<PackageId>Tinify.Tests.Integration</PackageId>
77
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

‎test/Tinify.Tests/Tinify.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;net472;net48;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net472;net48;netcoreapp3.1;net8.0;net9.0</TargetFrameworks>
55
<AssemblyName>Tinify.Tests</AssemblyName>
66
<PackageId>Tinify.Tests</PackageId>
77
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

0 commit comments

Comments
 (0)