From 6b1c680fab4c42c05706bcd85bcdcea86dc6691d Mon Sep 17 00:00:00 2001
From: janskoruba <jan@skoruba.com>
Date: Sat, 18 Dec 2021 19:24:23 +0100
Subject: [PATCH 1/4] Add missing TargetFramework in csproj, because it was not
 possible to build docker images.

---
 Directory.Build.props                                          | 3 +--
 .../Skoruba.Duende.IdentityServer.Admin.Api.csproj             | 3 ++-
 ...a.Duende.IdentityServer.Admin.BusinessLogic.Identity.csproj | 1 +
 ...uba.Duende.IdentityServer.Admin.BusinessLogic.Shared.csproj | 1 +
 .../Skoruba.Duende.IdentityServer.Admin.BusinessLogic.csproj   | 1 +
 ...e.IdentityServer.Admin.EntityFramework.Configuration.csproj | 1 +
 ...ende.IdentityServer.Admin.EntityFramework.Extensions.csproj | 1 +
 ...Duende.IdentityServer.Admin.EntityFramework.Identity.csproj | 1 +
 ...ba.Duende.IdentityServer.Admin.EntityFramework.MySql.csproj | 1 +
 ...ende.IdentityServer.Admin.EntityFramework.PostgreSQL.csproj | 3 ++-
 ...a.Duende.IdentityServer.Admin.EntityFramework.Shared.csproj | 1 +
 ...uende.IdentityServer.Admin.EntityFramework.SqlServer.csproj | 1 +
 .../Skoruba.Duende.IdentityServer.Admin.EntityFramework.csproj | 1 +
 .../Skoruba.Duende.IdentityServer.Admin.UI.csproj              | 3 ++-
 .../Skoruba.Duende.IdentityServer.Admin.csproj                 | 3 ++-
 .../Skoruba.Duende.IdentityServer.STS.Identity.csproj          | 3 ++-
 .../Skoruba.Duende.IdentityServer.Shared.Configuration.csproj  | 1 +
 .../Skoruba.Duende.IdentityServer.Shared.csproj                | 1 +
 18 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 4cbe1a62f..ec4c30950 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
 
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+  <PropertyGroup>    
     <Version>1.0.0</Version>
     <Authors>Jan Škoruba</Authors>
     <PackageTags>Duende IdentityServer Admin OpenIDConnect OAuth2 Identity</PackageTags>
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.Api/Skoruba.Duende.IdentityServer.Admin.Api.csproj b/src/Skoruba.Duende.IdentityServer.Admin.Api/Skoruba.Duende.IdentityServer.Admin.Api.csproj
index 3b86c2c77..42e9018c8 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.Api/Skoruba.Duende.IdentityServer.Admin.Api.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.Api/Skoruba.Duende.IdentityServer.Admin.Api.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+	    <TargetFramework>net5.0</TargetFramework>
+		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
         <UserSecretsId>1cc472a2-4e4b-48ce-846b-5219f71fc643</UserSecretsId>
         <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity.csproj b/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity.csproj
