Skip to content

Commit 0601b49

Browse files
mario-rojasmario-rojas
authored
Merge pull request skoruba#1 from skoruba/master
Merge from Skoruba repository
2 parents 2038b79 + 561c380 commit 0601b49

File tree

1,078 files changed

+50467
-5859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,078 files changed

+50467
-5859
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,3 +280,7 @@ __pycache__/
280280
!/src/Skoruba.IdentityServer4.Admin/Views/Log/
281281
!/src/Skoruba.IdentityServer4.Admin.BusinessLogic/Events/Log/
282282
/src/Skoruba.IdentityServer4.Admin.Api/appsettings.Production.json
283+
284+
appsettings.*.json
285+
286+
/shared/nginx/certs/

‎README.md‎

Lines changed: 95 additions & 19 deletions
Large diffs are not rendered by default.

‎Skoruba.IdentityServer4.Admin.sln‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "business", "business", "{EE
4747
EndProject
4848
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Admin.EntityFramework.MySql", "src\Skoruba.IdentityServer4.Admin.EntityFramework.MySql\Skoruba.IdentityServer4.Admin.EntityFramework.MySql.csproj", "{0A8A0DB7-0509-4DFB-9201-74398511B481}"
4949
EndProject
50-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skoruba.IdentityServer4.Admin.Api.IntegrationTests", "tests\Skoruba.IdentityServer4.Admin.Api.IntegrationTests\Skoruba.IdentityServer4.Admin.Api.IntegrationTests.csproj", "{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0}"
50+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Admin.Api.IntegrationTests", "tests\Skoruba.IdentityServer4.Admin.Api.IntegrationTests\Skoruba.IdentityServer4.Admin.Api.IntegrationTests.csproj", "{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0}"
51+
EndProject
52+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Shared", "src\Skoruba.IdentityServer4.Shared\Skoruba.IdentityServer4.Shared.csproj", "{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}"
5153
EndProject
5254
Global
5355
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -127,6 +129,10 @@ Global
127129
{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
128130
{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
129131
{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0}.Release|Any CPU.Build.0 = Release|Any CPU
132+
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
133+
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
134+
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
135+
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Release|Any CPU.Build.0 = Release|Any CPU
130136
EndGlobalSection
131137
GlobalSection(SolutionProperties) = preSolution
132138
HideSolutionNode = FALSE
@@ -149,6 +155,7 @@ Global
149155
{3ECDC91E-0D3E-4E4D-A34E-D33BB714578D} = {2A514C8F-6A53-41CA-AB41-B644E7BC92A7}
150156
{0A8A0DB7-0509-4DFB-9201-74398511B481} = {2A514C8F-6A53-41CA-AB41-B644E7BC92A7}
151157
{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0} = {0BC0CC4E-A0F1-45E8-B41A-AE0FA76BF3E5}
158+
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5} = {EE588CE5-51D0-4E98-A2B3-40EC8E655931}
152159
EndGlobalSection
153160
GlobalSection(ExtensibilityGlobals) = postSolution
154161
SolutionGuid = {B3166EDE-037B-4C68-BEBA-5DE9C5E3DB82}

‎build/add-migrations.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ $targetContexts = @{
1212
IdentityServerConfigurationDbContext = "Migrations\IdentityServerConfiguration";
1313
IdentityServerPersistedGrantDbContext = "Migrations\IdentityServerGrants";
1414
AdminAuditLogDbContext = "Migrations\AuditLogging";
15+
IdentityServerDataProtectionDbContext = "Migrations\DataProtection";
1516
}
1617

1718
#Initialize the db providers and it's respective projects
@@ -24,7 +25,7 @@ $dpProviders = @{
2425
#Fix issue when the tools is not installed and the nuget package does not work see https://github.com/MicrosoftDocs/azure-docs/issues/40048
2526
Write-Host "Updating donet ef tools"
2627
$env:Path += " % USERPROFILE % \.dotnet\tools";
27-
dotnet tool update --global dotnet-ef --version 3.1.0
28+
dotnet tool update --global dotnet-ef
2829

2930
Write-Host "Start migrate projects"
3031
foreach ($provider in $dpProviders.Keys) {

‎build/create-nuget-packages.ps1‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
$packagesOutput = ".\packages"
2+
3+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.BusinessLogic\Skoruba.IdentityServer4.Admin.BusinessLogic.csproj -c Release -o $packagesOutput
4+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.BusinessLogic.Identity\Skoruba.IdentityServer4.Admin.BusinessLogic.Identity.csproj -c Release -o $packagesOutput
5+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.BusinessLogic.Shared\Skoruba.IdentityServer4.Admin.BusinessLogic.Shared.csproj -c Release -o $packagesOutput
6+
7+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.EntityFramework\Skoruba.IdentityServer4.Admin.EntityFramework.csproj -c Release -o $packagesOutput
8+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.EntityFramework.Extensions\Skoruba.IdentityServer4.Admin.EntityFramework.Extensions.csproj -c Release -o $packagesOutput
9+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.EntityFramework.Identity\Skoruba.IdentityServer4.Admin.EntityFramework.Identity.csproj -c Release -o $packagesOutput
10+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.EntityFramework.Shared\Skoruba.IdentityServer4.Admin.EntityFramework.Shared.csproj -c Release -o $packagesOutput

‎build/publish-docker-images.ps1‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
param([string] $version)
2+
13
# build docker images according to docker-compose
24
docker-compose build
35

46
# rename images with following tag
5-
docker tag skoruba-identityserver4-admin skoruba/identityserver4-admin:rc1
6-
docker tag skoruba-identityserver4-sts-identity skoruba/identityserver4-sts-identity:rc1
7-
docker tag skoruba-identityserver4-admin-api skoruba/identityserver4-admin-api:rc1
7+
docker tag skoruba-identityserver4-admin skoruba/identityserver4-admin:$version
8+
docker tag skoruba-identityserver4-sts-identity skoruba/identityserver4-sts-identity:$version
9+
docker tag skoruba-identityserver4-admin-api skoruba/identityserver4-admin-api:$version
810

911
# push to docker hub
10-
docker push skoruba/identityserver4-admin:rc1
11-
docker push skoruba/identityserver4-admin-api:rc1
12-
docker push skoruba/identityserver4-sts-identity:rc1
12+
docker push skoruba/identityserver4-admin:$version
13+
docker push skoruba/identityserver4-admin-api:$version
14+
docker push skoruba/identityserver4-sts-identity:$version

‎build/publish-nuget-packages.ps1‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
param([string] $version, [string] $key)
2+
3+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.BusinessLogic.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
4+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.BusinessLogic.Identity.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
5+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.BusinessLogic.Shared.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
6+
7+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.EntityFramework.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
8+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.EntityFramework.Extensions.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
9+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.EntityFramework.Identity.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
10+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.EntityFramework.Shared.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json

‎build/update-projects-version.ps1‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
param([string] $old, [string] $new)
2+
3+
$oldVersion = "<Version>$old</Version>"
4+
$newVersion = "<Version>$new</Version>"
5+
6+
$oldVersionNuspec = "<version>$old</version>"
7+
$newVersionNuspec = "<version>$new</version>"
8+
9+
$projectFiles = Get-ChildItem .\..\src -include *.csproj -Recurse
10+
foreach ($file in $projectFiles) {
11+
Write-Host $file.PSPath
12+
13+
(Get-Content $file.PSPath -raw -Encoding UTF8) |
14+
Foreach-Object { $_ -replace $oldVersion, $newVersion } |
15+
Set-Content $file.PSPath -Encoding UTF8
16+
}
17+
18+
$templateFiles = Get-ChildItem .\..\templates -include *.nuspec -Recurse
19+
foreach ($file in $templateFiles) {
20+
Write-Host $file.PSPath
21+
22+
(Get-Content $file.PSPath -raw -Encoding UTF8) |
23+
Foreach-Object { $_ -replace $oldVersionNuspec, $newVersionNuspec } |
24+
Set-Content $file.PSPath -Encoding UTF8
25+
}

‎docker-compose.dcproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<None Include="docker-compose.override.yml">
1616
<DependentUpon>docker-compose.yml</DependentUpon>
1717
</None>
18+
<None Include="docker-compose.vs.release.yml">
19+
<DependentUpon>docker-compose.yml</DependentUpon>
20+
</None>
1821
<None Include="docker-compose.yml" />
1922
<None Include=".dockerignore" />
2023
</ItemGroup>

‎docker-compose.override.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,17 @@ services:
44
skoruba.identityserver4.admin:
55
environment:
66
- ASPNETCORE_ENVIRONMENT=Development
7-
ports:
8-
- "80"
97
volumes:
108
- ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
9+
1110
skoruba.identityserver4.admin.api:
1211
environment:
1312
- ASPNETCORE_ENVIRONMENT=Development
14-
ports:
15-
- "80"
1613
volumes:
1714
- ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
1815

1916
skoruba.identityserver4.sts.identity:
2017
environment:
2118
- ASPNETCORE_ENVIRONMENT=Development
22-
ports:
23-
- "80"
2419
volumes:
2520
- ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro

0 commit comments

Comments
 (0)