From ada44f85ebaccb192f9aa0d525e15137aae005ae Mon Sep 17 00:00:00 2001 From: Jonas Nyrup Date: Thu, 19 Dec 2024 13:52:11 +0100 Subject: [PATCH 1/7] bump checkout from v3 to v4 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08caf26..a082a5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: DOTNET_NOLOGO: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -55,7 +55,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 From 547881fb13baa369014cfe873286252680d52ca0 Mon Sep 17 00:00:00 2001 From: Jonas Nyrup Date: Thu, 19 Dec 2024 13:52:35 +0100 Subject: [PATCH 2/7] bump upload-artifact from v3 to v4 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a082a5c..c0755ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: file: TestResults/reports/lcov.info - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ./Artifacts/* only-unit-tests: From 614c983a0dd28a4ccdbab6d9c18407edbb6f0837 Mon Sep 17 00:00:00 2001 From: Jonas Nyrup Date: Thu, 19 Dec 2024 13:53:13 +0100 Subject: [PATCH 3/7] bump setup-dotnet from v3 to v4 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0755ec..cce1c0a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: fetch-depth: 0 - name: Setup .NET SDKs - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | 2.1.x @@ -60,7 +60,7 @@ jobs: fetch-depth: 0 - name: Setup .NET SDKs - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | 2.1.x From 1b214583544d10f02615ce2d508e08fb938917a6 Mon Sep 17 00:00:00 2001 From: Jonas Nyrup Date: Thu, 19 Dec 2024 13:54:59 +0100 Subject: [PATCH 4/7] Use "latest" ubuntu and macos --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cce1c0a..428de66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: strategy: matrix: - os: [ubuntu-22.04, macos-12] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} From a1cc3b4ed64c3bd3554b3f9b78ec9e0cab7fcae1 Mon Sep 17 00:00:00 2001 From: Jonas Nyrup Date: Thu, 19 Dec 2024 14:04:58 +0100 Subject: [PATCH 5/7] Use FA 8.0.0-alpha.1 in both Core and ApprovalTest projects --- Tests/Approval.Tests/Approval.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/Approval.Tests/Approval.Tests.csproj b/Tests/Approval.Tests/Approval.Tests.csproj index f6953c3..8b169eb 100644 --- a/Tests/Approval.Tests/Approval.Tests.csproj +++ b/Tests/Approval.Tests/Approval.Tests.csproj @@ -5,7 +5,7 @@ - + @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 2bf1093c9273debfa268fba4e061704af269c646 Mon Sep 17 00:00:00 2001 From: Jonas Nyrup Date: Thu, 19 Dec 2024 14:07:09 +0100 Subject: [PATCH 6/7] Resolve MSB3277 on benchmark project --- Tests/Benchmarks/Benchmarks.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tests/Benchmarks/Benchmarks.csproj b/Tests/Benchmarks/Benchmarks.csproj index 0d45d72..94509db 100644 --- a/Tests/Benchmarks/Benchmarks.csproj +++ b/Tests/Benchmarks/Benchmarks.csproj @@ -8,6 +8,8 @@ + + From e71ce3c7ffaeb4b59906cd9b799a5fb096ad5f32 Mon Sep 17 00:00:00 2001 From: Jonas Nyrup Date: Thu, 19 Dec 2024 14:14:42 +0100 Subject: [PATCH 7/7] Align nuget versions --- Tests/Approval.Tests/Approval.Tests.csproj | 12 ------------ .../FluentAssertions.DataSets.Specs.csproj | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Tests/Approval.Tests/Approval.Tests.csproj b/Tests/Approval.Tests/Approval.Tests.csproj index 8b169eb..9b1ebe8 100644 --- a/Tests/Approval.Tests/Approval.Tests.csproj +++ b/Tests/Approval.Tests/Approval.Tests.csproj @@ -15,18 +15,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj b/Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj index 988cb2d..f5fea20 100644 --- a/Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj +++ b/Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj @@ -1,4 +1,4 @@ - + net47;net6.0 @@ -10,15 +10,15 @@ - - + + all runtime; build; native; contentfiles; analyzers - + runtime; build; native; contentfiles; analyzers; buildtransitive