index def34ae19..aa49989c4 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Business Logic layer for the administration of the Asp.Net Core Identity and Duende IdentityServer</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared.csproj b/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared.csproj
index a28639b76..db55ae2d0 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Shared.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Shared Business Logic layer for the administration of the Duende IdentityServer and Asp.Net Core Identity</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.csproj b/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.csproj
index bc39e0e12..d8d618954 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.BusinessLogic/Skoruba.Duende.IdentityServer.Admin.BusinessLogic.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Business Logic layer for the administration of the Duende IdentityServer</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration.csproj b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration.csproj
index 78e4d386c..2ab0731c6 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Entity Framework configuration for the administration of the Duende IdentityServer and Asp.Net Core Identity</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Extensions/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Extensions.csproj b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Extensions/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Extensions.csproj
index 9a56cfb34..4bfaf391d 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Extensions/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Extensions.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Extensions/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Extensions.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>EntityFramework extensions for the administration of the Duende IdentityServer and Asp.Net Core Identity</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity.csproj b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity.csproj
index 1d079ec68..3ce447a6c 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Entity Framework layer for the administration of the Asp.Net Core Identity and Duende IdentityServer</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.MySql/Skoruba.Duende.IdentityServer.Admin.EntityFramework.MySql.csproj b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.MySql/Skoruba.Duende.IdentityServer.Admin.EntityFramework.MySql.csproj
index 362c1686d..f812fd83c 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.MySql/Skoruba.Duende.IdentityServer.Admin.EntityFramework.MySql.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.MySql/Skoruba.Duende.IdentityServer.Admin.EntityFramework.MySql.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Entity Framework layer for the administration of the Duende IdentityServer and Asp.Net Core Identity with MySql support</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.PostgreSQL/Skoruba.Duende.IdentityServer.Admin.EntityFramework.PostgreSQL.csproj b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.PostgreSQL/Skoruba.Duende.IdentityServer.Admin.EntityFramework.PostgreSQL.csproj
index c3c2cbe53..ef181c49c 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.PostgreSQL/Skoruba.Duende.IdentityServer.Admin.EntityFramework.PostgreSQL.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.PostgreSQL/Skoruba.Duende.IdentityServer.Admin.EntityFramework.PostgreSQL.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Description>Entity Framework layer for the administration of the Duende IdentityServer and Asp.Net Core Identity with PostrgreSQL support</Description>
+	    <TargetFramework>net5.0</TargetFramework>
+		<Description>Entity Framework layer for the administration of the Duende IdentityServer and Asp.Net Core Identity with PostrgreSQL support</Description>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Shared/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Shared.csproj b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Shared/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Shared.csproj
index ca29afa76..ddb58c72d 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Shared/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Shared.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Shared/Skoruba.Duende.IdentityServer.Admin.EntityFramework.Shared.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>DbContexts and Identity entities for the administration of the Duende IdentityServer and Asp.Net Core Identity</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.SqlServer/Skoruba.Duende.IdentityServer.Admin.EntityFramework.SqlServer.csproj b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.SqlServer/Skoruba.Duende.IdentityServer.Admin.EntityFramework.SqlServer.csproj
index 5a4e43fce..c57fb7f39 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.SqlServer/Skoruba.Duende.IdentityServer.Admin.EntityFramework.SqlServer.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework.SqlServer/Skoruba.Duende.IdentityServer.Admin.EntityFramework.SqlServer.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Entity Framework layer for the administration of the Duende IdentityServer and Asp.Net Core Identity with SqlServer support</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework/Skoruba.Duende.IdentityServer.Admin.EntityFramework.csproj b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework/Skoruba.Duende.IdentityServer.Admin.EntityFramework.csproj
index 4cdee3892..3d6c59dde 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework/Skoruba.Duende.IdentityServer.Admin.EntityFramework.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.EntityFramework/Skoruba.Duende.IdentityServer.Admin.EntityFramework.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Entity Framework layer for the administration of the Duende IdentityServer</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Admin.UI/Skoruba.Duende.IdentityServer.Admin.UI.csproj b/src/Skoruba.Duende.IdentityServer.Admin.UI/Skoruba.Duende.IdentityServer.Admin.UI.csproj
index d597b7e32..1d3183f0a 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin.UI/Skoruba.Duende.IdentityServer.Admin.UI.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin.UI/Skoruba.Duende.IdentityServer.Admin.UI.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
-        <Description>The package with UI for the administration of the Duende IdentityServer</Description>
+	    <TargetFramework>net5.0</TargetFramework>
+	    <Description>The package with UI for the administration of the Duende IdentityServer</Description>
         <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
         <StaticWebAssetBasePath Condition="$(StaticWebAssetBasePath) == ''">/</StaticWebAssetBasePath>
     </PropertyGroup>
diff --git a/src/Skoruba.Duende.IdentityServer.Admin/Skoruba.Duende.IdentityServer.Admin.csproj b/src/Skoruba.Duende.IdentityServer.Admin/Skoruba.Duende.IdentityServer.Admin.csproj
index db59bfa8e..db9d6e1df 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin/Skoruba.Duende.IdentityServer.Admin.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Admin/Skoruba.Duende.IdentityServer.Admin.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <UserSecretsId>8fe260ca-ef4c-4fa3-9364-029146f8d339</UserSecretsId>
+	    <TargetFramework>net5.0</TargetFramework>
+		<UserSecretsId>8fe260ca-ef4c-4fa3-9364-029146f8d339</UserSecretsId>
         <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
         <DockerfileContext>..\..</DockerfileContext>
