From 140639babea0714ea92988320912d32f2e1f6813 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 4 Sep 2024 14:43:01 +0200 Subject: [PATCH] Update packages and workflows --- .config/dotnet-tools.json | 2 +- .github/workflows/publish.yml | 50 +++++++++++------------ global.json | 7 ++++ paket.dependencies | 8 ++-- paket.lock | 77 ++++++++++++++++++----------------- src/Compiler/Compiler.fsproj | 3 +- 6 files changed, 79 insertions(+), 68 deletions(-) create mode 100644 global.json diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d13d6cd..6b1b939 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "paket": { - "version": "7.0.0-alpha003", + "version": "8.0.0", "commands": [ "paket" ] diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2a29742..5060924 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,15 +6,15 @@ on: jobs: mac: name: OSX (x64) - runs-on: macos-11 + runs-on: macos-12 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build Native Libraries run: ./buildnative.sh x86_64 - name: Install Dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: - dotnet-version: '6.0.100' + global-json-file: global.json - name: Restore Tools run: dotnet tool restore - name: Restore @@ -22,33 +22,33 @@ jobs: - name: Test run: dotnet run --project src/Compiler/Compiler.fsproj - name: Upload OSX native libs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: osx path: libs/Native/ macm1: name: OSX (arm64) - runs-on: macos-11 + runs-on: macos-12 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build Native Libraries run: ./buildnative.sh arm64 - name: Upload OSX native libs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: osxm1 path: libs/Native/ linux: name: Linux (x64) - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build Native Libraries run: ./buildnative.sh - name: Install Dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: - dotnet-version: '6.0.100' + global-json-file: global.json - name: Restore Tools run: dotnet tool restore - name: Restore @@ -56,7 +56,7 @@ jobs: - name: Test run: dotnet run --project src/Compiler/Compiler.fsproj - name: Upload Linux native libs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: linux path: libs/Native/ @@ -64,13 +64,13 @@ jobs: name: Windows (x64) runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build Native Libraries run: .\buildnative.cmd - name: Install Dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: - dotnet-version: '6.0.100' + global-json-file: global.json - name: Restore Tools run: dotnet tool restore - name: Restore @@ -78,7 +78,7 @@ jobs: - name: Test run: dotnet run --project src\Compiler\Compiler.fsproj - name: Upload Windows native libs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: windows path: libs/Native/ @@ -91,31 +91,31 @@ jobs: - macm1 runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Download OSX dependencies (x64) - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: osx path: libs/Native/ - name: Download OSX dependencies (arm64) - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: osxm1 path: libs/Native/ - name: Download Linux dependencies - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: linux path: libs/Native/ - name: Download Windows dependencies - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: windows path: libs/Native/ - name: Install Dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: - dotnet-version: '6.0.100' + global-json-file: global.json - name: Restore Tools run: dotnet tool restore - name: Restore @@ -125,7 +125,7 @@ jobs: - name: Pack run: dotnet pack src\GLSLang.sln -c Release -o bin\pack - name: Upload Package - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: packages path: bin\pack diff --git a/global.json b/global.json new file mode 100644 index 0000000..19f8dc2 --- /dev/null +++ b/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "8.0.0", + "rollForward": "latestFeature", + "allowPrerelease": false + } +} \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index bd39c96..d4bdc64 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,7 +1,7 @@ -framework: netstandard2.0, net6.0 +framework: auto-detect source https://api.nuget.org/v3/index.json storage: none -nuget FSharp.Core >= 5.0.0 lowest_matching: true -nuget Aardvark.Build ~> 1.0.0-prerelease0010 -nuget Aardvark.Base ~> 5.1.25 +nuget FSharp.Core >= 8.0.0 lowest_matching: true +nuget Aardvark.Build ~> 1.0.25 +nuget Aardvark.Base ~> 5.3.0 diff --git a/paket.lock b/paket.lock index e0a3de6..dd8b184 100644 --- a/paket.lock +++ b/paket.lock @@ -1,40 +1,43 @@ STORAGE: NONE -RESTRICTION: || (== net6.0) (== netstandard2.0) +RESTRICTION: || (== net8.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json - Aardvark.Base (5.1.25) - Aardvark.Base.Telemetry (5.1.25) - System.Collections.Immutable (>= 1.7) - System.Reflection.Metadata (>= 1.8) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Text.Json (>= 4.7.2) - Aardvark.Base.Telemetry (5.1.25) - Aardvark.Build (1.0.0-prerelease0010) - FSharp.Core (5.0) - Microsoft.Bcl.AsyncInterfaces (6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) - System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Collections.Immutable (6.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Memory (4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Reflection.Metadata (6.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Collections.Immutable (>= 6.0) - System.Runtime.CompilerServices.Unsafe (6.0) - System.Text.Encodings.Web (6.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.1) - Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0) + Aardvark.Base (5.3.3) + Aardvark.Base.Telemetry (5.3.3) + SingleFileExtractor.Core (>= 2.2.1 < 2.3) + System.Collections.Immutable (>= 8.0) + System.Reflection.Metadata (>= 8.0) + System.Text.Json (>= 8.0.4) + Aardvark.Base.Telemetry (5.3.3) + Aardvark.Build (1.0.25) + FSharp.Core (8.0.100) + Microsoft.Bcl.AsyncInterfaces (8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) + SingleFileExtractor.Core (2.2.1) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) + System.Buffers (4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Collections.Immutable (8.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) + System.Memory (4.5.5) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net8.0) (< netcoreapp2.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Numerics.Vectors (4.5) - restriction: || (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (== netstandard2.0) + System.Reflection.Metadata (8.0) + System.Collections.Immutable (>= 8.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) + System.Text.Encodings.Web (8.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) + System.Text.Json (8.0.4) + Microsoft.Bcl.AsyncInterfaces (>= 8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) + System.Text.Encodings.Web (>= 8.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.0)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= wp8)) (== netstandard2.0) diff --git a/src/Compiler/Compiler.fsproj b/src/Compiler/Compiler.fsproj index c120d57..61094dd 100644 --- a/src/Compiler/Compiler.fsproj +++ b/src/Compiler/Compiler.fsproj @@ -2,9 +2,10 @@ Exe - net6.0 + net8.0 true false + true ..\..\bin\Debug\