Skip to content

Commit

Permalink
Merge pull request #105 from damienbod/dev_5_1_1
Browse files Browse the repository at this point in the history
Update Nuget, npm packages
  • Loading branch information
damienbod authored May 15, 2021
2 parents 7c224c8 + fb76958 commit 1ca7475
Show file tree
Hide file tree
Showing 10 changed files with 133 additions and 55 deletions.
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

[Readme](https://github.com/damienbod/IdentityServer4AspNetCoreIdentityTemplate/blob/master/README.md)

2021-05-15 5.1.1
- Updated nuget and npm packages

2021-01-19 5.1.0
- Switched to Azure.Extensions.AspNetCore.Configuration.Secrets and Azure.Identity for the Azure Key Vault management

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dotnet new -i IdentityServer4AspNetCoreIdentityTemplate
Locally built nupkg:

```
dotnet new -i IdentityServer4AspNetCoreIdentityTemplate.5.0.6.nupkg
dotnet new -i IdentityServer4AspNetCoreIdentityTemplate.5.1.1.nupkg
```

Local folder:
Expand Down
4 changes: 2 additions & 2 deletions content/IdentityServer4AspNetCoreIdentityTemplate.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>IdentityServer4AspNetCoreIdentityTemplate</id>
<version>5.1.0</version>
<version>5.1.1</version>
<title>IdentityServer4.Identity.Template</title>
<license type="file">LICENSE</license>
<description>
Expand All @@ -17,7 +17,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<copyright>2020 damienbod</copyright>
<summary>This template provides a simle getting started for IdentityServer4 with Identity. Identity is Localized and the UI uses Bootstrap 4, Remove AllowAnonymous from the logout</summary>
<releaseNotes>Switched to Azure.Extensions.AspNetCore.Configuration.Secrets and Azure.Identity for the Azure Key Vault management</releaseNotes>
<releaseNotes>Updated packages</releaseNotes>
<repository type="git" url="https://github.com/damienbod/IdentityServer4AspNetCoreIdentityTemplate" />
<packageTypes>
<packageType name="Template" />
Expand Down
2 changes: 1 addition & 1 deletion content/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 damienbod
Copyright (c) 2021 damienbod

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
38 changes: 19 additions & 19 deletions content/StsServerIdentity/StsServerIdentity.csproj
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>5.1.0</Version>
<Version>5.1.1</Version>
<Description>IdentityServer4 template with ASP.NET Core 3.1 and ASP.NET Core Identity</Description>
<PackageProjectUrl>https://github.com/damienbod/IdentityServer4AspNetCoreIdentityTemplate</PackageProjectUrl>
<PackageIconUrl>http://www.gravatar.com/avatar/61d005637f57b5c3da8ba662cf04a9d6.png</PackageIconUrl>
<RepositoryUrl>https://github.com/damienbod/IdentityServer4AspNetCoreIdentityTemplate</RepositoryUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageTags>oidc identityserver4 identity aspnetcore</PackageTags>
<PackageReleaseNotes>Switched to Azure.Extensions.AspNetCore.Configuration.Secrets and Azure.Identity for the Azure Key Vault management</PackageReleaseNotes>
<PackageReleaseNotes>Updated nuget packages</PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.0.2" />
<PackageReference Include="Azure.Identity" Version="1.3.0" />
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.1.0" />
<PackageReference Include="Azure.Identity" Version="1.4.0" />
<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.1.0" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.0" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.1" />
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Include="IdentityServer4" Version="4.1.1" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.11" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.11">
<PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.15" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.15" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.15" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.15">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.11" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.4" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.15" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Remotion.Linq" Version="2.2.0" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.8" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
<PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
<PackageReference Include="Sendgrid" Version="9.22.0" />
<PackageReference Include="Sendgrid" Version="9.23.1" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Fido2" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.11" />
<PackageReference Include="Fido2" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.15" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion content/StsServerIdentity/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<footer>
<hr />
<nav class="navbar transparent navbar-inverse">
<p>&copy; 2020 - StsServerIdentity</p>
<p>&copy; 2021 - StsServerIdentity</p>

</nav>
</footer>
Expand Down
106 changes: 91 additions & 15 deletions content/StsServerIdentity/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions content/StsServerIdentity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
"name": "asp.net",
"private": true,
"devDependencies": {
"bootstrap": "4.5.3",
"jquery": "3.5.1",
"jquery-validation": "1.19.3",
"jquery-validation-unobtrusive": "3.2.11",
"bootstrap": "4.6.0",
"jquery": "3.6.0",
"jquery-ajax-unobtrusive": "3.2.6",
"jquery-validation": "1.19.3",
"jquery-validation-unobtrusive": "3.2.12",
"popper.js": "^1.16.1",
"sweetalert2": "^10.13.0"
},
"dependencies": {}
"sweetalert2": "^11.0.0"
}
}
8 changes: 4 additions & 4 deletions content/StsServerIdentity/wwwroot/css/vendor.min.css

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions content/StsServerIdentity/wwwroot/js/vendor.min.js

Large diffs are not rendered by default.

0 comments on commit 1ca7475

Please sign in to comment.