From 29bb50ff1da28f7bb762148a17234410bb059793 Mon Sep 17 00:00:00 2001 From: Dat <62109015+datlam162@users.noreply.github.com> Date: Mon, 12 Jan 2026 10:39:19 +0700 Subject: [PATCH 1/2] ASMO-7526: Update to dotnet10 --- .github/workflows/cicd.yaml | 2 +- .../Samhammer.Options.Abstractions.csproj | 2 +- .../Samhammer.Options.Test.csproj | 18 +++++++++--------- src/Samhammer.Options/Samhammer.Options.csproj | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 3065f12..57ee33a 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -20,7 +20,7 @@ jobs: id: tag - uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - run: echo "::remove-matcher owner=csc::" - uses: reviewdog/action-setup@v1 - run: dotnet --info diff --git a/src/Samhammer.Options.Abstractions/Samhammer.Options.Abstractions.csproj b/src/Samhammer.Options.Abstractions/Samhammer.Options.Abstractions.csproj index 635aa5d..02fa2c1 100644 --- a/src/Samhammer.Options.Abstractions/Samhammer.Options.Abstractions.csproj +++ b/src/Samhammer.Options.Abstractions/Samhammer.Options.Abstractions.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Samhammer.Options.Test/Samhammer.Options.Test.csproj b/src/Samhammer.Options.Test/Samhammer.Options.Test.csproj index 998000e..ade1dfb 100644 --- a/src/Samhammer.Options.Test/Samhammer.Options.Test.csproj +++ b/src/Samhammer.Options.Test/Samhammer.Options.Test.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 false ..\stylecop.ruleset @@ -11,20 +11,20 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers - - + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Samhammer.Options/Samhammer.Options.csproj b/src/Samhammer.Options/Samhammer.Options.csproj index 05e85f6..f38748d 100644 --- a/src/Samhammer.Options/Samhammer.Options.csproj +++ b/src/Samhammer.Options/Samhammer.Options.csproj @@ -17,11 +17,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers From 343f23407d8f3c562a82bb79cc314a54a8494798 Mon Sep 17 00:00:00 2001 From: Dat <62109015+datlam162@users.noreply.github.com> Date: Tue, 13 Jan 2026 14:02:18 +0700 Subject: [PATCH 2/2] ASMO-7526: Downgrade FluentAssertion to version 7 --- src/Samhammer.Options.Test/Samhammer.Options.Test.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Samhammer.Options.Test/Samhammer.Options.Test.csproj b/src/Samhammer.Options.Test/Samhammer.Options.Test.csproj index ade1dfb..b010edd 100644 --- a/src/Samhammer.Options.Test/Samhammer.Options.Test.csproj +++ b/src/Samhammer.Options.Test/Samhammer.Options.Test.csproj @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive