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

Commit 8753a9b

Browse files
Merge branch 'master' into dependabot/docker/node-12.7-alpine
2 parents ad3e6d9 + e5d4ad0 commit 8753a9b

35 files changed

+12964
-12303
lines changed

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build status](https://ci.appveyor.com/api/projects/status/08v6mg6q439x16xt?svg=true)](https://ci.appveyor.com/project/brunohbrito/jp-project)
44
[![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)
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: 1 addition & 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'

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.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" />

src/Backend/Jp.UserManagement/appsettings.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"ConnectionStrings": {
33
// Postgre Connection
4-
//"SSOConnection": "Server=localhost;Port=5432;Database=jpproject;User Id=postgres;Password=@Password1;"
4+
"SSOConnection": "Server=localhost;Port=5432;Database=jpproject;User Id=postgres;Password=@Password1;"
55
// Sql Server connection
6-
"SSOConnection": "Server=.;Initial Catalog=JpProject;Persist Security Info=False;User ID=sa;Password=@Password1;MultipleActiveResultSets=False;Connection Timeout=30;"
6+
//"SSOConnection": "Server=.;Initial Catalog=JpProject;Persist Security Info=False;User ID=sa;Password=@Password1;MultipleActiveResultSets=False;Connection Timeout=30;"
77
// MySql connection
88
// "SSOConnection": "server=localhost,port=3306;database=jpproject;user=bruno;password=10203040"
99
},
@@ -30,7 +30,7 @@
3030
"SendEmail": "false"
3131
},
3232
"ApplicationSettings": {
33-
"DatabaseType": "MySql",
33+
"DatabaseType": "PostgreSQL",
3434
"Authority": "https://localhost:5001"
3535
}
3636
}

0 commit comments

Comments
 (0)