From 08dba6b02ddb618ef2cd6ce7778d2fe25ba013f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Denuzi=C3=A8re?= Date: Wed, 18 Sep 2024 17:20:05 +0200 Subject: [PATCH 1/2] ci: use v4 of upload-artifact and download-artifact --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index baaebaa..7f7ecd2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: dotnet paket pack --symbols --version $VERSION nupkg - name: Upload Artifact if: matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: nupkg path: nupkg @@ -76,7 +76,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download Artifact - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: nupkg - name: Push to GitHub Feed @@ -96,7 +96,7 @@ jobs: with: dotnet-version: 6.0.100 - name: Download Artifact - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: nupkg - name: Push to GitHub Feed From febb7d05b664efd94638e747d63edbc69c83beaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Denuzi=C3=A8re?= Date: Wed, 18 Sep 2024 17:27:43 +0200 Subject: [PATCH 2/2] chore: build and test on .NET 8 --- .config/dotnet-tools.json | 2 +- .github/workflows/build.yml | 4 +- global.json | 2 +- paket.dependencies | 4 +- paket.lock | 70 ++++++++----------- .../Diffract.CSharp.Tests.csproj | 2 +- tests/Diffract.Tests/Diffract.Tests.fsproj | 4 +- 7 files changed, 39 insertions(+), 49 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 041b681..b9052bc 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "paket": { - "version": "6.2.1", + "version": "8.0.3", "commands": [ "paket" ] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f7ecd2..e2f980b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.100 + dotnet-version: 8.0.100 - name: Paket restore run: | dotnet tool restore @@ -94,7 +94,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.100 + dotnet-version: 8.0.100 - name: Download Artifact uses: actions/download-artifact@v4 with: diff --git a/global.json b/global.json index 84fbb44..1b0fd64 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.100", + "version": "8.0.100", "allowPrerelease": true, "rollForward": "major" } diff --git a/paket.dependencies b/paket.dependencies index 142e893..320afd9 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -10,10 +10,10 @@ nuget TypeShape >= 10.0.0 group test source https://api.nuget.org/v3/index.json storage: none -framework: net6.0 +framework: net8.0 nuget FsCheck nuget FsCheck.Xunit nuget Microsoft.NET.Test.Sdk nuget xunit -nuget xunit.runner.visualstudio \ No newline at end of file +nuget xunit.runner.visualstudio diff --git a/paket.lock b/paket.lock index e9b6219..0616356 100644 --- a/paket.lock +++ b/paket.lock @@ -14,50 +14,40 @@ NUGET GROUP test STORAGE: NONE -RESTRICTION: == net6.0 +RESTRICTION: == net8.0 NUGET remote: https://api.nuget.org/v3/index.json - FsCheck (2.16.3) + FsCheck (2.16.6) FSharp.Core (>= 4.2.3) - FsCheck.Xunit (2.16.3) - FsCheck (2.16.3) + FsCheck.Xunit (2.16.6) + FsCheck (2.16.6) xunit.extensibility.execution (>= 2.2 < 3.0) - FSharp.Core (6.0.1) - Microsoft.CodeCoverage (17.0) - Microsoft.NET.Test.Sdk (17.0) - Microsoft.CodeCoverage (>= 17.0) - Microsoft.TestPlatform.TestHost (>= 17.0) - Microsoft.NETCore.Platforms (6.0) - Microsoft.TestPlatform.ObjectModel (17.0) - NuGet.Frameworks (>= 5.0) + FSharp.Core (8.0.400) + Microsoft.CodeCoverage (17.11.1) + Microsoft.NET.Test.Sdk (17.11.1) + Microsoft.CodeCoverage (>= 17.11.1) + Microsoft.TestPlatform.TestHost (>= 17.11.1) + Microsoft.TestPlatform.ObjectModel (17.11.1) System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.0) - Microsoft.TestPlatform.ObjectModel (>= 17.0) - Newtonsoft.Json (>= 9.0.1) - NETStandard.Library (2.0.3) - Microsoft.NETCore.Platforms (>= 1.1) - Newtonsoft.Json (13.0.1) - NuGet.Frameworks (6.0) - System.Collections.Immutable (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Reflection.Metadata (6.0) - System.Collections.Immutable (>= 6.0) - System.Runtime.CompilerServices.Unsafe (6.0) - xunit (2.4.1) - xunit.analyzers (>= 0.10) - xunit.assert (2.4.1) - xunit.core (2.4.1) + Microsoft.TestPlatform.TestHost (17.11.1) + Microsoft.TestPlatform.ObjectModel (>= 17.11.1) + Newtonsoft.Json (>= 13.0.1) + Newtonsoft.Json (13.0.3) + System.Collections.Immutable (8.0) + System.Reflection.Metadata (8.0) + System.Collections.Immutable (>= 8.0) + xunit (2.9) + xunit.analyzers (>= 1.15) + xunit.assert (>= 2.9) + xunit.core (2.9) xunit.abstractions (2.0.3) - xunit.analyzers (0.10) - xunit.assert (2.4.1) - NETStandard.Library (>= 1.6.1) - xunit.core (2.4.1) - xunit.extensibility.core (2.4.1) - xunit.extensibility.execution (2.4.1) - xunit.extensibility.core (2.4.1) - NETStandard.Library (>= 1.6.1) + xunit.analyzers (1.16) + xunit.assert (2.9) + xunit.core (2.9) + xunit.extensibility.core (2.9) + xunit.extensibility.execution (2.9) + xunit.extensibility.core (2.9) xunit.abstractions (>= 2.0.3) - xunit.extensibility.execution (2.4.1) - NETStandard.Library (>= 1.6.1) - xunit.extensibility.core (2.4.1) - xunit.runner.visualstudio (2.4.3) + xunit.extensibility.execution (2.9) + xunit.extensibility.core (2.9) + xunit.runner.visualstudio (2.8.2) diff --git a/tests/Diffract.CSharp.Tests/Diffract.CSharp.Tests.csproj b/tests/Diffract.CSharp.Tests/Diffract.CSharp.Tests.csproj index 5f49746..f4cdf7f 100644 --- a/tests/Diffract.CSharp.Tests/Diffract.CSharp.Tests.csproj +++ b/tests/Diffract.CSharp.Tests/Diffract.CSharp.Tests.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 false DEdge.Diffract.CSharp.Tests diff --git a/tests/Diffract.Tests/Diffract.Tests.fsproj b/tests/Diffract.Tests/Diffract.Tests.fsproj index 4b46a15..440c714 100644 --- a/tests/Diffract.Tests/Diffract.Tests.fsproj +++ b/tests/Diffract.Tests/Diffract.Tests.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false false @@ -14,4 +14,4 @@ - \ No newline at end of file +