Skip to content

Commit 896632f

Browse files
committed
Switch to .NET 8
.NET 6 is no longer supported. We thus need to drop also Windows ARM32 support. Signed-off-by: andreas hilti <[email protected]>
1 parent f934c99 commit 896632f

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

.github/workflows/dotnetcore.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/[email protected]
2121
- uses: actions/[email protected]
2222
with:
23-
dotnet-version: '6.0'
23+
dotnet-version: '8.0'
2424

2525
- name: Build
2626
run: dotnet build /WarnAsError
@@ -31,20 +31,20 @@ jobs:
3131
runs-on: ubuntu-20.04
3232
strategy:
3333
matrix:
34-
runtime: [linux-x64, linux-musl-x64, linux-arm, linux-arm64, win-x64, win-x86, win-arm, win-arm64, osx-x64, osx-arm64]
34+
runtime: [linux-x64, linux-musl-x64, linux-arm, linux-arm64, win-x64, win-x86, win-arm64, osx-x64, osx-arm64]
3535
timeout-minutes: 30
3636
steps:
3737
- uses: actions/[email protected]
3838
- uses: actions/[email protected]
3939
with:
40-
dotnet-version: '6.0'
40+
dotnet-version: '8.0'
4141

4242
- name: Build
4343
run: dotnet build src/cyclonedx/cyclonedx.csproj -r ${{ matrix.runtime }}
4444

4545
# Fail if there are any failed tests
4646
#
47-
# We support .NET 6.0 on Windows, Mac and Linux.
47+
# We support .NET 8.0 on Windows, Mac and Linux.
4848
#
4949
# To check for failing tests locally run `dotnet test`.
5050
test:
@@ -61,7 +61,7 @@ jobs:
6161
- uses: actions/[email protected]
6262
- uses: actions/[email protected]
6363
with:
64-
dotnet-version: '6.0'
64+
dotnet-version: '8.0'
6565

6666
- name: SnapshooterHotfixSymlinkLinux
6767
if: matrix.os == 'ubuntu-latest'
@@ -75,4 +75,4 @@ jobs:
7575
- name: Tests
7676
run: |
7777
dotnet restore
78-
dotnet test --framework net6.0
78+
dotnet test --framework net8.0

.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- uses: actions/[email protected]
3838
- uses: actions/[email protected]
3939
with:
40-
dotnet-version: '6.0'
40+
dotnet-version: '8.0'
4141
- name: SnapshooterHotfixSymlinkLinux
4242
run: sudo ln -s "$GITHUB_WORKSPACE" /_
4343
shell: bash
@@ -54,7 +54,7 @@ jobs:
5454
REPO=cyclonedx/cyclonedx-cli
5555
dotnet build --configuration Release
5656
mkdir bin
57-
for runtime in linux-x64 linux-musl-x64 linux-arm linux-arm64 win-x64 win-x86 win-arm win-arm64 osx-x64
57+
for runtime in linux-x64 linux-musl-x64 linux-arm linux-arm64 win-x64 win-x86 win-arm64 osx-x64
5858
do
5959
dotnet publish src/cyclonedx/cyclonedx.csproj -r $runtime --configuration Release /p:Version=$VERSION --self-contained true /p:PublishSingleFile=true /p:IncludeNativeLibrariesInSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true --output bin/$runtime
6060
done
@@ -181,7 +181,7 @@ jobs:
181181
- uses: actions/[email protected]
182182
- uses: actions/[email protected]
183183
with:
184-
dotnet-version: '6.0'
184+
dotnet-version: '8.0'
185185

186186
- name: Create binary
187187
run: |

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ Officially supported builds are available for these platforms:
333333
Community supported builds are available for these platforms:
334334

335335
- Windows x86 (win-x86)
336-
- Windows ARM (win-arm)
337336
- Windows ARM x64 (win-arm64)
338337
- Linux ARM (linux-arm)
339338
- Linux ARM x64 (linux-arm64)
@@ -388,7 +387,7 @@ Permission to modify and redistribute is granted under the terms of the Apache 2
388387
Pull requests are welcome. But please read the
389388
[CycloneDX contributing guidelines](https://github.com/CycloneDX/.github/blob/master/CONTRIBUTING.md) first.
390389

391-
To build and test the solution locally you should have .NET 6
390+
To build and test the solution locally you should have .NET 8
392391
installed. Standard commands like `dotnet build` and `dotnet test` work.
393392

394393
It is generally expected that pull requests will include relevant tests.

src/cyclonedx/cyclonedx.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<!-- <PublishTrimmed>true</PublishTrimmed>-->
77
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
8-
<RuntimeIdentifiers>linux-x64;linux-musl-x64;linux-arm;linux-arm64;win-x64;win-x86;win-arm;win-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
8+
<RuntimeIdentifiers>linux-x64;linux-musl-x64;linux-arm;linux-arm64;win-x64;win-x86;win-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
99
</PropertyGroup>
1010

1111
<PropertyGroup>

tests/cyclonedx.tests/cyclonedx.tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<!-- <AnalysisMode>AllEnabledByDefault</AnalysisMode> -->
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

0 commit comments

Comments
 (0)