Skip to content

Commit bd89d96

Browse files
committed
feat: dotnet 6
BREAKING CHANGE: dotnet 6 version
1 parent ac5d1c2 commit bd89d96

4 files changed

Lines changed: 31 additions & 5 deletions

File tree

.github/workflows/publish-package.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ jobs:
1717
- name: Checkout repository
1818
uses: actions/checkout@v2
1919

20+
- name: Setup .NET 6
21+
uses: actions/setup-dotnet@v1
22+
with:
23+
dotnet-version: 6.0.x
24+
2025
- name: Setup .NET 5
2126
uses: actions/setup-dotnet@v1
2227
with:
@@ -27,11 +32,20 @@ jobs:
2732
with:
2833
dotnet-version: 3.1.x
2934

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

3347
- name: Generate Package
34-
run: dotnet pack -c Release -o out -p:PackageVersion=${{env.PACKAGE_VERSION}} -p:RepositoryUrl=${{env.CURRENT_REPO_URL}}
48+
run: dotnet pack -c Release -o out -p:PackageVersion=${{ steps.semantic.outputs.new_release_version }} -p:RepositoryUrl=${{env.CURRENT_REPO_URL}}
3549

3650
- name: Publish the package to nuget.org
3751
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: 8 additions & 1 deletion
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</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
55
<AssemblyName>NetDevPack.Identity</AssemblyName>
66
<RootNamespace>NetDevPack.Identity</RootNamespace>
77
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -33,6 +33,13 @@
3333
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.6" />
3434
</ItemGroup>
3535

36+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
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" />
41+
</ItemGroup>
42+
3643

3744
<ItemGroup>
3845
<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)