From f9a8011ba920a80d77edafa6a5ca1bae67f27d3f Mon Sep 17 00:00:00 2001
From: Joe DeCock <josephdecock@gmail.com>
Date: Fri, 17 Nov 2023 15:13:35 -0600
Subject: [PATCH] Update AspNetIdentity to v7

---
 .../v7/AspNetIdentity/.vscode/launch.json     | 48 +++++++++++++++++++
 .../v7/AspNetIdentity/.vscode/tasks.json      | 41 ++++++++++++++++
 .../v7/AspNetIdentity/Client/Client.csproj    |  4 +-
 .../IdentityServerAspNetIdentity.csproj       | 18 +++----
 .../IdentityServerAspNetIdentity/Startup.cs   |  6 ---
 IdentityServer/v7/global.json                 |  2 +-
 6 files changed, 101 insertions(+), 18 deletions(-)
 create mode 100644 IdentityServer/v7/AspNetIdentity/.vscode/launch.json
 create mode 100644 IdentityServer/v7/AspNetIdentity/.vscode/tasks.json

diff --git a/IdentityServer/v7/AspNetIdentity/.vscode/launch.json b/IdentityServer/v7/AspNetIdentity/.vscode/launch.json
new file mode 100644
index 00000000..464a0866
--- /dev/null
+++ b/IdentityServer/v7/AspNetIdentity/.vscode/launch.json
@@ -0,0 +1,48 @@
+{
+    "version": "0.2.0",
+    "compounds": [
+        {
+          "name": "Run All",
+          "configurations": ["IdentityServer", "Client"],
+          "presentation": {
+            "group": "10-compunds",
+          }
+        }
+    ],
+    "configurations": [
+        {
+            "name": "IdentityServer",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-identityserver",
+            "program": "${workspaceFolder}/IdentityServerAspNetIdentity/bin/Debug/net8.0/IdentityServerAspNetIdentity.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/IdentityServerAspNetIdentity",
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "console": "externalTerminal",
+        },
+        {
+            "name": "Client",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-client",
+            "program": "${workspaceFolder}/Client/bin/Debug/net8.0/Client.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/Client",
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "console": "externalTerminal",
+          }
+    ]
+}
\ No newline at end of file
diff --git a/IdentityServer/v7/AspNetIdentity/.vscode/tasks.json b/IdentityServer/v7/AspNetIdentity/.vscode/tasks.json
new file mode 100644
index 00000000..c66bb8a7
--- /dev/null
+++ b/IdentityServer/v7/AspNetIdentity/.vscode/tasks.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "type": "process",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "${workspaceFolder}/AspNetIdentitySample.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build-identityserver",
+            "type": "process",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "${workspaceFolder}/IdentityServerAspNetIdentity",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build-client",
+            "type": "process",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "${workspaceFolder}/Client",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/IdentityServer/v7/AspNetIdentity/Client/Client.csproj b/IdentityServer/v7/AspNetIdentity/Client/Client.csproj
index 0eb786d6..f3e670c9 100755
--- a/IdentityServer/v7/AspNetIdentity/Client/Client.csproj
+++ b/IdentityServer/v7/AspNetIdentity/Client/Client.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj b/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj
index e7445a1e..63a3428e 100755
--- a/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj
+++ b/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>aspnet-WebApplication1-28A0C71B-1513-41CA-97E3-79006F6EEC18</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="6.0.0" />
+    <PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.0.0-preview.2" />
     
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/Startup.cs b/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/Startup.cs
index 23673731..63700924 100755
--- a/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/Startup.cs
+++ b/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/Startup.cs
@@ -1,18 +1,12 @@
 using Duende.IdentityServer.Models;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Identity.UI;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Hosting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using IdentityServerAspNetIdentity.Data;
 
 namespace IdentityServerAspNetIdentity
diff --git a/IdentityServer/v7/global.json b/IdentityServer/v7/global.json
index b8d594be..72d38cd2 100755
--- a/IdentityServer/v7/global.json
+++ b/IdentityServer/v7/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "8.0.100",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }