From 8ec528f2e0861e7b0bdc69d9411b480ada201f80 Mon Sep 17 00:00:00 2001
From: "Shkar T. Noori" <shkar.noori@dit.gov.krd>
Date: Sun, 28 Apr 2024 11:26:40 +0300
Subject: [PATCH] Update GitHub Actions workflows to use the latest versions of
 actions/setup-dotnet and actions/checkout

---
 .github/workflows/deploy-nuget.yaml           |  9 ++++----
 .github/workflows/tests-base.yaml             | 16 +++++++-------
 .../DIT.Workflower.DependencyInjection.csproj | 22 ++++++++++++++++---
 src/DIT.Workflower/DIT.Workflower.csproj      | 14 ++++++++++++
 4 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/deploy-nuget.yaml b/.github/workflows/deploy-nuget.yaml
index 1b8c15d..87d64cf 100644
--- a/.github/workflows/deploy-nuget.yaml
+++ b/.github/workflows/deploy-nuget.yaml
@@ -1,3 +1,4 @@
+---
 name: Deploy To Nuget
 
 on:
@@ -19,13 +20,13 @@ jobs:
   build-push:
     name: Build and Publish
     needs: [test]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
 
       - name: Restore packages
         run: dotnet restore
diff --git a/.github/workflows/tests-base.yaml b/.github/workflows/tests-base.yaml
index ce42cc9..27b7efb 100644
--- a/.github/workflows/tests-base.yaml
+++ b/.github/workflows/tests-base.yaml
@@ -13,7 +13,7 @@ on:
       sonarqube:
         type: boolean
         required: false
-        default: fals
+        default: false
 
     secrets:
       SONARQUBE_HOST:
@@ -34,11 +34,11 @@ jobs:
       ASPNETCORE_ENVIRONMENT: Testing
 
     steps:
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: ${{ !inputs.sonarqube }}
 
       - name: Run tests
@@ -48,14 +48,14 @@ jobs:
       ###############################
       ########## SONARQUBE ##########
       ###############################
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         if: ${{ inputs.sonarqube }}
         with:
           distribution: "zulu"
-          java-version: "11"
+          java-version: "17"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: ${{ inputs.sonarqube }}
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
diff --git a/src/DIT.Workflower.DependencyInjection/DIT.Workflower.DependencyInjection.csproj b/src/DIT.Workflower.DependencyInjection/DIT.Workflower.DependencyInjection.csproj
index 2600550..d4560d0 100644
--- a/src/DIT.Workflower.DependencyInjection/DIT.Workflower.DependencyInjection.csproj
+++ b/src/DIT.Workflower.DependencyInjection/DIT.Workflower.DependencyInjection.csproj
@@ -1,13 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+
+    <IsPackable>true</IsPackable>
+    <PackageId>DIT.Workflower.DependencyInjection</PackageId>
+    <Authors>DIT</Authors>
+    <Company>DIT</Company>
+
+    <!-- Symbols for nuget -->
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+    <!-- Deterministic Builds -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+  <ItemGroup >
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0" Condition="'$(TargetFramework)' == 'net6.0'" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0" Condition="'$(TargetFramework)' == 'net8.0'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/DIT.Workflower/DIT.Workflower.csproj b/src/DIT.Workflower/DIT.Workflower.csproj
index 15526bf..57417a8 100644
--- a/src/DIT.Workflower/DIT.Workflower.csproj
+++ b/src/DIT.Workflower/DIT.Workflower.csproj
@@ -5,6 +5,20 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <LangVersion>latest</LangVersion>
+
+    <IsPackable>true</IsPackable>
+    <PackageId>DIT.Workflower</PackageId>
+    <Authors>DIT</Authors>
+    <Company>DIT</Company>
+
+    <!-- Symbols for nuget -->
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+    <!-- Deterministic Builds -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+
   </PropertyGroup>
 
 </Project>