From 9259b3b62280c94dcbbf7546f230c3b7a9ac58c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 00:17:40 +1000
Subject: [PATCH] Bump actions/upload-artifact from 3 to 4 (#2609)

* Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Pipeline updates

* Fixes

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bernie White <bewhite@microsoft.com>
---
 .github/workflows/analyze.yaml |  6 +++---
 .github/workflows/build.yaml   | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/analyze.yaml b/.github/workflows/analyze.yaml
index 4153b40bb36..7a7083c2f5c 100644
--- a/.github/workflows/analyze.yaml
+++ b/.github/workflows/analyze.yaml
@@ -51,7 +51,7 @@ jobs:
           sarif_file: reports/ps-rule-results.sarif
 
       - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: PSRule-Sarif
@@ -82,7 +82,7 @@ jobs:
           sarif_file: devskim-results.sarif
 
       - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: DevSkim-Sarif
@@ -114,7 +114,7 @@ jobs:
         id: codeql-analyze
 
       - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: CodeQL-Sarif
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1adcab8072b..41d8736ccac 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -16,6 +16,7 @@ on:
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
+  DOTNET_VERSION: 7.x
 
 jobs:
   build:
@@ -32,7 +33,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.x
+        dotnet-version: ${{ env.DOTNET_VERSION }}
 
     - name: Install dependencies
       shell: pwsh
@@ -45,7 +46,7 @@ jobs:
       run: Invoke-Build -Configuration Release -AssertStyle GitHubActions
 
     - name: Upload module
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Module
         path: ./out/modules/PSRule.Rules.Azure/*
@@ -53,7 +54,7 @@ jobs:
         if-no-files-found: error
 
     # - name: Upload Test Results
-    #   uses: actions/upload-artifact@v3
+    #   uses: actions/upload-artifact@v4
     #   if: always()
     #   with:
     #     name: Module.DotNet.TestResults
@@ -62,10 +63,10 @@ jobs:
     #     if-no-files-found: error
 
     - name: Upload PSRule Results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: Module.PSRule.TestResults
+        name: Results-PSRule
         path: ./reports/ps-rule*.xml
         retention-days: 3
         if-no-files-found: error
@@ -110,7 +111,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.x
+        dotnet-version: ${{ env.DOTNET_VERSION }}
 
     - if: ${{ matrix.shell == 'pwsh' }}
       name: Install dependencies (PowerShell)
@@ -125,7 +126,7 @@ jobs:
       run: ./scripts/pipeline-deps.ps1
 
     - name: Download module
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: Module
         path: ./out/modules/PSRule.Rules.Azure