feat!: .NET 6 RC

NetDevPack · Oct 21, 2021 · 4bdf075 · 4bdf075
1 parent 5dc4e74
commit 4bdf075
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 7 deletions.
diff --git 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
@@ -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
@@ -25,6 +25,9 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0-rc.2.21480.5" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NetDevPack.Security.Jwt\NetDevPack.Security.Jwt.csproj" />
   </ItemGroup>

diff --git a/src/NetDevPack.Security.Jwt.IdentityServer4/NetDevPack.Security.Jwt.IdentityServer4.csproj b/src/NetDevPack.Security.Jwt.IdentityServer4/NetDevPack.Security.Jwt.IdentityServer4.csproj
diff --git a/...ty.Jwt.Store.EntityFrameworkCore/NetDevPack.Security.Jwt.Store.EntityFrameworkCore.csproj b/...ty.Jwt.Store.EntityFrameworkCore/NetDevPack.Security.Jwt.Store.EntityFrameworkCore.csproj
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
diff --git a/src/NetDevPack.Security.Jwt/NetDevPack.Security.Jwt.csproj b/src/NetDevPack.Security.Jwt/NetDevPack.Security.Jwt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
     <LangVersion>8</LangVersion>
     <Version>5.0.0</Version>
     <Authors>Bruno Brito</Authors>
@@ -16,19 +16,26 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.12.2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.13.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="System.Text.Json" Version="5.0.2" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.15" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="3.1.15" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.15" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="System.Text.Json" Version="5.0.2" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="5.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="5.0.11" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="System.Text.Json" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="6.0.0-rc.2.21480.10" />
   </ItemGroup>
 
 </Project>
diff --git a/...k.Security.Jwt.IdentityServer4.Tests/NetDevPack.Security.Jwt.IdentityServer4.Tests.csproj b/...k.Security.Jwt.IdentityServer4.Tests/NetDevPack.Security.Jwt.IdentityServer4.Tests.csproj
@@ -19,4 +19,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.6" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" />
+  </ItemGroup>
+
 </Project>
diff --git a/tests/NetDevPack.Security.Jwt.Tests/NetDevPack.Security.Jwt.Tests.csproj b/tests/NetDevPack.Security.Jwt.Tests/NetDevPack.Security.Jwt.Tests.csproj