#28 - Upgrade .NET Core to 5.0.0.preview

fabasoad · Jul 8, 2020 · c1673f7 · c1673f7
1 parent 60b9318
commit c1673f7
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 24 deletions.
diff --git a/.github/workflows/ci-latest.yml b/.github/workflows/ci-latest.yml
@@ -29,7 +29,7 @@ jobs:
         if: ${{ matrix.os != 'windows-latest' }}
         uses: actions/[email protected]
         with:
-          dotnet-version: 3.1.300
+          dotnet-version: 5.0.0-preview.6
       - name: Install application (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
         run: |

diff --git a/.github/workflows/ci-master.yml → .github/workflows/ci-main.yml b/.github/workflows/ci-master.yml → .github/workflows/ci-main.yml
@@ -5,6 +5,8 @@ on:
   push:
     branches:
       - main
+      - 'bugfix/**'
+      - 'feature/**'
   pull_request:
     branches:
       - main
@@ -43,7 +45,7 @@ jobs:
         if: ${{ matrix.os != 'windows-latest' }}
         uses: actions/[email protected]
         with:
-          dotnet-version: 3.1.300
+          dotnet-version: 5.0.0-preview.6
       - name: Build
         run: ./build.ps1 -os ${{ matrix.os }}
         shell: pwsh

diff --git a/build.ps1 b/build.ps1
@@ -14,7 +14,7 @@ function Build-Package {
     [string] $argOS
   )
   $Output = Build-Output $argVersion $argOS
-  dotnet build -c Release -r $argOS -p:Version=$argVersion -o bin/$Output -f netcoreapp3.1
+  dotnet build -c Release -r $argOS -p:Version=$argVersion -o bin/$Output -f netcoreapp5.0
 }
 
 function Compress-Package {

diff --git a/src/Ghacu.Api/Ghacu.Api.csproj b/src/Ghacu.Api/Ghacu.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>netcoreapp5.0</TargetFramework>
         <RootNamespace>Api</RootNamespace>
     </PropertyGroup>
 

diff --git a/src/Ghacu.Cache/Ghacu.Cache.csproj b/src/Ghacu.Cache/Ghacu.Cache.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>netcoreapp5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="LiteDB" Version="5.0.8" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" />
-      <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0-preview.6.20305.6" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.6.20305.6" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0-preview.6.20305.6" />
       <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164" />
     </ItemGroup>
 

diff --git a/src/Ghacu.GitHub/Ghacu.GitHub.csproj b/src/Ghacu.GitHub/Ghacu.GitHub.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>netcoreapp5.0</TargetFramework>
         <RootNamespace>GitHub</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" />
-      <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0-preview.6.20305.6" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.6.20305.6" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0-preview.6.20305.6" />
       <PackageReference Include="Octokit" Version="0.48.0" />
       <PackageReference Include="StructureMap.Microsoft.DependencyInjection" Version="2.0.0" />
       <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164" />

diff --git a/src/Ghacu.Runner/Ghacu.Runner.csproj b/src/Ghacu.Runner/Ghacu.Runner.csproj
@@ -3,19 +3,21 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;osx-x64</RuntimeIdentifiers>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <RootNamespace>ghacu</RootNamespace>
     <AssemblyName>ghacu</AssemblyName>
     <Company>Yevhen Fabizhevskyi</Company>
     <Product>GHACU</Product>
     <NeutralLanguage>en-UA</NeutralLanguage>
+    <LangVersion>preview</LangVersion>
+    <PackageVersion>2.0.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.6.20305.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0-preview.6.20305.6" />
     <PackageReference Include="StructureMap.Microsoft.DependencyInjection" Version="2.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/src/Ghacu.Workflow/Ghacu.Workflow.csproj b/src/Ghacu.Workflow/Ghacu.Workflow.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>netcoreapp5.0</TargetFramework>
         <RootNamespace>Workflow</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" />
-      <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0-preview.6.20305.6" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.6.20305.6" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0-preview.6.20305.6" />
       <PackageReference Include="StructureMap.Microsoft.DependencyInjection" Version="2.0.0" />
       <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164" />
       <PackageReference Include="YamlDotNet" Version="8.1.2" />

diff --git a/tests/Ghacu.Cache.Tests/Ghacu.Cache.Tests.csproj b/tests/Ghacu.Cache.Tests/Ghacu.Cache.Tests.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>netcoreapp5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="coverlet.collector" Version="1.3.0" />
+      <PackageReference Include="coverlet.msbuild" Version="2.9.0" />
       <PackageReference Include="JustMock" Version="2020.2.616.1" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0-preview-20200519-01" />
       <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164" />

diff --git a/tests/Ghacu.Runner.Tests/Ghacu.Runner.Tests.csproj b/tests/Ghacu.Runner.Tests/Ghacu.Runner.Tests.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>netcoreapp5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="coverlet.collector" Version="1.3.0" />
+      <PackageReference Include="coverlet.msbuild" Version="2.9.0" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0-preview-20200519-01" />
       <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164" />
       <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/tests/Ghacu.Workflow.Tests/Ghacu.Workflow.Tests.csproj b/tests/Ghacu.Workflow.Tests/Ghacu.Workflow.Tests.csproj
@@ -4,18 +4,19 @@
     <DebugType>full</DebugType>
     <IsPackable>false</IsPackable>
     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;osx-x64</RuntimeIdentifiers>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0-preview-20200519-01" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
-    <PackageReference Include="coverlet.collector" Version="1.2.1" />
+    <PackageReference Include="coverlet.collector" Version="1.3.0" />
     <PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.164" />
   </ItemGroup>