diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index 1dd3f46..d5fbf60 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -5,7 +5,7 @@ on: branches: [ master ] env: - PACKAGE_MAJOR_VERSION: 5 + PACKAGE_MAJOR_VERSION: 6 PACKAGE_MINOR_VERSION: 0 CURRENT_REPO_URL: https://github.com/${{ github.repository }} @@ -20,6 +20,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Setup .NET 6 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - name: Setup .NET 5 uses: actions/setup-dotnet@v1 with: @@ -31,7 +36,7 @@ jobs: dotnet-version: 3.1.x - name: Generate version - run: echo "PACKAGE_VERSION=$PACKAGE_MAJOR_VERSION.$PACKAGE_MINOR_VERSION.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV + run: echo "PACKAGE_VERSION=$PACKAGE_MAJOR_VERSION.$PACKAGE_MINOR_VERSION.$GITHUB_RUN_NUMBER-rc.2.21480.5" >> $GITHUB_ENV - name: Generate Package run: dotnet pack -c Release -o out -p:PackageVersion=${{env.PACKAGE_VERSION}} -p:RepositoryUrl=${{env.CURRENT_REPO_URL}} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 9538fda..2e20f25 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -15,6 +15,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Setup .NET 6 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - name: Setup .NET 5 uses: actions/setup-dotnet@v1 with: diff --git a/src/NetDevPack.Security.Jwt.AspNetCore/NetDevPack.Security.Jwt.AspNetCore.csproj b/src/NetDevPack.Security.Jwt.AspNetCore/NetDevPack.Security.Jwt.AspNetCore.csproj index 030a201..bf5d8f1 100644 --- a/src/NetDevPack.Security.Jwt.AspNetCore/NetDevPack.Security.Jwt.AspNetCore.csproj +++ b/src/NetDevPack.Security.Jwt.AspNetCore/NetDevPack.Security.Jwt.AspNetCore.csproj @@ -25,6 +25,9 @@ + + + diff --git a/src/NetDevPack.Security.Jwt.IdentityServer4/NetDevPack.Security.Jwt.IdentityServer4.csproj b/src/NetDevPack.Security.Jwt.IdentityServer4/NetDevPack.Security.Jwt.IdentityServer4.csproj index 3d0d818..f776dfa 100644 Binary files a/src/NetDevPack.Security.Jwt.IdentityServer4/NetDevPack.Security.Jwt.IdentityServer4.csproj and b/src/NetDevPack.Security.Jwt.IdentityServer4/NetDevPack.Security.Jwt.IdentityServer4.csproj differ diff --git a/src/NetDevPack.Security.Jwt.Store.EntityFrameworkCore/NetDevPack.Security.Jwt.Store.EntityFrameworkCore.csproj b/src/NetDevPack.Security.Jwt.Store.EntityFrameworkCore/NetDevPack.Security.Jwt.Store.EntityFrameworkCore.csproj index 78d62ef..6790ab4 100644 Binary files a/src/NetDevPack.Security.Jwt.Store.EntityFrameworkCore/NetDevPack.Security.Jwt.Store.EntityFrameworkCore.csproj and b/src/NetDevPack.Security.Jwt.Store.EntityFrameworkCore/NetDevPack.Security.Jwt.Store.EntityFrameworkCore.csproj differ diff --git a/src/NetDevPack.Security.Jwt.Store.FileSystem/NetDevPack.Security.Jwt.Store.FileSystem.csproj b/src/NetDevPack.Security.Jwt.Store.FileSystem/NetDevPack.Security.Jwt.Store.FileSystem.csproj index eaea26a..6c3791b 100644 Binary files a/src/NetDevPack.Security.Jwt.Store.FileSystem/NetDevPack.Security.Jwt.Store.FileSystem.csproj and b/src/NetDevPack.Security.Jwt.Store.FileSystem/NetDevPack.Security.Jwt.Store.FileSystem.csproj differ diff --git a/src/NetDevPack.Security.Jwt/NetDevPack.Security.Jwt.csproj b/src/NetDevPack.Security.Jwt/NetDevPack.Security.Jwt.csproj index 4787ad8..b55f43e 100644 --- a/src/NetDevPack.Security.Jwt/NetDevPack.Security.Jwt.csproj +++ b/src/NetDevPack.Security.Jwt/NetDevPack.Security.Jwt.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net5.0 + netstandard2.1;net5.0;net6.0 8 5.0.0 Bruno Brito @@ -16,19 +16,26 @@ - - - + + + + - + + + + + + + diff --git a/tests/NetDevPack.Security.Jwt.IdentityServer4.Tests/NetDevPack.Security.Jwt.IdentityServer4.Tests.csproj b/tests/NetDevPack.Security.Jwt.IdentityServer4.Tests/NetDevPack.Security.Jwt.IdentityServer4.Tests.csproj index e5b9ac7..067d6ff 100644 --- a/tests/NetDevPack.Security.Jwt.IdentityServer4.Tests/NetDevPack.Security.Jwt.IdentityServer4.Tests.csproj +++ b/tests/NetDevPack.Security.Jwt.IdentityServer4.Tests/NetDevPack.Security.Jwt.IdentityServer4.Tests.csproj @@ -19,4 +19,8 @@ + + + + diff --git a/tests/NetDevPack.Security.Jwt.Tests/NetDevPack.Security.Jwt.Tests.csproj b/tests/NetDevPack.Security.Jwt.Tests/NetDevPack.Security.Jwt.Tests.csproj index b9a0db3..38283fc 100644 Binary files a/tests/NetDevPack.Security.Jwt.Tests/NetDevPack.Security.Jwt.Tests.csproj and b/tests/NetDevPack.Security.Jwt.Tests/NetDevPack.Security.Jwt.Tests.csproj differ