From f00c0d62696c2b2cd520d799c32e767ddd95ece0 Mon Sep 17 00:00:00 2001
From: Tudor Stanciu <tstanciu@totalsoft.ro>
Date: Thu, 10 Feb 2022 16:12:46 +0200
Subject: [PATCH] Upgrade to .net5

---
 Directory.Build.props                                 |  2 +-
 IdentityServer.Api/Dockerfile                         |  4 ++--
 IdentityServer.Api/IdentityServer.Api.csproj          |  6 +++---
 IdentityServer.Api/appsettings.json                   |  1 +
 .../IdentityServer.Application.csproj                 |  2 +-
 .../IdentityServer.Domain.Data.csproj                 |  2 +-
 IdentityServer.Domain/IdentityServer.Domain.csproj    |  2 +-
 ReleaseNotes.xml                                      |  7 +++++++
 dependencies.props                                    | 11 ++++++-----
 9 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 79eeeb1..7eb4dc6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="dependencies.props" />
   <PropertyGroup>
-    <Version>1.0.1</Version>
+    <Version>1.1.0</Version>
     <Authors>Tudor Stanciu</Authors>
     <Company>STA</Company>
     <PackageTags>IdentityServer</PackageTags>
diff --git a/IdentityServer.Api/Dockerfile b/IdentityServer.Api/Dockerfile
index 7e7cfa8..f88b15c 100644
--- a/IdentityServer.Api/Dockerfile
+++ b/IdentityServer.Api/Dockerfile
@@ -1,10 +1,10 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
 WORKDIR /src
 COPY dependencies.props .
 COPY Directory.Build.props .
diff --git a/IdentityServer.Api/IdentityServer.Api.csproj b/IdentityServer.Api/IdentityServer.Api.csproj
index c0c58e8..cba7bb6 100644
--- a/IdentityServer.Api/IdentityServer.Api.csproj
+++ b/IdentityServer.Api/IdentityServer.Api.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsPackageVersion)" />
-    <PackageReference Include="NDB.Extensions.Swagger" Version="$(NDBExtensionsPackageVersion)" />
+    <PackageReference Include="NDB.Extensions.Swagger" Version="$(NDBExtensionsSwaggerPackageVersion)" />
     <PackageReference Include="Serilog.AspNetCore" Version="$(SerilogPackageVersion)" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="$(SerilogExtensionsPackageVersion)" />
     <PackageReference Include="Serilog.Sinks.Console" Version="$(SerilogSinksConsolePackageVersion)" />
diff --git a/IdentityServer.Api/appsettings.json b/IdentityServer.Api/appsettings.json
index 116b2e5..c2e70b2 100644
--- a/IdentityServer.Api/appsettings.json
+++ b/IdentityServer.Api/appsettings.json
@@ -1,6 +1,7 @@
 {
   "urls": "http://*:5063",
   "ConnectionStrings": {
+    //"DatabaseConnection": "***REMOVED***"
     "DatabaseConnection": "***REMOVED***"
   },
   "Logging": {
diff --git a/IdentityServer.Application/IdentityServer.Application.csproj b/IdentityServer.Application/IdentityServer.Application.csproj
index 7e87261..77faec9 100644
--- a/IdentityServer.Application/IdentityServer.Application.csproj
+++ b/IdentityServer.Application/IdentityServer.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/IdentityServer.Domain.Data/IdentityServer.Domain.Data.csproj b/IdentityServer.Domain.Data/IdentityServer.Domain.Data.csproj
index 9f87f66..8ebdccb 100644
--- a/IdentityServer.Domain.Data/IdentityServer.Domain.Data.csproj
+++ b/IdentityServer.Domain.Data/IdentityServer.Domain.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/IdentityServer.Domain/IdentityServer.Domain.csproj b/IdentityServer.Domain/IdentityServer.Domain.csproj
index 9f5c4f4..f208d30 100644
--- a/IdentityServer.Domain/IdentityServer.Domain.csproj
+++ b/IdentityServer.Domain/IdentityServer.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/ReleaseNotes.xml b/ReleaseNotes.xml
index cc13cf4..cb50263 100644
--- a/ReleaseNotes.xml
+++ b/ReleaseNotes.xml
@@ -23,4 +23,11 @@
 	  ◾ All tokens are persisted in the database and the active ones are reload at a server failure or in case of a restart.
     </Content>
   </Note>
+  <Note>
+	<Version>1.1.0</Version>
+	<Content>
+	  ◾ Upgrade all projects to .NET 5
+	  ◾ Upgrade packages MicrosoftExtensions, AutoMapper, EntityFramework, NDB
+	</Content>
+  </Note>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/dependencies.props b/dependencies.props
index 8ebba9d..46fd986 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -1,16 +1,17 @@
 <Project>
   <PropertyGroup Label="Package Versions">
-    <MicrosoftExtensionsPackageVersion>3.1.8</MicrosoftExtensionsPackageVersion>
+    <MicrosoftExtensionsPackageVersion>5.0.0</MicrosoftExtensionsPackageVersion>
     <SerilogPackageVersion>4.1.0</SerilogPackageVersion>
     <SerilogExtensionsPackageVersion>3.1.0</SerilogExtensionsPackageVersion>
     <SerilogSinksConsolePackageVersion>4.0.0</SerilogSinksConsolePackageVersion>
     <SerilogSinksMSSqlServerPackageVersion>5.6.1</SerilogSinksMSSqlServerPackageVersion>
-    <AutoMapperPackageVersion>9.0.0</AutoMapperPackageVersion>
-    <AutoMapperExtensionsPackageVersion>7.0.0</AutoMapperExtensionsPackageVersion>
+    <AutoMapperPackageVersion>10.1.1</AutoMapperPackageVersion>
+    <AutoMapperExtensionsPackageVersion>8.1.1</AutoMapperExtensionsPackageVersion>
     <MediatRPackageVersion>6.0.0</MediatRPackageVersion>
     <SwashbucklePackageVersion>5.3.1</SwashbucklePackageVersion>
-    <EntityFrameworkCorePackageVersion>3.1.3</EntityFrameworkCorePackageVersion>
-    <NDBExtensionsPackageVersion>1.0.0</NDBExtensionsPackageVersion>
+    <EntityFrameworkCorePackageVersion>5.0.12</EntityFrameworkCorePackageVersion>
+	<NDBExtensionsSwaggerPackageVersion>1.0.2</NDBExtensionsSwaggerPackageVersion>
     <NDBApplicationPackageVersion>1.0.0</NDBApplicationPackageVersion>
+    <NDBDatabaseMigrationPackageVersion>1.0.2</NDBDatabaseMigrationPackageVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file