From 99693e43a40d4c4f0cc1a6ec9c56701fc06c9808 Mon Sep 17 00:00:00 2001
From: Ayrat Hudaygulov <ahudaygulov@microsoft.com>
Date: Wed, 9 Dec 2020 16:27:36 +0000
Subject: [PATCH] migrating to net5

---
 Dockerfile                                       | 4 ++--
 Grinder.sln                                      | 2 --
 README.md                                        | 6 ++++--
 global.json                                      | 2 +-
 src/Grinder.Common/Grinder.Common.fsproj         | 4 ++--
 src/Grinder.DataAccess/Grinder.DataAccess.csproj | 2 +-
 src/Grinder.ExportTool/Grinder.ExportTool.fsproj | 4 ++--
 src/Grinder/Grinder.fsproj                       | 4 ++--
 tests/Grinder.Tests/Grinder.Tests.fsproj         | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e15e8cc..00fb3de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build-dotnet
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-dotnet
 WORKDIR /app
 # Copy csproj and restore as distinct layers
 COPY *.sln ./
@@ -20,7 +20,7 @@ RUN dotnet test -c Release -r linux-x64 -o out --no-restore --verbosity normal
 RUN dotnet publish -r linux-x64 -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/runtime:3.1
+FROM mcr.microsoft.com/dotnet/runtime:5.0
 
 EXPOSE 80
 
diff --git a/Grinder.sln b/Grinder.sln
index 9fd18a5..c2109b3 100644
--- a/Grinder.sln
+++ b/Grinder.sln
@@ -17,8 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CI", "CI", "{25990364-33CE-
 ProjectSection(SolutionItems) = preProject
 	docker-compose.yml = docker-compose.yml
 	Dockerfile = Dockerfile
-	azure-pipelines.yml = azure-pipelines.yml
-	x86.Dockerfile = x86.Dockerfile
 EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{3AB38C70-1DF4-48D9-992B-B7BFBFDDFD7A}"
diff --git a/README.md b/README.md
index 68d6130..f160064 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,11 @@ Telegram bot for chats administration.
 
 ## Configuration and build
 
-Just open project with Rider/VS 2019 and run build
+- Install Net5 SDK
 
-or use dotnet cli
+- Open project with Rider/VS 2019 and run build
+
+- or use dotnet cli
 
 ```bash
 dotnet build
diff --git a/global.json b/global.json
index d0bfd1d..2ed6663 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-      "version": "3.1.300"
+      "version": "5.0.101"
     }
 }
\ No newline at end of file
diff --git a/src/Grinder.Common/Grinder.Common.fsproj b/src/Grinder.Common/Grinder.Common.fsproj
index e9ae9d0..0a04844 100644
--- a/src/Grinder.Common/Grinder.Common.fsproj
+++ b/src/Grinder.Common/Grinder.Common.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>net5</TargetFramework>
         <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
         <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
     </PropertyGroup>
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="FSharp.Core" Version="4.6.2" />
+        <PackageReference Update="FSharp.Core" Version="5.0.0" />
         <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
     </ItemGroup>
 
diff --git a/src/Grinder.DataAccess/Grinder.DataAccess.csproj b/src/Grinder.DataAccess/Grinder.DataAccess.csproj
index 23e2b1d..c612362 100644
--- a/src/Grinder.DataAccess/Grinder.DataAccess.csproj
+++ b/src/Grinder.DataAccess/Grinder.DataAccess.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5</TargetFramework>
         <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
     </PropertyGroup>
 
diff --git a/src/Grinder.ExportTool/Grinder.ExportTool.fsproj b/src/Grinder.ExportTool/Grinder.ExportTool.fsproj
index 6f1332d..9532f8d 100644
--- a/src/Grinder.ExportTool/Grinder.ExportTool.fsproj
+++ b/src/Grinder.ExportTool/Grinder.ExportTool.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5</TargetFramework>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
   </PropertyGroup>
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.21" />
-    <PackageReference Include="FSharp.Core" Version="4.6.2" />
+    <PackageReference Update="FSharp.Core" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="TDLib" Version="1.3.0" />
     <PackageReference Include="tdlib.native" Version="1.3.0" />
diff --git a/src/Grinder/Grinder.fsproj b/src/Grinder/Grinder.fsproj
index 795a112..2ee0068 100644
--- a/src/Grinder/Grinder.fsproj
+++ b/src/Grinder/Grinder.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5</TargetFramework>
         <ServerGarbageCollection>false</ServerGarbageCollection>
         <TieredCompilation>true</TieredCompilation>
         <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -11,7 +11,7 @@
 
     <ItemGroup>
         <PackageReference Include="FParsec" Version="1.0.3" />
-        <PackageReference Include="FSharp.Core" Version="4.6.2" />
+        <PackageReference Update="FSharp.Core" Version="5.0.0" />
         <PackageReference Include="FSharp.UMX" Version="1.0.0-preview-001" />
         <PackageReference Include="Funogram" Version="1.3.1" />
         <PackageReference Include="HttpToSocks5Proxy" Version="1.1.3" />
diff --git a/tests/Grinder.Tests/Grinder.Tests.fsproj b/tests/Grinder.Tests/Grinder.Tests.fsproj
index 7a69813..24abb3e 100644
--- a/tests/Grinder.Tests/Grinder.Tests.fsproj
+++ b/tests/Grinder.Tests/Grinder.Tests.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
     <IsPackable>false</IsPackable>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="4.6.2" />
+    <PackageReference Update="FSharp.Core" Version="5.0.0" />
     <PackageReference Include="Foq" Version="1.8.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />