diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 393d187..cdb3c8d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,9 +3,9 @@ "isRoot": true, "tools": { "csharpier": { - "version": "0.30.6", + "version": "1.2.5", "commands": [ - "dotnet-csharpier" + "csharpier" ], "rollForward": false } diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 65a930c..44ddb20 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -46,7 +46,7 @@ jobs: run: dotnet pack ./CSharpFunctionalExtensions.HttpResults/CSharpFunctionalExtensions.HttpResults.csproj -c Release -p:ContinuousIntegrationBuild=true -p:Version=0.0.0 --output dist/package - name: Lint - run: dotnet csharpier --check . + run: dotnet csharpier check . - name: Link Checker id: lychee diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1b7df84..fe547b9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -43,7 +43,7 @@ jobs: run: dotnet build -c Release --no-restore -p:ContinuousIntegrationBuild=true - name: Lint - run: dotnet csharpier --check . + run: dotnet csharpier check . - name: Extract version from tag run: | diff --git a/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj b/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj index 18b0964..f691891 100644 --- a/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj +++ b/CSharpFunctionalExtensions.HttpResults.Examples/CSharpFunctionalExtensions.HttpResults.Examples.csproj @@ -1,5 +1,4 @@ - net10.0 enable @@ -14,8 +13,12 @@ - - + + @@ -23,5 +26,4 @@ PreserveNewest - diff --git a/CSharpFunctionalExtensions.HttpResults.Examples/Features/MultipleErrorChain/MultipleErrorChain.cs b/CSharpFunctionalExtensions.HttpResults.Examples/Features/MultipleErrorChain/MultipleErrorChain.cs index 8459553..0ee5c86 100644 --- a/CSharpFunctionalExtensions.HttpResults.Examples/Features/MultipleErrorChain/MultipleErrorChain.cs +++ b/CSharpFunctionalExtensions.HttpResults.Examples/Features/MultipleErrorChain/MultipleErrorChain.cs @@ -8,7 +8,6 @@ namespace CSharpFunctionalExtensions.HttpResults.Examples.Features.MultipleError /// types of errors in a chain of . /// This is the best workaround I could find for now. /// - // 1. Create base type for all errors and define concrete errors as child type public record BookError; diff --git a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj index c2e3521..1b697ba 100644 --- a/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj +++ b/CSharpFunctionalExtensions.HttpResults.Generators.Tests/CSharpFunctionalExtensions.HttpResults.Generators.Tests.csproj @@ -1,5 +1,4 @@  - net10.0 enable @@ -13,8 +12,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + @@ -25,13 +24,16 @@ - + - - - + + + - diff --git a/CSharpFunctionalExtensions.HttpResults.Generators/CSharpFunctionalExtensions.HttpResults.Generators.csproj b/CSharpFunctionalExtensions.HttpResults.Generators/CSharpFunctionalExtensions.HttpResults.Generators.csproj index c3f2d3f..30d09e0 100644 --- a/CSharpFunctionalExtensions.HttpResults.Generators/CSharpFunctionalExtensions.HttpResults.Generators.csproj +++ b/CSharpFunctionalExtensions.HttpResults.Generators/CSharpFunctionalExtensions.HttpResults.Generators.csproj @@ -1,5 +1,4 @@  - netstandard2.0 enable @@ -26,11 +25,11 @@ - + - - + + diff --git a/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj b/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj index babf0f4..dc50d37 100644 --- a/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj +++ b/CSharpFunctionalExtensions.HttpResults.Tests/CSharpFunctionalExtensions.HttpResults.Tests.csproj @@ -1,5 +1,4 @@ - net7.0;net8.0;net9.0;net10.0 enable @@ -24,8 +23,11 @@ - - + + - diff --git a/CSharpFunctionalExtensions.HttpResults/CSharpFunctionalExtensions.HttpResults.csproj b/CSharpFunctionalExtensions.HttpResults/CSharpFunctionalExtensions.HttpResults.csproj index 2076840..631c3dc 100644 --- a/CSharpFunctionalExtensions.HttpResults/CSharpFunctionalExtensions.HttpResults.csproj +++ b/CSharpFunctionalExtensions.HttpResults/CSharpFunctionalExtensions.HttpResults.csproj @@ -1,5 +1,4 @@  - net7.0;net8.0;net9.0;net10.0 enable @@ -26,20 +25,28 @@ - + - + - - - + + + - + diff --git a/README.md b/README.md index 182927f..a0f4d04 100644 --- a/README.md +++ b/README.md @@ -252,7 +252,7 @@ Contributions are welcome! Please keep the following rules in mind: - add sync and async variants where possible - refer to existing code files and the folder structure when adding something -This project uses [CSharpier](https://csharpier.com) for code formatting. You can format your code with `dotnet csharpier .`. +This project uses [CSharpier](https://csharpier.com) for code formatting. You can format your code with `dotnet csharpier format .`. ### Add new extension methods