diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 861b5c1..9e4ad03 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -21,7 +21,7 @@ jobs: - name: install dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '3.1.x' + dotnet-version: 6.0.x - name: install packages run: dotnet restore diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index cb83254..4e60936 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -21,7 +21,7 @@ jobs: - name: install dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '3.1.x' + dotnet-version: 6.0.x - name: install packages run: dotnet restore diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 78ff46c..1ebd227 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: install dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.x + dotnet-version: 6.0.x - name: install packages run: dotnet restore diff --git a/.gitignore b/.gitignore index dab9be8..6dce6e3 100644 --- a/.gitignore +++ b/.gitignore @@ -140,4 +140,6 @@ ModelManifest.xml **/.vs/config/applicationhost.config src/.vs/** -.vs/** \ No newline at end of file +.vs/** + +.idea \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 024cc08..f77ad2f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 1.1.4 + 1.1.5 Byndyusoft.ModelResult Byndyusoft Byndyusoft;ModelResult diff --git a/README.md b/README.md index 744bc97..4010fe0 100644 --- a/README.md +++ b/README.md @@ -88,22 +88,12 @@ A detailed overview on how to contribute can be found in the [contributing guide Make sure you have installed all of the following prerequisites on your development machine: - Git - [Download & Install Git](https://git-scm.com/downloads). OSX and Linux machines typically have this already installed. -- .NET Core (version 3.1 or higher) - [Download & Install .NET Core](https://dotnet.microsoft.com/download/dotnet-core/3.1). - -## General folders layout - -### src -- source code - -### tests - -- unit-tests - +- .NET Core (version 6.0 or higher) - [Download & Install .NET Core](https://dotnet.microsoft.com/en-us/download/dotnet/6.0). ## Package development lifecycle - Implement package logic in `src` -- Add or addapt unit-tests (prefer before and simultaneously with coding) in `tests` +- Add or adapt unit-tests in `tests` - Add or change the documentation as needed - Open pull request in the correct branch. Target the project's `master` branch diff --git a/src/ModelResult.AspNetCore/Byndyusoft.ModelResult.AspNetCore.csproj b/src/ModelResult.AspNetCore/Byndyusoft.ModelResult.AspNetCore.csproj index 31dbf34..fd2ae05 100644 --- a/src/ModelResult.AspNetCore/Byndyusoft.ModelResult.AspNetCore.csproj +++ b/src/ModelResult.AspNetCore/Byndyusoft.ModelResult.AspNetCore.csproj @@ -5,6 +5,7 @@ enable Byndyusoft.ModelResult.AspNetCore Byndyusoft.ModelResult.AspNetCore + README.md @@ -15,4 +16,9 @@ + + + + + diff --git a/src/ModelResult/Byndyusoft.ModelResult.csproj b/src/ModelResult/Byndyusoft.ModelResult.csproj index f0bd2c1..6f75865 100644 --- a/src/ModelResult/Byndyusoft.ModelResult.csproj +++ b/src/ModelResult/Byndyusoft.ModelResult.csproj @@ -4,6 +4,12 @@ netstandard2.1 Byndyusoft.ModelResult Byndyusoft.ModelResult + README.md + + + + + diff --git a/tests/ModelResult.UnitTests/Byndyusoft.ModelResult.UnitTests.csproj b/tests/ModelResult.UnitTests/Byndyusoft.ModelResult.UnitTests.csproj index 05c7dc9..d7c5cdd 100644 --- a/tests/ModelResult.UnitTests/Byndyusoft.ModelResult.UnitTests.csproj +++ b/tests/ModelResult.UnitTests/Byndyusoft.ModelResult.UnitTests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 enable false