From 663ec97a85cbe6af7176c1f0719c3208140b3874 Mon Sep 17 00:00:00 2001 From: Thomas Mullaly Date: Wed, 19 Apr 2023 15:24:18 -0400 Subject: [PATCH 1/2] Added Directory.Packages.props --- Directory.Packages.props | 23 +++++++++++++++++++ .../Ardalis.Result.Sample.Core.csproj | 6 ++--- .../Ardalis.Result.Sample.UnitTests.csproj | 10 ++++---- ...lt.SampleMinimalApi.FunctionalTests.csproj | 12 +++++----- .../Ardalis.Result.SampleMinimalApi.csproj | 2 +- ...is.Result.SampleWeb.FunctionalTests.csproj | 10 ++++---- .../Ardalis.Result.SampleWeb.csproj | 10 ++++---- .../Ardalis.Result.AspNetCore.csproj | 2 +- .../Ardalis.Result.FluentValidation.csproj | 2 +- ...Ardalis.Result.AspNetCore.UnitTests.csproj | 10 ++++---- .../Ardalis.Result.UnitTests.csproj | 10 ++++---- 11 files changed, 60 insertions(+), 37 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..7ce6909 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,23 @@ + + + true + + + + + + + + + + + + + + + + + + + + diff --git a/sample/Ardalis.Result.Sample.Core/Ardalis.Result.Sample.Core.csproj b/sample/Ardalis.Result.Sample.Core/Ardalis.Result.Sample.Core.csproj index f9b1c8a..2b92bdf 100644 --- a/sample/Ardalis.Result.Sample.Core/Ardalis.Result.Sample.Core.csproj +++ b/sample/Ardalis.Result.Sample.Core/Ardalis.Result.Sample.Core.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/sample/Ardalis.Result.Sample.UnitTests/Ardalis.Result.Sample.UnitTests.csproj b/sample/Ardalis.Result.Sample.UnitTests/Ardalis.Result.Sample.UnitTests.csproj index 3b1c436..4c2d3fc 100644 --- a/sample/Ardalis.Result.Sample.UnitTests/Ardalis.Result.Sample.UnitTests.csproj +++ b/sample/Ardalis.Result.Sample.UnitTests/Ardalis.Result.Sample.UnitTests.csproj @@ -7,14 +7,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/sample/Ardalis.Result.SampleMinimalApi.FunctionalTests/Ardalis.Result.SampleMinimalApi.FunctionalTests.csproj b/sample/Ardalis.Result.SampleMinimalApi.FunctionalTests/Ardalis.Result.SampleMinimalApi.FunctionalTests.csproj index e4c9099..f551124 100644 --- a/sample/Ardalis.Result.SampleMinimalApi.FunctionalTests/Ardalis.Result.SampleMinimalApi.FunctionalTests.csproj +++ b/sample/Ardalis.Result.SampleMinimalApi.FunctionalTests/Ardalis.Result.SampleMinimalApi.FunctionalTests.csproj @@ -6,14 +6,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -22,5 +22,5 @@ - + diff --git a/sample/Ardalis.Result.SampleMinimalApi/Ardalis.Result.SampleMinimalApi.csproj b/sample/Ardalis.Result.SampleMinimalApi/Ardalis.Result.SampleMinimalApi.csproj index 1ad1caf..76b7fa5 100644 --- a/sample/Ardalis.Result.SampleMinimalApi/Ardalis.Result.SampleMinimalApi.csproj +++ b/sample/Ardalis.Result.SampleMinimalApi/Ardalis.Result.SampleMinimalApi.csproj @@ -7,7 +7,7 @@ - + diff --git a/sample/Ardalis.Result.SampleWeb.FunctionalTests/Ardalis.Result.SampleWeb.FunctionalTests.csproj b/sample/Ardalis.Result.SampleWeb.FunctionalTests/Ardalis.Result.SampleWeb.FunctionalTests.csproj index 01dd992..cf8757e 100644 --- a/sample/Ardalis.Result.SampleWeb.FunctionalTests/Ardalis.Result.SampleWeb.FunctionalTests.csproj +++ b/sample/Ardalis.Result.SampleWeb.FunctionalTests/Ardalis.Result.SampleWeb.FunctionalTests.csproj @@ -7,14 +7,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/sample/Ardalis.Result.SampleWeb/Ardalis.Result.SampleWeb.csproj b/sample/Ardalis.Result.SampleWeb/Ardalis.Result.SampleWeb.csproj index 6fbb4a4..4b0eea9 100644 --- a/sample/Ardalis.Result.SampleWeb/Ardalis.Result.SampleWeb.csproj +++ b/sample/Ardalis.Result.SampleWeb/Ardalis.Result.SampleWeb.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + diff --git a/src/Ardalis.Result.AspNetCore/Ardalis.Result.AspNetCore.csproj b/src/Ardalis.Result.AspNetCore/Ardalis.Result.AspNetCore.csproj index cc9d63b..24084ed 100644 --- a/src/Ardalis.Result.AspNetCore/Ardalis.Result.AspNetCore.csproj +++ b/src/Ardalis.Result.AspNetCore/Ardalis.Result.AspNetCore.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Ardalis.Result.FluentValidation/Ardalis.Result.FluentValidation.csproj b/src/Ardalis.Result.FluentValidation/Ardalis.Result.FluentValidation.csproj index 360798e..6a5f7da 100644 --- a/src/Ardalis.Result.FluentValidation/Ardalis.Result.FluentValidation.csproj +++ b/src/Ardalis.Result.FluentValidation/Ardalis.Result.FluentValidation.csproj @@ -22,7 +22,7 @@ - + diff --git a/tests/Ardalis.Result.AspNetCore.UnitTests/Ardalis.Result.AspNetCore.UnitTests.csproj b/tests/Ardalis.Result.AspNetCore.UnitTests/Ardalis.Result.AspNetCore.UnitTests.csproj index ba524fa..ddede4a 100644 --- a/tests/Ardalis.Result.AspNetCore.UnitTests/Ardalis.Result.AspNetCore.UnitTests.csproj +++ b/tests/Ardalis.Result.AspNetCore.UnitTests/Ardalis.Result.AspNetCore.UnitTests.csproj @@ -7,14 +7,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Ardalis.Result.UnitTests/Ardalis.Result.UnitTests.csproj b/tests/Ardalis.Result.UnitTests/Ardalis.Result.UnitTests.csproj index 7ebf4c0..a4d6030 100644 --- a/tests/Ardalis.Result.UnitTests/Ardalis.Result.UnitTests.csproj +++ b/tests/Ardalis.Result.UnitTests/Ardalis.Result.UnitTests.csproj @@ -7,14 +7,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From b5abb1fa609badaa608c513f5e6a757bbf1ad5b2 Mon Sep 17 00:00:00 2001 From: Thomas Mullaly Date: Wed, 19 Apr 2023 15:52:50 -0400 Subject: [PATCH 2/2] Added multiple Directoy.build.props to consolidate some project configuration --- .gitignore | 8 +++++--- .../Ardalis.Result.Sample.Core.csproj | 1 - .../Ardalis.Result.Sample.UnitTests.csproj | 2 -- ...Result.SampleMinimalApi.FunctionalTests.csproj | 2 -- .../Ardalis.Result.SampleMinimalApi.csproj | 2 -- ...rdalis.Result.SampleWeb.FunctionalTests.csproj | 2 -- .../Ardalis.Result.SampleWeb.csproj | 4 ---- sample/Directory.Build.props | 6 ++++++ .../Ardalis.Result.AspNetCore.csproj | 11 ----------- .../Ardalis.Result.FluentValidation.csproj | 11 ----------- src/Ardalis.Result/Ardalis.Result.csproj | 11 ----------- src/Directory.Build.props | 15 +++++++++++++++ .../Ardalis.Result.AspNetCore.UnitTests.csproj | 2 -- .../Ardalis.Result.UnitTests.csproj | 7 ------- tests/Directory.Build.props | 6 ++++++ 15 files changed, 32 insertions(+), 58 deletions(-) create mode 100644 sample/Directory.Build.props create mode 100644 src/Directory.Build.props create mode 100644 tests/Directory.Build.props diff --git a/.gitignore b/.gitignore index 43dc47b..9ed1143 100644 --- a/.gitignore +++ b/.gitignore @@ -221,7 +221,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Including strong name files can present a security risk +# Including strong name files can present a security risk # (https://github.com/github/gitignore/pull/2483#issue-259490424) #*.snk @@ -317,7 +317,7 @@ __pycache__/ # OpenCover UI analysis results OpenCover/ -# Azure Stream Analytics local run output +# Azure Stream Analytics local run output ASALocalRun/ # MSBuild Binary and Structured Log @@ -326,8 +326,10 @@ ASALocalRun/ # NVidia Nsight GPU debugger configuration file *.nvuser -# MFractors (Xamarin productivity tool) working folder +# MFractors (Xamarin productivity tool) working folder .mfractor/ # Development settings *.Development.json + +.DS_Store diff --git a/sample/Ardalis.Result.Sample.Core/Ardalis.Result.Sample.Core.csproj b/sample/Ardalis.Result.Sample.Core/Ardalis.Result.Sample.Core.csproj index 2b92bdf..f6040f7 100644 --- a/sample/Ardalis.Result.Sample.Core/Ardalis.Result.Sample.Core.csproj +++ b/sample/Ardalis.Result.Sample.Core/Ardalis.Result.Sample.Core.csproj @@ -1,7 +1,6 @@  - net7.0 Ardalis.Result.Sample.Core Ardalis.Result.Sample.Core diff --git a/sample/Ardalis.Result.Sample.UnitTests/Ardalis.Result.Sample.UnitTests.csproj b/sample/Ardalis.Result.Sample.UnitTests/Ardalis.Result.Sample.UnitTests.csproj index 4c2d3fc..b71639f 100644 --- a/sample/Ardalis.Result.Sample.UnitTests/Ardalis.Result.Sample.UnitTests.csproj +++ b/sample/Ardalis.Result.Sample.UnitTests/Ardalis.Result.Sample.UnitTests.csproj @@ -1,8 +1,6 @@  - net7.0 - false diff --git a/sample/Ardalis.Result.SampleMinimalApi.FunctionalTests/Ardalis.Result.SampleMinimalApi.FunctionalTests.csproj b/sample/Ardalis.Result.SampleMinimalApi.FunctionalTests/Ardalis.Result.SampleMinimalApi.FunctionalTests.csproj index f551124..3f28e12 100644 --- a/sample/Ardalis.Result.SampleMinimalApi.FunctionalTests/Ardalis.Result.SampleMinimalApi.FunctionalTests.csproj +++ b/sample/Ardalis.Result.SampleMinimalApi.FunctionalTests/Ardalis.Result.SampleMinimalApi.FunctionalTests.csproj @@ -1,7 +1,5 @@  - net7.0 - false diff --git a/sample/Ardalis.Result.SampleMinimalApi/Ardalis.Result.SampleMinimalApi.csproj b/sample/Ardalis.Result.SampleMinimalApi/Ardalis.Result.SampleMinimalApi.csproj index 76b7fa5..bad544d 100644 --- a/sample/Ardalis.Result.SampleMinimalApi/Ardalis.Result.SampleMinimalApi.csproj +++ b/sample/Ardalis.Result.SampleMinimalApi/Ardalis.Result.SampleMinimalApi.csproj @@ -1,8 +1,6 @@  - net7.0 - enable enable diff --git a/sample/Ardalis.Result.SampleWeb.FunctionalTests/Ardalis.Result.SampleWeb.FunctionalTests.csproj b/sample/Ardalis.Result.SampleWeb.FunctionalTests/Ardalis.Result.SampleWeb.FunctionalTests.csproj index cf8757e..4f051c6 100644 --- a/sample/Ardalis.Result.SampleWeb.FunctionalTests/Ardalis.Result.SampleWeb.FunctionalTests.csproj +++ b/sample/Ardalis.Result.SampleWeb.FunctionalTests/Ardalis.Result.SampleWeb.FunctionalTests.csproj @@ -1,8 +1,6 @@  - net7.0 - false diff --git a/sample/Ardalis.Result.SampleWeb/Ardalis.Result.SampleWeb.csproj b/sample/Ardalis.Result.SampleWeb/Ardalis.Result.SampleWeb.csproj index 4b0eea9..c8da911 100644 --- a/sample/Ardalis.Result.SampleWeb/Ardalis.Result.SampleWeb.csproj +++ b/sample/Ardalis.Result.SampleWeb/Ardalis.Result.SampleWeb.csproj @@ -1,9 +1,5 @@  - - net7.0 - - diff --git a/sample/Directory.Build.props b/sample/Directory.Build.props new file mode 100644 index 0000000..b1ed890 --- /dev/null +++ b/sample/Directory.Build.props @@ -0,0 +1,6 @@ + + + net7.0 + enable + + diff --git a/src/Ardalis.Result.AspNetCore/Ardalis.Result.AspNetCore.csproj b/src/Ardalis.Result.AspNetCore/Ardalis.Result.AspNetCore.csproj index 24084ed..4cf0092 100644 --- a/src/Ardalis.Result.AspNetCore/Ardalis.Result.AspNetCore.csproj +++ b/src/Ardalis.Result.AspNetCore/Ardalis.Result.AspNetCore.csproj @@ -1,24 +1,13 @@  - netstandard2.0;net7.0 Ardalis.Result.AspNetCore Ardalis.Result.AspNetCore - true - Steve Smith (@ardalis); Shady Nagy (@ShadyNagy) - Ardalis.com - https://github.com/ardalis/result Adds ASP.NET Core filters that translate from Result to ActionResult. Adds ASP.NET Core filters that translate from Result to ActionResult. - https://github.com/ardalis/result result pattern web api aspnetcore mvc - MIT PRs 92 and 112. Adding support for .NET 7 and ability to improve Swagger/OpenAPI specifications when using the TranslateResultToActionResult attribute. - 7.0.0 Ardalis.Result.AspNetCore - icon.png - true - true diff --git a/src/Ardalis.Result.FluentValidation/Ardalis.Result.FluentValidation.csproj b/src/Ardalis.Result.FluentValidation/Ardalis.Result.FluentValidation.csproj index 6a5f7da..36adc1f 100644 --- a/src/Ardalis.Result.FluentValidation/Ardalis.Result.FluentValidation.csproj +++ b/src/Ardalis.Result.FluentValidation/Ardalis.Result.FluentValidation.csproj @@ -1,24 +1,13 @@  - netstandard2.0;net7.0 Ardalis.Result.FluentValidation Ardalis.Result.FluentValidation - true - Steve Smith (@ardalis); Shady Nagy (@ShadyNagy) - Ardalis.com - https://github.com/ardalis/result A simple package to implement the FluentValidation in Result package. A simple package to implement the FluentValidation in Result package. - https://github.com/ardalis/result result;pattern;web;api;aspnetcore;mvc;FluentValidation;Validation - MIT PRs 92 and 112. Adding support for .NET 7. - 7.0.0 Ardalis.Result.FluentValidation - icon.png - true - true diff --git a/src/Ardalis.Result/Ardalis.Result.csproj b/src/Ardalis.Result/Ardalis.Result.csproj index e26470d..03edc5a 100644 --- a/src/Ardalis.Result/Ardalis.Result.csproj +++ b/src/Ardalis.Result/Ardalis.Result.csproj @@ -1,24 +1,13 @@  - netstandard2.0;net7.0 Ardalis.Result Ardalis.Result - true - Steve Smith (@ardalis); Shady Nagy (@ShadyNagy) - Ardalis.com - https://github.com/ardalis/result A simple package to implement the Result pattern for returning from services. A simple package to implement the Result pattern for returning from services. - https://github.com/ardalis/result result pattern web api aspnetcore mvc - MIT PRs 92 and 112. Adding support for .NET 7 - 7.0.0 Ardalis.Result - icon.png - true - true diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000..045185f --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,15 @@ + + + netstandard2.0;net7.0 + true + Steve Smith (@ardalis); Shady Nagy (@ShadyNagy) + Ardalis.com + https://github.com/ardalis/result + https://github.com/ardalis/result + MIT + 7.0.0 + icon.png + true + true + + diff --git a/tests/Ardalis.Result.AspNetCore.UnitTests/Ardalis.Result.AspNetCore.UnitTests.csproj b/tests/Ardalis.Result.AspNetCore.UnitTests/Ardalis.Result.AspNetCore.UnitTests.csproj index ddede4a..029819f 100644 --- a/tests/Ardalis.Result.AspNetCore.UnitTests/Ardalis.Result.AspNetCore.UnitTests.csproj +++ b/tests/Ardalis.Result.AspNetCore.UnitTests/Ardalis.Result.AspNetCore.UnitTests.csproj @@ -1,9 +1,7 @@ - net7.0 enable - enable diff --git a/tests/Ardalis.Result.UnitTests/Ardalis.Result.UnitTests.csproj b/tests/Ardalis.Result.UnitTests/Ardalis.Result.UnitTests.csproj index a4d6030..f15222c 100644 --- a/tests/Ardalis.Result.UnitTests/Ardalis.Result.UnitTests.csproj +++ b/tests/Ardalis.Result.UnitTests/Ardalis.Result.UnitTests.csproj @@ -1,11 +1,4 @@  - - - net7.0 - - false - - diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props new file mode 100644 index 0000000..503ae9c --- /dev/null +++ b/tests/Directory.Build.props @@ -0,0 +1,6 @@ + + + net7.0 + false + +