Skip to content

Commit

Permalink
Merge pull request #750 from skoruba/dev
Browse files Browse the repository at this point in the history
Release/1.0.0
  • Loading branch information
skoruba authored Nov 6, 2020
2 parents 56b909f + 43c1293 commit 59c217b
Show file tree
Hide file tree
Showing 26 changed files with 71 additions and 47 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The application is written in the **Asp.Net Core MVC - using .NET Core 3.1**
- Install the dotnet new template:

```sh
dotnet new -i Skoruba.IdentityServer4.Admin.Templates::1.0.0-rc4
dotnet new -i Skoruba.IdentityServer4.Admin.Templates::1.0.0
```

- Create new project:
Expand Down Expand Up @@ -161,11 +161,11 @@ docker-compose up -d
### Docker images
- Docker images will be available also in [docker hub](https://hub.docker.com/u/skoruba)
- AdminUI:
- `skoruba/identityserver4-admin:rc4`
- `skoruba/identityserver4-admin:1.0.0`
- Admin Api:
- `skoruba/identityserver4-admin-api:rc4`
- `skoruba/identityserver4-admin-api:1.0.0`
- STS:
- `skoruba/identityserver4-sts-identity:rc4`
- `skoruba/identityserver4-sts-identity:1.0.0`

### Publish Docker images to Docker hub
- Check the script in `build/publish-docker-images.ps1` - change the profile name according to your requirements.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<UserSecretsId>1cc472a2-4e4b-48ce-846b-5219f71fc643</UserSecretsId>
Expand Down Expand Up @@ -74,3 +74,4 @@

</Project>


Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<Description>Business Logic layer for the administration of the Asp.Net Core Identity and IdentityServer4</Description>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
Expand Down Expand Up @@ -32,3 +32,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>Shared Business Logic layer for the administration of the IdentityServer4 and Asp.Net Core Identity</Description>
Expand All @@ -15,3 +15,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<Description>Business Logic layer for the administration of the IdentityServer4</Description>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
Expand Down Expand Up @@ -48,3 +48,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>EntityFramework extensions for the administration of the IdentityServer4 and Asp.Net Core Identity</Description>
Expand All @@ -15,3 +15,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<Description>Entity Framework layer for the administration of the Asp.Net Core Identity and IdentityServer4</Description>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
Expand All @@ -24,3 +24,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>Entity Framework layer for the administration of the IdentityServer4 and Asp.Net Core Identity with MySql support</Description>
Expand All @@ -27,3 +27,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>Entity Framework layer for the administration of the IdentityServer4 and Asp.Net Core Identity with PostrgreSQL support</Description>
Expand All @@ -26,3 +26,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>DbContexts and Identity entities for the administration of the IdentityServer4 and Asp.Net Core Identity</Description>
Expand All @@ -13,7 +13,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.6" />
<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0-beta8" />
<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -24,3 +24,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>Entity Framework layer for the administration of the IdentityServer4 and Asp.Net Core Identity with SqlServer support</Description>
Expand All @@ -26,3 +26,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>Entity Framework layer for the administration of the IdentityServer4</Description>
Expand All @@ -13,7 +13,7 @@

<ItemGroup>
<PackageReference Include="IdentityServer4.EntityFramework" Version="3.1.1" />
<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0-beta8" />
<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -23,3 +23,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<LangVersion>latest</LangVersion>
<UserSecretsId>8fe260ca-ef4c-4fa3-9364-029146f8d339</UserSecretsId>
Expand Down Expand Up @@ -133,3 +133,4 @@

</Project>


Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<UserSecretsId>9c91d295-54c5-4d09-9bd6-fa56fb74011b</UserSecretsId>
<DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
Expand Down Expand Up @@ -44,7 +44,7 @@
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="5.5.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0-beta8" />
<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -94,3 +94,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>Shared common layer for the administration of the IdentityServer4 and Asp.Net Core Identity</Description>
Expand All @@ -28,3 +28,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Skoruba.IdentityServer4.Admin.Templates</id>
<version>1.0.0-rc4</version>
<version>1.0.0</version>
<authors>Jan Škoruba</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<licenseUrl>https://github.com/skoruba/IdentityServer4.Admin/blob/master/LICENSE.md</licenseUrl>
Expand All @@ -18,3 +18,4 @@
</package>



Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Skoruba.IdentityServer4.Admin.Templates</id>
<version>1.0.0-rc4</version>
<version>1.0.0</version>
<authors>Jan Škoruba</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<licenseUrl>https://github.com/skoruba/IdentityServer4.Admin/blob/master/LICENSE.md</licenseUrl>
Expand All @@ -18,3 +18,4 @@
</package>



Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<UserSecretsId>1cc472a2-4e4b-48ce-846b-5219f71fc643</UserSecretsId>
Expand Down Expand Up @@ -34,8 +34,8 @@
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.BusinessLogic" Version="1.0.0-rc4" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.BusinessLogic.Identity" Version="1.0.0-rc4" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.BusinessLogic" Version="1.0.0" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.BusinessLogic.Identity" Version="1.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="5.5.1" />
<PackageReference Include="Serilog" Version="2.9.0" />
Expand Down Expand Up @@ -79,3 +79,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>Entity Framework layer for the administration of the IdentityServer4 and Asp.Net Core Identity with MySql support</Description>
Expand All @@ -15,8 +15,8 @@
<PackageReference Include="IdentityServer4.EntityFramework.Storage" Version="3.1.1" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework" Version="1.0.0-rc4" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework.Identity" Version="1.0.0-rc4" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework" Version="1.0.0" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework.Identity" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -33,3 +33,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>Entity Framework layer for the administration of the IdentityServer4 and Asp.Net Core Identity with PostrgreSQL support</Description>
Expand All @@ -14,8 +14,8 @@
<ItemGroup>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
<PackageReference Include="IdentityServer4.EntityFramework.Storage" Version="3.1.1" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework" Version="1.0.0-rc4" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework.Identity" Version="1.0.0-rc4" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework" Version="1.0.0" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework.Identity" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -32,3 +32,4 @@




Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.0-rc4</Version>
<Version>1.0.0</Version>
<Authors>Jan Škoruba</Authors>
<PackageTags>IdentityServer4 Admin OpenIDConnect OAuth2 Identity</PackageTags>
<Description>DbContexts and Identity entities for the administration of the IdentityServer4 and Asp.Net Core Identity</Description>
Expand All @@ -13,9 +13,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.6" />
<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0-beta8" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework" Version="1.0.0-rc4" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework.Identity" Version="1.0.0-rc4" />
<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework" Version="1.0.0" />
<PackageReference Include="Skoruba.IdentityServer4.Admin.EntityFramework.Identity" Version="1.0.0" />
</ItemGroup>
</Project>

Expand All @@ -27,3 +27,4 @@




Loading

0 comments on commit 59c217b

Please sign in to comment.