Skip to content

Commit 2ea67b8

Browse files
Merge pull request #25 from NetDevPack/feat/net7
Feat/net7
2 parents 2f2f52c + 062deca commit 2ea67b8

File tree

5 files changed

+24
-44
lines changed

5 files changed

+24
-44
lines changed

.github/hooks/commit-msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ test "" = "$(grep '^Signed-off-by: ' "$1" |
2222
echo >&2 Duplicate Signed-off-by lines.
2323
exit 1
2424
}
25-
if ! head -1 "$1" | grep -qE "^(feat|fix|ci|chore|docs|test|style|refactor|chk)(\(.+?\))?: .{1,}$"; then
25+
if ! head -1 "$1" | grep -qE "^(feat|fix|ci|chore|docs|test|style|refactor|chk)(\(.+?\))?(\!)?: .{1,}$"; then
2626
echo "Aborting commit. Your commit message is invalid. See some examples below:" >&2
2727
echo "feat(logging): added logs for failed signups" >&2
2828
echo "fix(homepage): fixed image gallery" >&2

.github/workflows/publish-package.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,17 @@ jobs:
1313

1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717

1818
- name: Setup .NET 6
19-
uses: actions/setup-dotnet@v1
19+
uses: actions/setup-dotnet@v3
2020
with:
2121
dotnet-version: 6.0.x
2222

23-
- name: Setup .NET 6
24-
uses: actions/setup-dotnet@v1
25-
with:
26-
dotnet-version: 6.0.x
27-
28-
- name: Setup .NET 5
29-
uses: actions/setup-dotnet@v1
30-
with:
31-
dotnet-version: 5.0.x
32-
33-
- name: Setup .NET Core 3.1
34-
uses: actions/setup-dotnet@v1
23+
- name: Setup .NET 7
24+
uses: actions/setup-dotnet@v3
3525
with:
36-
dotnet-version: 3.1.x
26+
dotnet-version: 7.0.x
3727

3828
- name: Semantic Release
3929
id: semantic

.github/workflows/pull-request.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,17 @@ jobs:
1010

1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
1414

1515
- name: Setup .NET 6
16-
uses: actions/setup-dotnet@v1
16+
uses: actions/setup-dotnet@v3
1717
with:
1818
dotnet-version: 6.0.x
1919

20-
- name: Setup .NET 5
21-
uses: actions/setup-dotnet@v1
20+
- name: Setup .NET 7
21+
uses: actions/setup-dotnet@v3
2222
with:
23-
dotnet-version: 5.0.x
24-
25-
- name: Setup .NET Core 3.1
26-
uses: actions/setup-dotnet@v1
27-
with:
28-
dotnet-version: 3.1.x
23+
dotnet-version: 7.0.x
2924

3025
- name: Restore dependencies
3126
run: dotnet restore

src/NetDevPack.Identity/NetDevPack.Identity.csproj

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
<LangVersion>10.0</LangVersion>
66
<AssemblyName>NetDevPack.Identity</AssemblyName>
77
<RootNamespace>NetDevPack.Identity</RootNamespace>
@@ -20,22 +20,17 @@
2020
<Version>1.2.0</Version>
2121
</PropertyGroup>
2222

23-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
24-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.24" />
25-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.24" />
26-
</ItemGroup>
27-
28-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
29-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.16" />
30-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.16" />
31-
</ItemGroup>
32-
3323
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
3424
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
3525
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.4" />
3626
</ItemGroup>
3727

38-
<Target Name="CopyHook" AfterTargets="AfterBuild" Condition=" '$(Configuration)' == 'Debug' ">
28+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
29+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
30+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
31+
</ItemGroup>
32+
33+
<Target Name="CopyHook" AfterTargets="AfterBuild" Condition="'$(Configuration)' == 'Debug'">
3934
<ItemGroup>
4035
<_CustomFiles Include="../../.github/hooks/commit-msg" />
4136
</ItemGroup>
@@ -50,8 +45,8 @@
5045
</ItemGroup>
5146

5247
<ItemGroup>
53-
<PackageReference Include="NetDevPack.Security.Jwt.AspNetCore" Version="6.0.5" />
54-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.17.0" />
48+
<PackageReference Include="NetDevPack.Security.Jwt.AspNetCore" Version="6.0.7" />
49+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
5550
</ItemGroup>
5651

5752

src/Samples/AspNetCore.Jwt.Sample/AspNetCore.Jwt.Sample.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<UserSecretsId>71366747-6c85-459a-8d8e-f4a249169d76</UserSecretsId>
66
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
77
<DockerfileContext>..\..\..</DockerfileContext>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.4" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
1212
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.0" />
1313
<PackageReference Include="NetDevPack" Version="6.0.1" />
1414
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.4" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>

0 commit comments

Comments
 (0)