From b804b4255f843a4b18db7549c60197c7b7b3fe24 Mon Sep 17 00:00:00 2001
From: b1thunt3r <ishan@jain.se>
Date: Thu, 26 Nov 2020 16:07:38 +0000
Subject: [PATCH] Upgrade to .NET 5

---
 .github/workflows/package.yml                    | 10 ++++++----
 Common.props                                     |  8 ++++++--
 Solution.props                                   |  2 +-
 src/Bit0.Registry.Core/Bit0.Registry.Core.csproj |  4 ++--
 tests/RegistryTests/RegistryTests.csproj         |  6 +++---
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index f0bb2a1..b6e9b9d 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -20,6 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs: 
       PACKAGE_VERSION: ${{ steps.setup.outputs.PACKAGE_VERSION }}
+      DOTNET_VERSION: ${{ steps.setup.outputs.DOTNET_VERSION }}
     
     steps:
     - name: Checkout code
@@ -29,13 +30,14 @@ jobs:
       id: setup
       run: |
         version=$(grep -oPm1 "(?<=<Version>)[^<]+" Solution.props).$GITHUB_RUN_NUMBER
-        echo "::set-env name=PACKAGE_VERSION::$version"
+        dotnet_version=$(grep -oPm1 "(?<=<DotNetVersion>)[^<]+" Common.props)
         echo "::set-output name=PACKAGE_VERSION::$version"
+        echo "::set-output name=DOTNET_VERSION::$dotnet_version"
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: ${{ steps.setup.outputs.DOTNET_VERSION }}
 
     - name: Install dependencies
       run: dotnet restore
@@ -47,7 +49,7 @@ jobs:
       run: dotnet test --no-restore --verbosity normal
 
     - name: Package
-      run: dotnet pack --no-restore -c Release -p:Version=$PACKAGE_VERSION
+      run: dotnet pack --no-restore -c Release -p:Version=${{ steps.setup.outputs.PACKAGE_VERSION }}
 
     - name: Collect Packages
       run: |
@@ -69,7 +71,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: ${{ needs.build.outputs.DOTNET_VERSION }}
 
     - name: Download Artifact
       uses: actions/download-artifact@v1
diff --git a/Common.props b/Common.props
index 7bf2ce2..47915d4 100644
--- a/Common.props
+++ b/Common.props
@@ -1,6 +1,6 @@
-<Project>  
+<Project>
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AnalysisLevel>5</AnalysisLevel>
 
     <Authors>b1thunt3r</Authors>
@@ -27,4 +27,8 @@
     <NoWarn>1701;1702;IDE0002;IDE0022;CC0057;IDE0063;IDE0046;IDE0066</NoWarn>
   </PropertyGroup>
 
+  <ProjectExtensions>
+    <DotNetVersion>5.0.100</DotNetVersion>
+  </ProjectExtensions>
+
 </Project>
diff --git a/Solution.props b/Solution.props
index 8e0d4ef..6124e3a 100644
--- a/Solution.props
+++ b/Solution.props
@@ -1,6 +1,6 @@
 <Project>  
   <PropertyGroup>
-    <Version>5.2</Version>
+    <Version>6.0</Version>
     <PackageProjectUrl Condition="'$(PackageProjectUrl)'==''">Update project meta info</PackageProjectUrl>
     <RepositoryUrl>https://github.com/0b00/Bit0.Registry</RepositoryUrl>
   </PropertyGroup>
diff --git a/src/Bit0.Registry.Core/Bit0.Registry.Core.csproj b/src/Bit0.Registry.Core/Bit0.Registry.Core.csproj
index 0e76894..58c6b9d 100644
--- a/src/Bit0.Registry.Core/Bit0.Registry.Core.csproj
+++ b/src/Bit0.Registry.Core/Bit0.Registry.Core.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="SemanticVersioning" Version="1.2.2" />
+    <PackageReference Include="SemanticVersioning" Version="1.3.0" />
   </ItemGroup>
 
   <Import Project="..\..\Solution.props" />
diff --git a/tests/RegistryTests/RegistryTests.csproj b/tests/RegistryTests/RegistryTests.csproj
index 04f0497..a3fe8ca 100644
--- a/tests/RegistryTests/RegistryTests.csproj
+++ b/tests/RegistryTests/RegistryTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -14,9 +14,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Divergic.Logging.Xunit" Version="3.5.0" />
+    <PackageReference Include="Divergic.Logging.Xunit" Version="3.6.0" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>