Merge branch 'dotnet6' into main

.config/dotnet-tools.json

@@ -9,7 +9,7 @@
       ]
     },
     "dotnet-ef": {
-      "version": "3.1.0",
+      "version": "6.0.8",
       "commands": [
         "dotnet-ef"
       ]

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@ Then we can decide if and how a feature or a change could be implemented and if
 Also read this first: [Being a good open source citizen](https://hackernoon.com/being-a-good-open-source-citizen-9060d0ab9732#.x3hocgw85)
 
 ## Found an issue or a bug?
-Please start a discussion on the [core repo issue tracker](https://github.com/IdentityServer/IdentityServer4/issues).
+Please start a discussion on the [core repo issue tracker](https://github.com/LacunaSoftware/IdentityServer4/issues).
 
 ## Filing issues
 The best way to get your bug fixed is to be as detailed as you can be about the problem.

.github/FUNDING.yml

@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
-github: brockallen
-patreon: identityserver
+github: LacunaSoftware
+patreon: # Replace with patreon
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

.github/ISSUE_TEMPLATE/Question.md

@@ -1,11 +1,4 @@
 ---
 name: Question
-about: This repo is not maintained anyone. All new work happens under the new organization https://github.com/DuendeSoftware.
 labels: question
 ---
-
-<!--
-  ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️
-This repo is not maintained anyone. All new work happens under the new organization: https://github.com/DuendeSoftware.
-  ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️
--->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,23 @@
-**At this point we cannot accept PRs anymore. Thanks!**
+# Pull Request Template
 
-This organization is not maintained anymore besides critical security bugfixes (if feasible). This organization will be archived when .NET Core 3.1 end of support is reached (3rd Dec 2022). All new development is happening in the new [Duende Software](https://github.com/duendesoftware) organization. 
+## Description
 
-The new [Duende IdentityServer](https://duendesoftware.com/products/identityserver) comes with a commercial license but is [free](https://blog.duendesoftware.com/posts/20220111_fair_trade/) for dev/testing/personal projects and companies or individuals making less than 1M USD gross annnual revenue. Please [get in touch with us](https://duendesoftware.com/contact) if you have any question.
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+## How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+- [ ] Test A
+- [ ] Test B

.github/stale.yml

@@ -14,7 +14,5 @@ staleLabel: wontfix
 markComment: >
   This issue has been automatically marked as stale because it has not had recent activity. 
   It will be closed if no further activity occurs.
-  
-  Questions are community supported only and the authors/maintainers may or may not have time to reply. If you or your company would like commercial support, please see [here](https://identityserver4.readthedocs.io/en/latest/intro/support.html#commercial-support) for more information.
 # Comment to post when closing a stale issue. Set to `false` to disable
 closeComment: false

README.md

@@ -1,7 +1,13 @@
-# Important update
-This organization is not maintained anymore besides critical security bugfixes (if feasible). This organization will be archived when .NET Core 3.1 end of support is reached (3rd Dec 2022). All new development is happening in the new [Duende Software](https://github.com/duendesoftware) organization. 
+# Important notice
+This is a fork of IdentityServer4 that is meant to keep existing software that depends on IdentityServer4 updated with the latest .NET framework version.
 
-The new [Duende IdentityServer](https://duendesoftware.com/products/identityserver) comes with a commercial license but is [free](https://blog.duendesoftware.com/posts/20220111_fair_trade/) for dev/testing/personal projects and companies or individuals making less than 1M USD gross annnual revenue. Please [get in touch with us](https://duendesoftware.com/contact) if you have any question.
+For a state of the art implementation, updates and innovations please use [Duende IdentityServer](https://duendesoftware.com/products/identityserver).
+
+## Changes to IdentityServer4
+Our goal is to keep any core changes to IdentityServer4 to a minimal so compatibility is maximized. Below you can find some of those changes in order to decide if they could affect your project:
+
+* Api Resource Scopes can be used as Api Scopes: when validating a authorize request, IdentityServer4 validates scopes based on existing Api Resources and Api Scopes. We have 
+updated this code to match requested scopes with Api Resource Scopes as well.
 
 ## About IdentityServer4
 [<img align="right" width="100px" src="https://dotnetfoundation.org/img/logo_big.svg" />](https://dotnetfoundation.org/projects?searchquery=IdentityServer&type=project)
@@ -14,42 +20,23 @@ It is part of the [.NET Foundation](https://www.dotnetfoundation.org/), and oper
 For project documentation, please visit [readthedocs](https://identityserver4.readthedocs.io).
 
 ## Branch structure
-Active development happens on the main branch. This always contains the latest version. Each (pre-) release is tagged with the corresponding version. The [aspnetcore1](https://github.com/IdentityServer/IdentityServer4/tree/aspnetcore1) and [aspnetcore2](https://github.com/IdentityServer/IdentityServer4/tree/aspnetcore2) branches contain the latest versions of the older ASP.NET Core based versions.
+Active development happens on the main branch. This always contains the latest version. Each (pre-) release is tagged with the corresponding version.
 
 ## How to build
 
-* [Install](https://www.microsoft.com/net/download/core#/current) the latest .NET Core 3.1 SDK
+* [Install](https://www.microsoft.com/net/download/core#/current) the latest .NET 6 SDK
 * Install Git
 * Clone this repo
 * Run `build.ps1` or `build.sh` in the root of the cloned repo
 
 ## Documentation
 For project documentation, please visit [readthedocs](https://identityserver4.readthedocs.io).
 
-See [here](http://docs.identityserver.io/en/aspnetcore1/) for the 1.x docs, and [here](http://docs.identityserver.io/en/aspnetcore2/) for the 2.x docs.
-
 ## Bug reports and feature requests
-Please use the [issue tracker](https://github.com/IdentityServer/IdentityServer4/issues) for that. We only support the latest version for free. For older versions, you can get a commercial support agreement with us.
-
-## Commercial and Community Support
-If you need help with implementing IdentityServer4 or your security architecture in general, there are both free and commercial support options.
-See [here](https://identityserver4.readthedocs.io/en/latest/intro/support.html) for more details.
-
-## Sponsorship
-If you are a fan of the project or a company that relies on IdentityServer, you might want to consider sponsoring.
-This will help us devote more time to answering questions and doing feature development. If you are interested please head to our [Patreon](https://www.patreon.com/identityserver) page which has further details.
+Please use the [issue tracker](https://github.com/LacunaSoftware/IdentityServer4/issues) for that.
 
-### Platinum Sponsors
-[<img src="https://user-images.githubusercontent.com/1454075/62819413-39550c00-bb55-11e9-8f2f-a268c3552c71.png" width="200">](https://udelt.no)
-
-[<img src="https://user-images.githubusercontent.com/1454075/66454740-fb973580-ea68-11e9-9993-6c1014881528.png" width="200">](https://github.com/dotnet-at-microsoft)
-
-### Corporate Sponsors
-[Ritter Insurance Marketing](https://www.ritterim.com)  
-[ExtraNetUserManager](https://www.extranetusermanager.com/)  
-[Knab](https://www.knab.nl/)
-
-You can see a list of our current sponsors [here](https://github.com/IdentityServer/IdentityServer4/blob/main/SPONSORS.md) - and for companies we have some nice advertisement options as well.
+## Help wanted
+If you would like to contribute to this project feel free to use the issue tracker and/or submit Pull Requests.
 
 ## Acknowledgements
 IdentityServer4 is built using the following great open source projects and free services:
@@ -62,5 +49,3 @@ IdentityServer4 is built using the following great open source projects and free
 * [XUnit](https://xunit.github.io/)
 * [Fluent Assertions](http://www.fluentassertions.com/)
 * [GitReleaseManager](https://github.com/GitTools/GitReleaseManager)
-
-..and last but not least a big thanks to all our [contributors](https://github.com/IdentityServer/IdentityServer4/graphs/contributors)!

SECURITY.MD

@@ -1,6 +1,6 @@
 # Reporting Security Issues
 
-If you discover a security issue in IdentityServer, please report it by sending an email to [email protected]
+If you discover a security issue in IdentityServer, please report it by sending an email to [email protected].
 
 This will allow us to assess the risk, and make a fix available before we add a bug report to the GitHub repository.
 

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.1.402"
+    "version": "6.0.400"
   }
 }

samples/Clients/readme.md

@@ -1,3 +1,3 @@
 The client samples are designed to be used with the host in this repo:
 
-https://github.com/IdentityServer/IdentityServer4/tree/main/src/IdentityServer4
+https://github.com/LacunaSoftware/IdentityServer4/tree/main/src/IdentityServer4

src/AspNetIdentity/README.md

@@ -6,4 +6,4 @@ You can find a detailed walk-through for ASP.NET Core Identity integration [here
 
 ## Issues
 
-For issues, use the [consolidated IdentityServer4 issue tracker](https://github.com/IdentityServer/IdentityServer4/issues).
+For issues, use the [consolidated IdentityServer4 issue tracker](https://github.com/LacunaSoftware/IdentityServer4/issues).

src/AspNetIdentity/host/Host.csproj

@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.9.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Serilog" Version="2.11.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb.sql

@@ -6,7 +6,9 @@ BEGIN
         CONSTRAINT [PK___EFMigrationsHistory] PRIMARY KEY ([MigrationId])
     );
 END;
+GO
 
+BEGIN TRANSACTION;
 GO
 
 CREATE TABLE [AspNetRoles] (
@@ -16,7 +18,6 @@ CREATE TABLE [AspNetRoles] (
     [ConcurrencyStamp] nvarchar(max) NULL,
     CONSTRAINT [PK_AspNetRoles] PRIMARY KEY ([Id])
 );
-
 GO
 
 CREATE TABLE [AspNetUsers] (
@@ -37,7 +38,6 @@ CREATE TABLE [AspNetUsers] (
     [AccessFailedCount] int NOT NULL,
     CONSTRAINT [PK_AspNetUsers] PRIMARY KEY ([Id])
 );
-
 GO
 
 CREATE TABLE [AspNetRoleClaims] (
@@ -48,7 +48,6 @@ CREATE TABLE [AspNetRoleClaims] (
     CONSTRAINT [PK_AspNetRoleClaims] PRIMARY KEY ([Id]),
     CONSTRAINT [FK_AspNetRoleClaims_AspNetRoles_RoleId] FOREIGN KEY ([RoleId]) REFERENCES [AspNetRoles] ([Id]) ON DELETE CASCADE
 );
-
 GO
 
 CREATE TABLE [AspNetUserClaims] (
@@ -59,7 +58,6 @@ CREATE TABLE [AspNetUserClaims] (
     CONSTRAINT [PK_AspNetUserClaims] PRIMARY KEY ([Id]),
     CONSTRAINT [FK_AspNetUserClaims_AspNetUsers_UserId] FOREIGN KEY ([UserId]) REFERENCES [AspNetUsers] ([Id]) ON DELETE CASCADE
 );
-
 GO
 
 CREATE TABLE [AspNetUserLogins] (
@@ -70,7 +68,6 @@ CREATE TABLE [AspNetUserLogins] (
     CONSTRAINT [PK_AspNetUserLogins] PRIMARY KEY ([LoginProvider], [ProviderKey]),
     CONSTRAINT [FK_AspNetUserLogins_AspNetUsers_UserId] FOREIGN KEY ([UserId]) REFERENCES [AspNetUsers] ([Id]) ON DELETE CASCADE
 );
-
 GO
 
 CREATE TABLE [AspNetUserRoles] (
@@ -80,7 +77,6 @@ CREATE TABLE [AspNetUserRoles] (
     CONSTRAINT [FK_AspNetUserRoles_AspNetRoles_RoleId] FOREIGN KEY ([RoleId]) REFERENCES [AspNetRoles] ([Id]) ON DELETE CASCADE,
     CONSTRAINT [FK_AspNetUserRoles_AspNetUsers_UserId] FOREIGN KEY ([UserId]) REFERENCES [AspNetUsers] ([Id]) ON DELETE CASCADE
 );
-
 GO
 
 CREATE TABLE [AspNetUserTokens] (
@@ -91,39 +87,33 @@ CREATE TABLE [AspNetUserTokens] (
     CONSTRAINT [PK_AspNetUserTokens] PRIMARY KEY ([UserId], [LoginProvider], [Name]),
     CONSTRAINT [FK_AspNetUserTokens_AspNetUsers_UserId] FOREIGN KEY ([UserId]) REFERENCES [AspNetUsers] ([Id]) ON DELETE CASCADE
 );
-
 GO
 
 CREATE INDEX [IX_AspNetRoleClaims_RoleId] ON [AspNetRoleClaims] ([RoleId]);
-
 GO
 
 CREATE UNIQUE INDEX [RoleNameIndex] ON [AspNetRoles] ([NormalizedName]) WHERE [NormalizedName] IS NOT NULL;
-
 GO
 
 CREATE INDEX [IX_AspNetUserClaims_UserId] ON [AspNetUserClaims] ([UserId]);
-
 GO
 
 CREATE INDEX [IX_AspNetUserLogins_UserId] ON [AspNetUserLogins] ([UserId]);
-
 GO
 
 CREATE INDEX [IX_AspNetUserRoles_RoleId] ON [AspNetUserRoles] ([RoleId]);
-
 GO
 
 CREATE INDEX [EmailIndex] ON [AspNetUsers] ([NormalizedEmail]);
-
 GO
 
 CREATE UNIQUE INDEX [UserNameIndex] ON [AspNetUsers] ([NormalizedUserName]) WHERE [NormalizedUserName] IS NOT NULL;
-
 GO
 
 INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
-VALUES (N'20200323135751_Users', N'3.1.0');
+VALUES (N'20220905130155_Users', N'6.0.8');
+GO
 
+COMMIT;
 GO