From 319406679081e2e652e9eb7976f084993c7a90c9 Mon Sep 17 00:00:00 2001
From: Molnix888 <17860027+Molnix888@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:58:45 +0100
Subject: [PATCH] Update template with .NET 8 support, reusable workflows and
 add default target of .NET Standard 2.0 (#75)

* Add .NET 8 support

* Upgrade dependencies

* Fix push symbols to NuGet issue

* Update pipelines to target reusable workflows

* Remove unnecessary package

* Move to target netstandard2.0

---------

Co-authored-by: Yauhen Klimiashuk <Yauhen_Klimiashuk@epam.com>
---
 .github/workflows/release.yml                 | 20 +--------------
 .github/workflows/test.yml                    | 25 +------------------
 Directory.Build.props                         |  3 ++-
 Directory.Packages.props                      |  3 +--
 src/Mafin.Template/Mafin.Template.csproj      |  2 +-
 .../Mafin.Template.Tests.Unit.csproj          |  2 +-
 6 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 09d5543..e5ab4bd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,24 +6,6 @@ on:
     tags:
     - 'v*'
 
-env:
-  CONFIGURATION: Release
-  PACKAGE_OUPUT_DIRECTORY: ${{ github.workspace }}/output
-
 jobs:
   release:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 7.0.x
-
-    - name: Pack solution
-      run: dotnet pack -o ${{ env.PACKAGE_OUPUT_DIRECTORY }} -c ${{ env.CONFIGURATION }} --include-symbols
-
-    - name: Publish to NuGet
-      run: dotnet nuget push ${{ env.PACKAGE_OUPUT_DIRECTORY }}/*.nupkg -k ${{ secrets.NUGET_API_KEY }}
+    uses: MAFIN-Squad/workflows/.github/workflows/package-release.yml@main
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 34e4e11..663ce35 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,29 +7,6 @@ on:
   push:
     branches: [ main ]
 
-env:
-  CONFIGURATION: Release
-
 jobs:
   test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 7.0.x
-
-    - name: Restore dependencies
-      run: dotnet restore
-
-    - name: Build solution
-      run: dotnet build -c ${{ env.CONFIGURATION }} --no-restore
-
-    - name: Run unit tests
-      run: dotnet test tests/*.Unit/*.csproj -c ${{ env.CONFIGURATION }} --no-build --collect:"XPlat Code Coverage"
-
-    - name: Upload code coverage results
-      uses: codecov/codecov-action@v3
+    uses: MAFIN-Squad/workflows/.github/workflows/package-test.yml@main
diff --git a/Directory.Build.props b/Directory.Build.props
index f58ad85..15dc437 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,10 +9,11 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Features>strict</Features>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <NoWarn>$(NoWarn),1573,1591,1712</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CST.DevSkim" PrivateAssets="all" />
     <PackageReference Include="Philips.CodeAnalysis.DuplicateCodeAnalyzer" PrivateAssets="all" />
     <PackageReference Include="SonarAnalyzer.CSharp" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers.Unstable" PrivateAssets="all" />
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2254892..06d541d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,10 +6,9 @@
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="FluentAssertions.Analyzers" Version="0.26.0" />
-    <PackageVersion Include="Microsoft.CST.DevSkim" Version="1.0.23" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Philips.CodeAnalysis.DuplicateCodeAnalyzer" Version="1.1.7" />
-    <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.12.0.78982" />
+    <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.15.0.81779" />
     <PackageVersion Include="StyleCop.Analyzers.Unstable" Version="1.2.0.507" />
     <PackageVersion Include="xunit.analyzers" Version="1.6.0" />
     <PackageVersion Include="xunit.core" Version="2.6.2" />
diff --git a/src/Mafin.Template/Mafin.Template.csproj b/src/Mafin.Template/Mafin.Template.csproj
index 3a7f6f1..3c53c2f 100644
--- a/src/Mafin.Template/Mafin.Template.csproj
+++ b/src/Mafin.Template/Mafin.Template.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.1</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>Mafin.Template</PackageId>
     <Description>MAFIN Template package</Description>
     <Authors>MAFIN Squad</Authors>
diff --git a/tests/Mafin.Template.Tests.Unit/Mafin.Template.Tests.Unit.csproj b/tests/Mafin.Template.Tests.Unit/Mafin.Template.Tests.Unit.csproj
index dfb6d5e..3fd4b5c 100644
--- a/tests/Mafin.Template.Tests.Unit/Mafin.Template.Tests.Unit.csproj
+++ b/tests/Mafin.Template.Tests.Unit/Mafin.Template.Tests.Unit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>