Skip to content

Commit 7db9e90

Browse files
brunobritodevbrunobritodev
committed
net 5
1 parent de2ef36 commit 7db9e90

5 files changed

Lines changed: 99 additions & 38 deletions

File tree

‎.github/workflows/dotnet-core.yml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.github/workflows/publish-package.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Master - Publish packages
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
7+
env:
8+
PACKAGE_MAJOR_VERSION: 5
9+
PACKAGE_MINOR_VERSION: 0
10+
CURRENT_REPO_URL: https://github.com/${{ github.repository }}
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
defaults:
16+
run:
17+
working-directory: src
18+
19+
steps:
20+
- name: Checkout repository
21+
uses: actions/checkout@v2
22+
23+
- name: Setup .NET 5
24+
uses: actions/setup-dotnet@v1
25+
with:
26+
dotnet-version: 5.0.x
27+
28+
- name: Setup .NET Core 3.1
29+
uses: actions/setup-dotnet@v1
30+
with:
31+
dotnet-version: 3.1.x
32+
33+
- name: Generate version
34+
run: echo "PACKAGE_VERSION=$PACKAGE_MAJOR_VERSION.$PACKAGE_MINOR_VERSION.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
35+
36+
- name: Generate Package
37+
run: dotnet pack -c Release -o out -p:PackageVersion=${{env.PACKAGE_VERSION}} -p:RepositoryUrl=${{env.CURRENT_REPO_URL}}
38+
39+
- name: Publish the package to nuget.org
40+
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: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Pull Request Analisys
2+
3+
on:
4+
pull_request:
5+
branches: [ master ]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
defaults:
11+
run:
12+
working-directory: ./src
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v2
17+
18+
- name: Setup .NET 5
19+
uses: actions/setup-dotnet@v1
20+
with:
21+
dotnet-version: 5.0.x
22+
23+
- name: Setup .NET Core 3.1
24+
uses: actions/setup-dotnet@v1
25+
with:
26+
dotnet-version: 3.1.x
27+
28+
- name: Restore dependencies
29+
run: dotnet restore
30+
31+
- name: Build
32+
run: dotnet build --no-restore
33+
34+
- name: Test
35+
run: dotnet test --no-build

‎src/NetDevPack.Identity/NetDevPack.Identity.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
55
<AssemblyName>NetDevPack.Identity</AssemblyName>
66
<RootNamespace>NetDevPack.Identity</RootNamespace>
7-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
87
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
98
<Authors>Eduardo Pires</Authors>
109
<Company>desenvolvedor.io</Company>
@@ -20,18 +19,27 @@
2019
<Version>1.2.0</Version>
2120
</PropertyGroup>
2221

23-
<ItemGroup>
24-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.4" />
25-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.4" />
26-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.1.4" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.4" />
22+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
23+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.15" />
24+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.15" />
25+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.1.15" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.15" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
30+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.6" />
31+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.6" />
32+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.6" />
33+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.6" />
2834
</ItemGroup>
2935

36+
3037
<ItemGroup>
3138
<None Include="..\..\assets\IconNuget.png">
3239
<Pack>True</Pack>
3340
<PackagePath></PackagePath>
3441
</None>
3542
</ItemGroup>
3643

44+
3745
</Project>

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

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

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

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
12-
<PackageReference Include="NetDevPack" Version="1.0.4" />
13-
<PackageReference Include="NetDevPack.Identity" Version="1.2.0" />
14-
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.4" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.4">
12+
<PackageReference Include="NetDevPack" Version="5.0.2" />
13+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.6" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.6">
1716
<PrivateAssets>all</PrivateAssets>
1817
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1918
</PackageReference>
2019
</ItemGroup>
2120

21+
<ItemGroup>
22+
<ProjectReference Include="..\..\NetDevPack.Identity\NetDevPack.Identity.csproj" />
23+
</ItemGroup>
24+
2225
</Project>

0 commit comments

Comments
 (0)