From 965c4b366da20de7bc50488029e9826a420e10ed Mon Sep 17 00:00:00 2001
From: Rasmus Mikkelsen <r@smus.nu>
Date: Wed, 15 Nov 2023 18:57:42 +0100
Subject: [PATCH] Update to .NET 8

---
 .github/workflows/codeql.yml        | 39 ++++-------------------------
 .github/workflows/pull-requests.yml | 10 ++++----
 .github/workflows/release.yml       | 11 ++++----
 Source/Bake.Tests/Bake.Tests.csproj |  2 +-
 Source/Bake/Bake.csproj             |  2 +-
 5 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 28b55ad5..ce8838dd 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,21 +1,9 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
 on:
   push:
     branches: [ develop, develop*, release* ]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [ develop ]
   schedule:
     - cron: '27 1 * * 6'
@@ -33,40 +21,23 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'csharp' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    # Initializes the CodeQL tools for scanning.
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 8.0.x
+
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
 
-        
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
       uses: github/codeql-action/autobuild@v2
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
-
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
index bea6b457..45937300 100644
--- a/.github/workflows/pull-requests.yml
+++ b/.github/workflows/pull-requests.yml
@@ -21,14 +21,14 @@ jobs:
     - name: Start Docker services
       run: docker-compose up -d --force-recreate
 
-    - name: Setup .NET Core 3.1.x
+    - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 3.1.x
-    - name: Setup .NET Core 6.0.x
-      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          3.1.x
+          6.0.x
+          8.0.x
     - name: Setup Go 1.17.2
       uses: actions/setup-go@v4
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 720c3062..d92a50a9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,14 +20,13 @@ jobs:
     - name: Start Docker services
       run: docker-compose up -d --force-recreate
       
-    - name: Setup .NET Core 3.1.x
+    - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 3.1.x
-    - name: Setup .NET Core 6.0.x
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          3.1.x
+          6.0.x
+          8.0.x
     - name: Setup Go 1.17.2
       uses: actions/setup-go@v4
       with:
diff --git a/Source/Bake.Tests/Bake.Tests.csproj b/Source/Bake.Tests/Bake.Tests.csproj
index 6ec9d865..121e1f8f 100644
--- a/Source/Bake.Tests/Bake.Tests.csproj
+++ b/Source/Bake.Tests/Bake.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>fbc4985e-9a99-4716-8cb2-65274aeda8c6</UserSecretsId>
   </PropertyGroup>
 
diff --git a/Source/Bake/Bake.csproj b/Source/Bake/Bake.csproj
index 0e32ec8b..ddbe8ea3 100644
--- a/Source/Bake/Bake.csproj
+++ b/Source/Bake/Bake.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PackageId>Bake</PackageId>
     <IsTool>true</IsTool>
     <PackAsTool>true</PackAsTool>