Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit 68c9274

Browse files
committed
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts: # README.md
2 parents 8d5832a + e5d4ad0 commit 68c9274

File tree

36 files changed

+13049
-12301
lines changed

36 files changed

+13049
-12301
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# v1.4.5
2+
3+
1. Updated for IdentityServer4 dependencies for 2.5.
4+
15
# v1.4.0
26
1. Added Translations (auto-generate)
37
* Spanish

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
![image](https://github.com/brunohbrito/JP-Project/blob/master/docs/images/logo.png?raw=true)
22

33
[![Build status](https://ci.appveyor.com/api/projects/status/08v6mg6q439x16xt?svg=true)](https://ci.appveyor.com/project/brunohbrito/jp-project)
4-
[![Build Status](https://dev.azure.com/brunohbrito/JpProject/_apis/build/status/JPProject%20CD%20Build?branchName=master)](https://dev.azure.com/brunohbrito/JpProject/_build/latest?definitionId=2&branchName=master)
5-
[![License](https://img.shields.io/github/license/brunohbrito/jp-project.svg)](LICENSE)
4+
[![Build Status](https://dev.azure.com/brunohbrito/JpProject/_apis/build/status/brunohbrito.JPProject.IdentityServer4.AdminUI?branchName=master)](https://dev.azure.com/brunohbrito/JpProject/_build/latest?definitionId=2&branchName=master)
5+
[![License](https://img.shields.io/github/license/brunohbrito/jp-project.svg)](LICENSE) [![Greenkeeper badge](https://badges.greenkeeper.io/brunohbrito/JPProject.IdentityServer4.AdminUI.svg)](https://greenkeeper.io/)
66
![DOCS](https://readthedocs.org/projects/jp-project/badge/?version=latest&style=flat)
77

88
Jp Project is a Open Source UI Administration Tools for IdentityServer4 v2 - release 2.4.0.

azure-pipelines.pr.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
trigger:
77
- master
8+
- greenkeeper/*
89

910
variables:
1011
BuildConfiguration: 'Release'
@@ -68,3 +69,32 @@ jobs:
6869
command: custom
6970
customCommand: 'run build -- --base-href=/user-management/'
7071
workingDir: src/Frontend/Jp.UserManagement
72+
73+
- job: 'docker'
74+
displayName: 'Docker files'
75+
pool:
76+
vmImage: 'ubuntu-latest'
77+
steps:
78+
- task: Docker@2
79+
displayName: 'Docker - Build - AdminUI'
80+
inputs:
81+
command: 'build'
82+
Dockerfile: '**/admin-ui.dockerfile'
83+
84+
- task: Docker@2
85+
displayName: 'Docker - Build - API'
86+
inputs:
87+
command: 'build'
88+
Dockerfile: '**/api.dockerfile'
89+
90+
- task: Docker@2
91+
displayName: 'Docker - Build - UserManagement'
92+
inputs:
93+
command: 'build'
94+
Dockerfile: '**/ui-user-management.dockerfile'
95+
96+
- task: Docker@2
97+
displayName: 'Docker - Build - SSO'
98+
inputs:
99+
command: 'build'
100+
Dockerfile: '**/sso.dockerfile'

greenkeeper.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"groups": {
3+
"default": {
4+
"packages": [
5+
"src/Frontend/Jp.AdminUI/package.json",
6+
"src/Frontend/Jp.AdminUI/src/assets/fonts/source-sans-pro/package.json",
7+
"src/Frontend/Jp.UI.SSO/package.json",
8+
"src/Frontend/Jp.UserManagement/package.json"
9+
]
10+
}
11+
}
12+
}

src/Backend/Jp.Application/Jp.Application.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="AutoMapper" Version="8.0.0" />
8+
<PackageReference Include="AutoMapper" Version="8.1.1" />
99
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
1010
<PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
1111
</ItemGroup>

src/Backend/Jp.Domain/Jp.Domain.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="FluentValidation" Version="8.4.0" />
14-
<PackageReference Include="IdentityServer4.EntityFramework" Version="2.4.0" />
14+
<PackageReference Include="IdentityServer4.EntityFramework" Version="2.5.0" />
1515
</ItemGroup>
1616

1717
</Project>

src/Backend/Jp.Infra.CrossCutting.IdentityServer/Jp.Infra.CrossCutting.IdentityServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414

1515
<ItemGroup>
16-
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.4.0" />
16+
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.5.0" />
1717
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
1818
</ItemGroup>
1919

src/Backend/Jp.UserManagement/Jp.Management.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />
11-
<PackageReference Include="IdentityServer4" Version="2.4.0" />
10+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.1.1" />
11+
<PackageReference Include="IdentityServer4" Version="2.5.0" />
1212
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
1313
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
1414
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.7.1" />

0 commit comments

Comments
 (0)