From cd97d9119b1dc128eb87ce4ee68203757753bf2e Mon Sep 17 00:00:00 2001 From: Stefan Nikolei Date: Fri, 1 Dec 2023 13:18:08 +0100 Subject: [PATCH 1/4] Update testproject to net8 and c# to 12 --- .github/workflows/build-and-test.yml | 6 +++--- msbuild/props/SixLabors.Global.props | 2 +- .../SharedInfrastructure.Tests.csproj | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 39fc9ae..e0f5d29 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -13,15 +13,15 @@ jobs: matrix: options: - os: ubuntu-latest - framework: net6.0 + framework: net8.0 runtime: -x64 codecov: false - os: macos-latest - framework: net6.0 + framework: net8.0 runtime: -x64 codecov: false - os: windows-latest - framework: net6.0 + framework: net8.0 runtime: -x64 codecov: true diff --git a/msbuild/props/SixLabors.Global.props b/msbuild/props/SixLabors.Global.props index 6a96964..7af6096 100644 --- a/msbuild/props/SixLabors.Global.props +++ b/msbuild/props/SixLabors.Global.props @@ -62,7 +62,7 @@ - 10.0 + 12.0 true strict;IOperation true diff --git a/tests/SharedInfrastructure.Tests/SharedInfrastructure.Tests.csproj b/tests/SharedInfrastructure.Tests/SharedInfrastructure.Tests.csproj index 65dfed4..3248073 100644 --- a/tests/SharedInfrastructure.Tests/SharedInfrastructure.Tests.csproj +++ b/tests/SharedInfrastructure.Tests/SharedInfrastructure.Tests.csproj @@ -1,7 +1,7 @@ - net6.0; + net8.0; SharedInfrastructure.Tests SharedInfrastructure.Tests enable From 93df5d57f31896c217594c1e17a61628719243b1 Mon Sep 17 00:00:00 2001 From: Stefan Nikolei Date: Fri, 1 Dec 2023 13:35:16 +0100 Subject: [PATCH 2/4] Install net8 in action --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e0f5d29..7812387 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -55,7 +55,7 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 6.0.x + 8.0.x - name: DotNet Build shell: pwsh From 5214ee4f90dbebae484e6baf05b3acd32fea6042 Mon Sep 17 00:00:00 2001 From: Stefan Nikolei Date: Fri, 1 Dec 2023 14:17:25 +0100 Subject: [PATCH 3/4] Update dependencies to latest --- msbuild/props/SixLabors.Global.props | 2 +- msbuild/props/SixLabors.Src.props | 6 +++--- msbuild/props/SixLabors.Tests.props | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/msbuild/props/SixLabors.Global.props b/msbuild/props/SixLabors.Global.props index 7af6096..7ba49af 100644 --- a/msbuild/props/SixLabors.Global.props +++ b/msbuild/props/SixLabors.Global.props @@ -115,7 +115,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/msbuild/props/SixLabors.Src.props b/msbuild/props/SixLabors.Src.props index bd93429..94df4b3 100644 --- a/msbuild/props/SixLabors.Src.props +++ b/msbuild/props/SixLabors.Src.props @@ -49,13 +49,13 @@ - + diff --git a/msbuild/props/SixLabors.Tests.props b/msbuild/props/SixLabors.Tests.props index aa71f12..bfef44d 100644 --- a/msbuild/props/SixLabors.Tests.props +++ b/msbuild/props/SixLabors.Tests.props @@ -14,17 +14,17 @@ From 9e1388edb29864169b457866c68cb009052e9165 Mon Sep 17 00:00:00 2001 From: Stefan Nikolei Date: Fri, 1 Dec 2023 14:18:24 +0100 Subject: [PATCH 4/4] Update xunit --- msbuild/props/SixLabors.Tests.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msbuild/props/SixLabors.Tests.props b/msbuild/props/SixLabors.Tests.props index bfef44d..0f49bd4 100644 --- a/msbuild/props/SixLabors.Tests.props +++ b/msbuild/props/SixLabors.Tests.props @@ -11,7 +11,7 @@ - +