diff --git a/src/Skoruba.Duende.IdentityServer.STS.Identity/Skoruba.Duende.IdentityServer.STS.Identity.csproj b/src/Skoruba.Duende.IdentityServer.STS.Identity/Skoruba.Duende.IdentityServer.STS.Identity.csproj
index 1e85bd72d..12aedf7ef 100644
--- a/src/Skoruba.Duende.IdentityServer.STS.Identity/Skoruba.Duende.IdentityServer.STS.Identity.csproj
+++ b/src/Skoruba.Duende.IdentityServer.STS.Identity/Skoruba.Duende.IdentityServer.STS.Identity.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <UserSecretsId>9c91d295-54c5-4d09-9bd6-fa56fb74011b</UserSecretsId>
+	    <TargetFramework>net5.0</TargetFramework>
+		<UserSecretsId>9c91d295-54c5-4d09-9bd6-fa56fb74011b</UserSecretsId>
         <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
         <DockerfileContext>..\..</DockerfileContext>
diff --git a/src/Skoruba.Duende.IdentityServer.Shared.Configuration/Skoruba.Duende.IdentityServer.Shared.Configuration.csproj b/src/Skoruba.Duende.IdentityServer.Shared.Configuration/Skoruba.Duende.IdentityServer.Shared.Configuration.csproj
index 68498692b..ffd772d39 100644
--- a/src/Skoruba.Duende.IdentityServer.Shared.Configuration/Skoruba.Duende.IdentityServer.Shared.Configuration.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Shared.Configuration/Skoruba.Duende.IdentityServer.Shared.Configuration.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Shared common layer for the administration of the Duende IdentityServer and Asp.Net Core Identity</Description>
 	</PropertyGroup>
 
diff --git a/src/Skoruba.Duende.IdentityServer.Shared/Skoruba.Duende.IdentityServer.Shared.csproj b/src/Skoruba.Duende.IdentityServer.Shared/Skoruba.Duende.IdentityServer.Shared.csproj
index 0170c9bc0..f17937909 100644
--- a/src/Skoruba.Duende.IdentityServer.Shared/Skoruba.Duende.IdentityServer.Shared.csproj
+++ b/src/Skoruba.Duende.IdentityServer.Shared/Skoruba.Duende.IdentityServer.Shared.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Shared common layer for the administration of the Duende IdentityServer and Asp.Net Core Identity</Description>
 	</PropertyGroup>
 

From eebf060e076a06b0a15f704add57598a5f0cf4b0 Mon Sep 17 00:00:00 2001
From: janskoruba <jan@skoruba.com>
Date: Sat, 18 Dec 2021 19:33:47 +0100
Subject: [PATCH 2/4] Update to 1.0.1

---
 Directory.Build.props                                           | 2 +-
 .../Skoruba.Duende.IdentityServer.Admin.Templates.nuspec        | 2 +-
 .../Skoruba.Duende.IdentityServer.Admin.Templates.nuspec        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index ec4c30950..1e4f97306 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>    
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <Authors>Jan Škoruba</Authors>
     <PackageTags>Duende IdentityServer Admin OpenIDConnect OAuth2 Identity</PackageTags>
     <PackageLicenseUrl>https://github.com/skoruba/Duende.IdentityServer.Admin/blob/main/LICENSE</PackageLicenseUrl>
diff --git a/templates/template-build/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec b/templates/template-build/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
index ee80655f2..8d2e69900 100644
--- a/templates/template-build/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
+++ b/templates/template-build/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Skoruba.Duende.IdentityServer.Admin.Templates</id>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <authors>Jan Škoruba</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/skoruba/Duende.IdentityServer.Admin/blob/master/LICENSE.md</licenseUrl>
diff --git a/templates/template-publish/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec b/templates/template-publish/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
index ee80655f2..8d2e69900 100644
--- a/templates/template-publish/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
+++ b/templates/template-publish/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Skoruba.Duende.IdentityServer.Admin.Templates</id>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <authors>Jan Škoruba</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/skoruba/Duende.IdentityServer.Admin/blob/master/LICENSE.md</licenseUrl>

From 73b3be72f9456c6764838261fa57c5c6792a5535 Mon Sep 17 00:00:00 2001
From: janskoruba <jan@skoruba.com>
Date: Sun, 19 Dec 2021 13:30:44 +0100
Subject: [PATCH 3/4] Update template to use 1.0.1

