From 149c1df6347575af7a2cab46fd248f3a193304b0 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Wed, 15 Dec 2021 12:23:52 +0300
Subject: [PATCH] Upgrade to .NET 6

---
 Dockerfile                                                | 4 ++--
 EvoCalculator.Core.Base/EvoCalculator.Core.Base.csproj    | 2 +-
 .../EvoCalculator.Core.Calculation.csproj                 | 2 +-
 .../EvoCalculator.Core.Constants.csproj                   | 4 ++--
 .../EvoCalculator.Core.FinanceFormulas.csproj             | 8 ++++----
 .../EvoCalculator.Core.Models.csproj                      | 2 +-
 .../EvoCalculator.Core.PostCalculation.csproj             | 2 +-
 EvoCalculator.Core.Tests/EvoCalculator.Core.Tests.csproj  | 2 +-
 EvoCalculator.Core.Tools/EvoCalculator.Core.Tools.csproj  | 2 +-
 EvoCalculator.Core/EvoCalculator.Core.csproj              | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e6702c4..9a14d81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
 WORKDIR /app
 EXPOSE 5000
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
 WORKDIR /src
 COPY ["EvoCalculator.Core/EvoCalculator.Core.csproj", "EvoCalculator.Core/"]
 RUN dotnet restore "EvoCalculator.Core/EvoCalculator.Core.csproj"
diff --git a/EvoCalculator.Core.Base/EvoCalculator.Core.Base.csproj b/EvoCalculator.Core.Base/EvoCalculator.Core.Base.csproj
index f69c4e7..9efa47d 100644
--- a/EvoCalculator.Core.Base/EvoCalculator.Core.Base.csproj
+++ b/EvoCalculator.Core.Base/EvoCalculator.Core.Base.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
diff --git a/EvoCalculator.Core.Calculation/EvoCalculator.Core.Calculation.csproj b/EvoCalculator.Core.Calculation/EvoCalculator.Core.Calculation.csproj
index 5ece556..a67de2a 100644
--- a/EvoCalculator.Core.Calculation/EvoCalculator.Core.Calculation.csproj
+++ b/EvoCalculator.Core.Calculation/EvoCalculator.Core.Calculation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
diff --git a/EvoCalculator.Core.Constants/EvoCalculator.Core.Constants.csproj b/EvoCalculator.Core.Constants/EvoCalculator.Core.Constants.csproj
index 3913df2..b5b4526 100644
--- a/EvoCalculator.Core.Constants/EvoCalculator.Core.Constants.csproj
+++ b/EvoCalculator.Core.Constants/EvoCalculator.Core.Constants.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>Constants</RootNamespace>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3"/>
+        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     </ItemGroup>
 
 </Project>
diff --git a/EvoCalculator.Core.FinanceFormulas/EvoCalculator.Core.FinanceFormulas.csproj b/EvoCalculator.Core.FinanceFormulas/EvoCalculator.Core.FinanceFormulas.csproj
index f9c75d1..7a0981c 100644
--- a/EvoCalculator.Core.FinanceFormulas/EvoCalculator.Core.FinanceFormulas.csproj
+++ b/EvoCalculator.Core.FinanceFormulas/EvoCalculator.Core.FinanceFormulas.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>EvoCalculator.Core.FinanceFormulas</RootNamespace>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\EvoCalculator.Core.Models\EvoCalculator.Core.Models.csproj"/>
+        <ProjectReference Include="..\EvoCalculator.Core.Models\EvoCalculator.Core.Models.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3"/>
-        <PackageReference Include="TridentGoalSeek" Version="1.0.5"/>
+        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+        <PackageReference Include="TridentGoalSeek" Version="1.0.5" />
     </ItemGroup>
 
 </Project>
diff --git a/EvoCalculator.Core.Models/EvoCalculator.Core.Models.csproj b/EvoCalculator.Core.Models/EvoCalculator.Core.Models.csproj
index 4d4e406..c3c9c88 100644
--- a/EvoCalculator.Core.Models/EvoCalculator.Core.Models.csproj
+++ b/EvoCalculator.Core.Models/EvoCalculator.Core.Models.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
diff --git a/EvoCalculator.Core.PostCalculation/EvoCalculator.Core.PostCalculation.csproj b/EvoCalculator.Core.PostCalculation/EvoCalculator.Core.PostCalculation.csproj
index 9f912de..60ad764 100644
--- a/EvoCalculator.Core.PostCalculation/EvoCalculator.Core.PostCalculation.csproj
+++ b/EvoCalculator.Core.PostCalculation/EvoCalculator.Core.PostCalculation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/EvoCalculator.Core.Tests/EvoCalculator.Core.Tests.csproj b/EvoCalculator.Core.Tests/EvoCalculator.Core.Tests.csproj
index 31c8f0a..340d637 100644
--- a/EvoCalculator.Core.Tests/EvoCalculator.Core.Tests.csproj
+++ b/EvoCalculator.Core.Tests/EvoCalculator.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 
diff --git a/EvoCalculator.Core.Tools/EvoCalculator.Core.Tools.csproj b/EvoCalculator.Core.Tools/EvoCalculator.Core.Tools.csproj
index e743782..7d23172 100644
--- a/EvoCalculator.Core.Tools/EvoCalculator.Core.Tools.csproj
+++ b/EvoCalculator.Core.Tools/EvoCalculator.Core.Tools.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
diff --git a/EvoCalculator.Core/EvoCalculator.Core.csproj b/EvoCalculator.Core/EvoCalculator.Core.csproj
index 1208da6..799fe21 100644
--- a/EvoCalculator.Core/EvoCalculator.Core.csproj
+++ b/EvoCalculator.Core/EvoCalculator.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <LangVersion>default</LangVersion>
     </PropertyGroup>