Merge pull request #1304 from dorssel/nuget_cache

Refactor NuGet cache

Author: dorssel

.github/workflows/build-installer.yml

@@ -33,15 +33,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: NuGet Cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ github.workspace }}/.nuget/packages
-          key: nuget-cache-build-${{ hashFiles('global.json', '.config/dotnet-tools.json', '**/packages.lock.json') }}
-
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
+        with:
+          cache: true
+          cache-dependency-path: |
+            global.json
+            .config/dotnet-tools.json
+            '**/packages.lock.json'
 
       - name: Install dependencies
         run: |

.github/workflows/codeql-analysis.yml

@@ -5,25 +5,12 @@
 ---
 # yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 
-# 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.
-# ******** NOTE ********
-
 name: CodeQL
 
 on:
   push:
     branches: [master]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [master]
   schedule:
     - cron: '20 0 * * 4'
@@ -33,19 +20,11 @@ permissions: read-all
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     permissions:
       security-events: write
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [csharp]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
     env:
       NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
       DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE: true
@@ -56,49 +35,28 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
         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.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # 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@v3
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      # - run: |
-      #   make bootstrap
-      #   make release
-
-      - name: NuGet Cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ github.workspace }}/.nuget/packages
-          key: nuget-cache-codeql-${{ hashFiles('global.json', '.config/dotnet-tools.json', '**/packages.lock.json') }}
+          languages: csharp
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
+        with:
+          cache: true
+          cache-dependency-path: |
+            global.json
+            .config/dotnet-tools.json
+            '**/packages.lock.json'
 
       - name: Install dependencies
         run: |
           dotnet tool restore
           dotnet restore
 
       - name: Build
-        run: dotnet build --configuration Release --no-restore --property:Platform=x64
+        run: |
+          dotnet build --configuration Release --no-restore --property:Platform=x64
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v4

Directory.Build.props

@@ -17,9 +17,6 @@ SPDX-License-Identifier: GPL-3.0-only
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
 
-    <!-- This allows building on Linux; however, building the installer requires Windows -->
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
-
     <!-- Be very strict -->
     <WarningLevel>9999</WarningLevel>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>