---
 templates/1-docker-support-notes.md                      | 5 -----
 templates/3-clean-up.ps1                                 | 6 ++++++
 .../SkorubaDuende.IdentityServerAdmin.Admin.Api.csproj   | 9 +++++----
 ...dentityServerAdmin.Admin.EntityFramework.MySql.csproj | 5 +++--
 ...tyServerAdmin.Admin.EntityFramework.PostgreSQL.csproj | 7 ++++---
 ...entityServerAdmin.Admin.EntityFramework.Shared.csproj | 7 ++++---
 ...ityServerAdmin.Admin.EntityFramework.SqlServer.csproj | 5 +++--
 .../SkorubaDuende.IdentityServerAdmin.Admin.csproj       | 9 +++++----
 ...SkorubaDuende.IdentityServerAdmin.STS.Identity.csproj | 5 +++--
 .../SkorubaDuende.IdentityServerAdmin.Shared.csproj      | 3 ++-
 10 files changed, 35 insertions(+), 26 deletions(-)
 delete mode 100644 templates/1-docker-support-notes.md
 create mode 100644 templates/3-clean-up.ps1

diff --git a/templates/1-docker-support-notes.md b/templates/1-docker-support-notes.md
deleted file mode 100644
index 29c3721c6..000000000
--- a/templates/1-docker-support-notes.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Add docker files in Visual Studio - right click on project and Add Docker Support
-> It is necessarry to fix correct project names
-
-# Copy fixed src from SkorubaDuende.IdentityServerAdmin to template-publish
-> ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
\ No newline at end of file
diff --git a/templates/3-clean-up.ps1 b/templates/3-clean-up.ps1
new file mode 100644
index 000000000..5d5b92b0a
--- /dev/null
+++ b/templates/3-clean-up.ps1
@@ -0,0 +1,6 @@
+# Clean up folders for template testing
+$myProject = "MyProject"
+$gitTemplateFolder = "SkorubaDuende.IdentityServerAdmin"
+
+if ((Test-Path -Path $myProject)) { Remove-Item ./$myProject -recurse -force }
+if ((Test-Path -Path $gitTemplateFolder)) { Remove-Item ./$gitTemplateFolder -recurse -force }
\ No newline at end of file
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.Api/SkorubaDuende.IdentityServerAdmin.Admin.Api.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.Api/SkorubaDuende.IdentityServerAdmin.Admin.Api.csproj
index af40df451..d636e71c6 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.Api/SkorubaDuende.IdentityServerAdmin.Admin.Api.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.Api/SkorubaDuende.IdentityServerAdmin.Admin.Api.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+	    <TargetFramework>net5.0</TargetFramework>
+		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
         <UserSecretsId>1cc472a2-4e4b-48ce-846b-5219f71fc643</UserSecretsId>
         <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -32,9 +33,9 @@
         <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
         <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
         <PackageReference Include="Serilog.Sinks.Seq" Version="5.0.1" />
-        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic" Version="1.0.0" />
-        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="1.0.0" />
-        <PackageReference Include="Skoruba.Duende.IdentityServer.Shared.Configuration" Version="1.0.0" />
+        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic" Version="1.0.1" />
+        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="1.0.1" />
+        <PackageReference Include="Skoruba.Duende.IdentityServer.Shared.Configuration" Version="1.0.1" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
         <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.2.3" />
         <PackageReference Include="Serilog" Version="2.10.0" />
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.MySql/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.MySql.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.MySql/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.MySql.csproj
index bc7042c7c..0bb8841c7 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.MySql/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.MySql.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.MySql/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.MySql.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Entity Framework layer for the administration of the Duende IdentityServer and Asp.Net Core Identity with MySql support</Description>
 	</PropertyGroup>
 
@@ -8,8 +9,8 @@
 		<PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="5.2.3" />
 		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.2" />
 		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework" Version="1.0.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity" Version="1.0.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework" Version="1.0.1" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity" Version="1.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.PostgreSQL/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.PostgreSQL.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.PostgreSQL/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.PostgreSQL.csproj
index cf8f99524..035e1340a 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.PostgreSQL/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.PostgreSQL.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.PostgreSQL/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.PostgreSQL.csproj
@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Description>Entity Framework layer for the administration of the Duende IdentityServer and Asp.Net Core Identity with PostrgreSQL support</Description>
+	    <TargetFramework>net5.0</TargetFramework>
+		<Description>Entity Framework layer for the administration of the Duende IdentityServer and Asp.Net Core Identity with PostrgreSQL support</Description>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
         <PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="5.2.3" />
