Skip to content

Commit

Permalink
.NET: update minimal supported versions to .NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
jedisct1 committed Apr 29, 2024
1 parent b6ed54f commit 9bbd86c
Showing 1 changed file with 37 additions and 38 deletions.
75 changes: 37 additions & 38 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
run: buildbase.bat ..\vs2022\libsodium.sln 17
working-directory: builds/msvc/build/
shell: cmd
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-win-x64
path: bin/x64/Release/v143/dynamic/libsodium.dll
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-win-x86
path: bin/Win32/Release/v143/dynamic/libsodium.dll
Expand All @@ -36,7 +36,7 @@ jobs:
- name: build-win-arm64
run: |
rm -fr zig-out zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=aarch64-windows; ls -lR zig-out
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-win-arm64
path: zig-out/lib/libsodium.dll
Expand All @@ -46,7 +46,7 @@ jobs:
rm -fr zig-out zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-gnu.2.17
- name: tests
run: cd zig-out/bin && ./run.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-linux-x64
path: zig-out/lib/libsodium.so
Expand All @@ -71,7 +71,7 @@ jobs:
- name: tests
run: |
cd zig-out/bin && env LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib ./run.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-linux-arm
path: zig-out/lib/libsodium.so
Expand All @@ -82,31 +82,31 @@ jobs:
- name: tests
run: |
cd zig-out/bin && env LD_LIBRARY_PATH=/usr/aarch64-linux-gnu/lib ./run.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-linux-arm64
path: zig-out/lib/libsodium.so

- name: build-linux-musl-x64
run: |
rm -fr zig-out zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-musl
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-linux-musl-x64
path: zig-out/lib/libsodium.so

- name: build-linux-musl-arm
run: |
rm -fr zig-out zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=arm-linux-musleabihf
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-linux-musl-arm
path: zig-out/lib/libsodium.so

- name: build-linux-musl-arm64
run: |
rm -fr zig-out zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=aarch64-linux-musl
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-linux-musl-arm64
path: zig-out/lib/libsodium.so
Expand All @@ -119,19 +119,19 @@ jobs:
run: ./configure
- name: build-xcframework
run: env LIBSODIUM_FULL_BUILD=1 LIBSODIUM_SKIP_SIMULATORS=1 dist-build/apple-xcframework.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-macos
path: libsodium-apple/macos/lib/libsodium.dylib
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-ios
path: libsodium-apple/ios/lib/libsodium.a
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-tvos
path: libsodium-apple/tvos/lib/libsodium.a
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-maccatalyst
path: libsodium-apple/catalyst/lib/libsodium.a
Expand All @@ -142,72 +142,72 @@ jobs:
- build-apple
- build-others
container:
image: mcr.microsoft.com/dotnet/sdk:6.0
image: mcr.microsoft.com/dotnet/sdk:8.0
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 1
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-win-x64
path: .libsodium-pack/runtimes/win-x64/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-win-x86
path: .libsodium-pack/runtimes/win-x86/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-win-arm64
path: .libsodium-pack/runtimes/win-arm64/native/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-linux-x64
path: .libsodium-pack/runtimes/linux-x64/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-linux-arm64
path: .libsodium-pack/runtimes/linux-arm64/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-linux-arm
path: .libsodium-pack/runtimes/linux-arm/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-linux-musl-x64
path: .libsodium-pack/runtimes/linux-musl-x64/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-linux-musl-arm
path: .libsodium-pack/runtimes/linux-musl-arm/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-linux-musl-arm64
path: .libsodium-pack/runtimes/linux-musl-arm64/native/

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-macos
path: .libsodium-pack/runtimes/osx-x64/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-macos
path: .libsodium-pack/runtimes/osx-arm64/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-ios
path: .libsodium-pack/runtimes/ios-arm64/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-tvos
path: .libsodium-pack/runtimes/tvos-arm64/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-maccatalyst
path: .libsodium-pack/runtimes/maccatalyst-x64/native/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-maccatalyst
path: .libsodium-pack/runtimes/maccatalyst-arm64/native/
Expand All @@ -216,7 +216,7 @@ jobs:
run: cp AUTHORS ChangeLog LICENSE packaging/dotnet-core/libsodium.pkgproj .libsodium-pack/
- name: Create NuGet package
run: dotnet pack -c Release .libsodium-pack/libsodium.pkgproj
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: nuget-package
path: .libsodium-pack/bin/Release/*.nupkg
Expand All @@ -226,14 +226,14 @@ jobs:
needs:
- pack
container:
image: mcr.microsoft.com/dotnet/sdk:6.0
image: mcr.microsoft.com/dotnet/sdk:8.0
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 1
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: nuget-package
path: .libsodium-pack/
Expand All @@ -258,7 +258,7 @@ jobs:
mv .libsodium-test/bin/Release/net6.0/linux-arm/publish .libsodium-builds/linux-arm
mv .libsodium-test/bin/Release/net6.0/linux-arm64/publish .libsodium-builds/linux-arm64
mv .libsodium-test/bin/Release/net6.0/linux-x64/publish .libsodium-builds/linux-x64
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: test-builds
path: .libsodium-builds/*
Expand All @@ -269,14 +269,13 @@ jobs:
- build-test-binaries
strategy:
matrix:
# CentOS 7 and Debian 10 use an older GCC version; make sure we can run on those platforms.
arch: [ 'centos:7', 'debian:10' ]
arch: [ 'centos:8', 'debian:11' ]
container:
image: ${{ matrix.arch }}
env:
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 1
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: test-builds
path: .libsodium-builds/
Expand All @@ -286,7 +285,7 @@ jobs:
.libsodium-builds/linux-x64/Tests
run-test-binaries-cross-plat:
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
needs:
- build-test-binaries
env:
Expand Down Expand Up @@ -321,7 +320,7 @@ jobs:
sudo ln -s /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.* /lib
sudo ln -s /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.* /lib
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: test-builds
path: .libsodium-builds/
Expand Down

0 comments on commit 9bbd86c

Please sign in to comment.