Skip to content

Commit 9ba9f5d

Browse files
damienboddamienbod
authored
Merge pull request #109 from damienbod/dev-net6
Update .NET 6
2 parents 02f18be + eb919c0 commit 9ba9f5d

13 files changed

Lines changed: 66 additions & 48 deletions

‎.github/workflows/dotnet.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: .NET
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Setup .NET
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: '6.0'
20+
include-prerelease: True
21+
- name: Restore dependencies
22+
run: dotnet restore ./content/StsServerIdentity
23+
- name: Build STS
24+
run: dotnet build ./content/StsServerIdentity/StsServerIdentity.csproj --no-restore
25+
- name: Test
26+
run: dotnet test --no-build --verbosity normal

‎Changelog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

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

5+
2021-11-12 6.0.0
6+
- Updated to .NET 6
7+
58
2021-08-19 5.1.3
69
- remove unused dependency
710
- make CSP less restrictive for getting started

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## Features
66

7-
- ASP.NET Core 3.1
7+
- ASP.NET Core 6
88
- Latest ASP.NET Core Identity
99
- Bootstrap 4 UI
1010
- Localization en-US, de-DE, it-IT, fr-FR, zh-Hans, es-MX, de-CH, ga-IE, gsw-CH
@@ -53,7 +53,7 @@ dotnet new -i IdentityServer4AspNetCoreIdentityTemplate
5353
Locally built nupkg:
5454

5555
```
56-
dotnet new -i IdentityServer4AspNetCoreIdentityTemplate.5.1.1.nupkg
56+
dotnet new -i IdentityServer4AspNetCoreIdentityTemplate.6.0.0.nupkg
5757
```
5858

5959
Local folder:

‎appveyor.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎content/IdentityServer4AspNetCoreIdentityTemplate.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
<id>IdentityServer4AspNetCoreIdentityTemplate</id>
5-
<version>5.1.3</version>
5+
<version>6.0.0</version>
66
<title>IdentityServer4.Identity.Template</title>
77
<license type="file">LICENSE</license>
88
<description>
@@ -17,7 +17,7 @@
1717
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1818
<copyright>2020 damienbod</copyright>
1919
<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>
20-
<releaseNotes>Updated packages, updated security headers</releaseNotes>
20+
<releaseNotes>Updated packages to .NET 6</releaseNotes>
2121
<repository type="git" url="https://github.com/damienbod/IdentityServer4AspNetCoreIdentityTemplate" />
2222
<packageTypes>
2323
<packageType name="Template" />

‎content/StsServerIdentity/Startup.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
153153
if (_environment.IsDevelopment())
154154
{
155155
app.UseDeveloperExceptionPage();
156-
app.UseDatabaseErrorPage();
157156
}
158157
else
159158
{

‎content/StsServerIdentity/StsServerIdentity.csproj‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<Version>5.1.3</Version>
5-
<Description>IdentityServer4 template with ASP.NET Core 3.1 and ASP.NET Core Identity</Description>
3+
<TargetFramework>netcoreapp6.0</TargetFramework>
4+
<Version>6.0.0</Version>
5+
<Description>IdentityServer4 template with ASP.NET Core 6 and ASP.NET Core Identity</Description>
66
<PackageProjectUrl>https://github.com/damienbod/IdentityServer4AspNetCoreIdentityTemplate</PackageProjectUrl>
77
<PackageIconUrl>http://www.gravatar.com/avatar/61d005637f57b5c3da8ba662cf04a9d6.png</PackageIconUrl>
88
<RepositoryUrl>https://github.com/damienbod/IdentityServer4AspNetCoreIdentityTemplate</RepositoryUrl>
99
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1010
<PackageTags>oidc identityserver4 identity aspnetcore</PackageTags>
1111
<PackageReleaseNotes>Updated nuget packages</PackageReleaseNotes>
12+
<Copyright>2021</Copyright>
1213
</PropertyGroup>
1314
<ItemGroup>
1415
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.1" />
15-
<PackageReference Include="Azure.Identity" Version="1.4.1" />
16+
<PackageReference Include="Azure.Identity" Version="1.5.0" />
1617
<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.2.0" />
17-
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.1" />
18+
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
1819
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
1920
<PackageReference Include="IdentityServer4" Version="4.1.2" />
2021
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.2" />
21-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.18" />
22-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.18" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.18" />
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.18">
22+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.0" />
23+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
2526
<PrivateAssets>all</PrivateAssets>
2627
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2728
</PackageReference>
28-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.18" />
29-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.5" />
29+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
30+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
3031
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
3132
<PackageReference Include="Remotion.Linq" Version="2.2.0" />
3233
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
33-
<PackageReference Include="Sendgrid" Version="9.24.2" />
34+
<PackageReference Include="Sendgrid" Version="9.24.4" />
3435
<PackageReference Include="Serilog" Version="2.10.0" />
3536
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
36-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.2.0" />
37+
<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
3738
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
3839
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
3940
<PackageReference Include="Fido2" Version="2.0.2" />
40-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.18" />
41+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
4142
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.16.0" />
4243
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="0.16.0" />
4344
</ItemGroup>

‎content/StsServerIdentity/bundleconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"node_modules/sweetalert2/dist/sweetalert2.all.min.js"
4141
],
4242
"minify": {
43-
"enabled": true,
43+
"enabled": false,
4444
"renameLocals": true
4545
},
4646
"sourceMap": false

‎content/StsServerIdentity/package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎content/StsServerIdentity/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"jquery-validation": "1.19.3",
1010
"jquery-validation-unobtrusive": "3.2.12",
1111
"popper.js": "^1.16.1",
12-
"sweetalert2": "^11.0.0"
12+
"sweetalert2": "^11.1.10"
1313
}
1414
}

0 commit comments

Comments
 (0)