-        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework" Version="1.0.0" />
-        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity" Version="1.0.0" />
+        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework" Version="1.0.1" />
+        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared.csproj
index b2d7ee879..74a1ef311 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared.csproj
@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>DbContexts and Identity entities for the administration of the Duende IdentityServer and Asp.Net Core Identity</Description>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="5.0.12" />
 		<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework" Version="1.0.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration" Version="1.0.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity" Version="1.0.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework" Version="1.0.1" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration" Version="1.0.1" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity" Version="1.0.1" />
 	</ItemGroup>
 </Project>
 
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.SqlServer/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.SqlServer.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.SqlServer/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.SqlServer.csproj
index a568e023c..bd017fc8a 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.SqlServer/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.SqlServer.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.SqlServer/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.SqlServer.csproj
@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Entity Framework layer for the administration of the Duende IdentityServer and Asp.Net Core Identity with SqlServer support</Description>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.12" />
 		<PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="5.2.3" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework" Version="1.0.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity" Version="1.0.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework" Version="1.0.1" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Identity" Version="1.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/SkorubaDuende.IdentityServerAdmin.Admin.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/SkorubaDuende.IdentityServerAdmin.Admin.csproj
index a31f1ad8b..b37e9adf6 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/SkorubaDuende.IdentityServerAdmin.Admin.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/SkorubaDuende.IdentityServerAdmin.Admin.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <UserSecretsId>8fe260ca-ef4c-4fa3-9364-029146f8d339</UserSecretsId>
+	    <TargetFramework>net5.0</TargetFramework>
+		<UserSecretsId>8fe260ca-ef4c-4fa3-9364-029146f8d339</UserSecretsId>
         <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
         <DockerfileContext>..\..</DockerfileContext>
@@ -42,9 +43,9 @@
         <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
         <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="5.6.1" />
         <PackageReference Include="Serilog.Sinks.Seq" Version="5.0.1" />
-        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic" Version="1.0.0" />
-        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="1.0.0" />
-        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.UI" Version="1.0.0" />
+        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic" Version="1.0.1" />
+        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="1.0.1" />
+        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.UI" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.STS.Identity/SkorubaDuende.IdentityServerAdmin.STS.Identity.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.STS.Identity/SkorubaDuende.IdentityServerAdmin.STS.Identity.csproj
index 5df74bcbc..5cc17ba53 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.STS.Identity/SkorubaDuende.IdentityServerAdmin.STS.Identity.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.STS.Identity/SkorubaDuende.IdentityServerAdmin.STS.Identity.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <UserSecretsId>9c91d295-54c5-4d09-9bd6-fa56fb74011b</UserSecretsId>
+	    <TargetFramework>net5.0</TargetFramework>
+		<UserSecretsId>9c91d295-54c5-4d09-9bd6-fa56fb74011b</UserSecretsId>
         <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
         <DockerfileContext>..\..</DockerfileContext>
@@ -42,7 +43,7 @@
         <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="5.6.1" />
         <PackageReference Include="Serilog.Sinks.Seq" Version="5.0.1" />
         <PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="1.0.0" />
-        <PackageReference Include="Skoruba.Duende.IdentityServer.Shared.Configuration" Version="1.0.0" />
+        <PackageReference Include="Skoruba.Duende.IdentityServer.Shared.Configuration" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Shared/SkorubaDuende.IdentityServerAdmin.Shared.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Shared/SkorubaDuende.IdentityServerAdmin.Shared.csproj
index 7ba2ea1df..d447d5a78 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Shared/SkorubaDuende.IdentityServerAdmin.Shared.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Shared/SkorubaDuende.IdentityServerAdmin.Shared.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
 		<Description>Shared common layer for the administration of the Duende IdentityServer and Asp.Net Core Identity</Description>
 	</PropertyGroup>
 
@@ -12,7 +13,7 @@
 		<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.2.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.21" />
 		<PackageReference Include="Sendgrid" Version="9.24.4" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="1.0.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="1.0.1" />
 	</ItemGroup>
 
 </Project>

From 19a6f881a7ae78f963ca8c87ae52a912df4486c6 Mon Sep 17 00:00:00 2001
From: janskoruba <jan@skoruba.com>
Date: Sun, 19 Dec 2021 15:05:54 +0100
Subject: [PATCH 4/4] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 03f85f94e..057a83b89 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ The application is written in the **Asp.Net Core MVC - using .NET 5.0**
 - 🔒 **NOTE:** The project uses the default database migrations which affect your database therefore double check the migrations according to your database provider and create a database backup
 
 ```sh
-dotnet new -i Skoruba.Duende.IdentityServer.Admin.Templates::1.0.0
+dotnet new -i Skoruba.Duende.IdentityServer.Admin.Templates::1.0.1
 ```
 
 ### Create new project: