Skip to content

Commit 6ac5b48

Browse files
Merge pull request #15 from NetDevPack/feat/net6
Feat/net6
2 parents 0a24d2c + 19cc1a2 commit 6ac5b48

5 files changed

Lines changed: 70 additions & 8 deletions

File tree

.github/hooks/commit-msg

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/sh
2+
#
3+
# An example hook script to check the commit log message.
4+
# Called by "git commit" with one argument, the name of the file
5+
# that has the commit message. The hook should exit with non-zero
6+
# status after issuing an appropriate message if it wants to stop the
7+
# commit. The hook is allowed to edit the commit message file.
8+
#
9+
# To enable this hook, rename this file to "commit-msg".
10+
11+
# Uncomment the below to add a Signed-off-by line to the message.
12+
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
13+
# hook is more suited to it.
14+
#
15+
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
16+
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
17+
18+
# This example catches duplicate Signed-off-by lines.
19+
20+
test "" = "$(grep '^Signed-off-by: ' "$1" |
21+
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
22+
echo >&2 Duplicate Signed-off-by lines.
23+
exit 1
24+
}
25+
if ! head -1 "$1" | grep -qE "^(feat|fix|ci|chore|docs|test|style|refactor|chk)(\(.+?\))?: .{1,}$"; then
26+
echo "Aborting commit. Your commit message is invalid. See some examples below:" >&2
27+
echo "feat(logging): added logs for failed signups" >&2
28+
echo "fix(homepage): fixed image gallery" >&2
29+
echo "test(homepage): updated tests" >&2
30+
echo "docs(readme): added new logging table information" >&2
31+
echo "For more information check https://www.conventionalcommits.org/en/v1.0.0/ for more details" >&2
32+
exit 1
33+
fi
34+
if ! head -1 "$1" | grep -qE "^.{1,50}$"; then
35+
echo "Aborting commit. Your commit message is too long." >&2
36+
exit 1
37+
fi

.github/workflows/publish-package.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ jobs:
2222
with:
2323
dotnet-version: 6.0.x
2424

25+
- name: Setup .NET 6
26+
uses: actions/setup-dotnet@v1
27+
with:
28+
dotnet-version: 6.0.x
29+
2530
- name: Setup .NET 5
2631
uses: actions/setup-dotnet@v1
2732
with:
@@ -32,11 +37,20 @@ jobs:
3237
with:
3338
dotnet-version: 3.1.x
3439

35-
- name: Generate version
36-
run: echo "PACKAGE_VERSION=$PACKAGE_MAJOR_VERSION.$PACKAGE_MINOR_VERSION.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
40+
- name: Semantic Release
41+
id: semantic
42+
uses: cycjimmy/semantic-release-action@v2
43+
with:
44+
semantic_version: 18.0.1
45+
extra_plugins: |
46+
@semantic-release/changelog
47+
@semantic-release/github
48+
@semantic-release/git
49+
env:
50+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3751

3852
- name: Generate Package
39-
run: dotnet pack -c Release -o out -p:PackageVersion=${{env.PACKAGE_VERSION}} -p:RepositoryUrl=${{env.CURRENT_REPO_URL}}
53+
run: dotnet pack -c Release -o out -p:PackageVersion=${{ steps.semantic.outputs.new_release_version }} -p:RepositoryUrl=${{env.CURRENT_REPO_URL}}
4054

4155
- name: Publish the package to nuget.org
4256
run: dotnet nuget push ./out/*.nupkg --skip-duplicate --no-symbols true -k ${{ secrets.NUGET_AUTH_TOKEN}} -s https://api.nuget.org/v3/index.json

.github/workflows/pull-request.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ jobs:
1212
- name: Checkout repository
1313
uses: actions/checkout@v2
1414

15+
- name: Setup .NET 6
16+
uses: actions/setup-dotnet@v1
17+
with:
18+
dotnet-version: 6.0.x
19+
1520
- name: Setup .NET 5
1621
uses: actions/setup-dotnet@v1
1722
with:

src/NetDevPack.Identity/NetDevPack.Identity.csproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,18 @@
3434
</ItemGroup>
3535

3636
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
37-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
38-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.1" />
39-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.1" />
40-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
37+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.2" />
38+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.2" />
39+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.2" />
40+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
4141
</ItemGroup>
4242

43+
<Target Name="CopyHook" AfterTargets="AfterBuild" Condition=" '$(Configuration)' == 'Debug' ">
44+
<ItemGroup>
45+
<_CustomFiles Include="../../.github/hooks/commit-msg" />
46+
</ItemGroup>
47+
<Copy SourceFiles="@(_CustomFiles)" DestinationFolder="../../.git/hooks" />
48+
</Target>
4349

4450
<ItemGroup>
4551
<None Include="..\..\assets\IconNuget.png">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

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

0 commit comments

Comments
 (0)