Restore workloads

Author: mattjohnsonpint

.github/workflows/build.yml

@@ -55,17 +55,10 @@ jobs:
             # We don't use a lockfile, so hash all files where we might be keeping <PackageReference> tags
             # Workloads also get installed in the nuget packages cache, so if you modify workloads below, increment the number in the cache keys
             key: ${{ runner.os }}-nuget+workloads2-${{ hashFiles('**/*.*proj', '**/*.props') }}
-            restore-keys: ${{ runner.os }}-nuget+workloads2
+            restore-keys: ${{ runner.os }}-nuget+workloads3
 
-        - name: Install .NET Workloads (Ubuntu)
-          if: startsWith(matrix.os, 'ubuntu')
-          run: dotnet workload install maui-android
-        - name: Install .NET Workloads (Windows)
-          if: startsWith(matrix.os, 'windows')
-          run: dotnet workload install maui-android maui-windows
-        - name: Install .NET Workloads (macOS)
-          if: startsWith(matrix.os, 'macos')
-          run: dotnet workload install maui-android maui-ios maui-maccatalyst
+        - name: Restore .NET Workloads
+          run: dotnet workload restore
 
         - name: Build
           run: dotnet build -c Release /p:CopyLocalLockFileAssemblies=true

.github/workflows/codeql-analysis.yml

@@ -35,6 +35,9 @@ jobs:
         key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.*proj', '**/*.props') }}
         restore-keys: ${{ runner.os }}-nuget
 
+    - name: Restore .NET Workloads
+      run: dotnet workload restore
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2