Fix skia pack prerequisites and matrix host flavor

Author: chsbuffer

.github/workflows/build.yml

@@ -91,18 +91,18 @@ jobs:
           fetch-depth: 1
           submodules: false
 
-      - name: Compute hostlibs cache key (10.0 win-x64)
+      - name: Compute hostlibs cache key (10.0 default win-x64)
         id: hostlibs_key
         shell: powershell
         run: |
-          $key = python .\scripts\cache_key.py --kind hostlibs --arch x64 --os windows --runtime-version 10.0 --hostlibs-flavor no-pgo
+          $key = python .\scripts\cache_key.py --kind hostlibs --arch x64 --os windows --runtime-version 10.0 --hostlibs-flavor default
           "key=$key" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
 
-      - name: Restore hostlibs cache (10.0 win-x64)
+      - name: Restore hostlibs cache (10.0 default win-x64)
         uses: actions/cache@v5
         with:
           fail-on-cache-miss: true
-          path: artifacts\hostlibs\10.0\no-pgo\win-x64
+          path: artifacts\hostlibs\10.0\default\win-x64
           key: ${{ steps.hostlibs_key.outputs.key }}
 
       - name: Run matrix integration build
@@ -165,6 +165,9 @@ jobs:
           fetch-depth: 1
           submodules: false
 
+      - name: Install LLVM
+        uses: ./.github/actions/install-llvm
+
       - name: Compute skia cache key
         id: skia_key
         shell: powershell

samples/simple-pinvoke/SimplePInvoke.csproj

@@ -12,7 +12,7 @@
   <PropertyGroup>
     <RidOrDefault>$(RuntimeIdentifier)</RidOrDefault>
     <RidOrDefault Condition="'$(RidOrDefault)' == ''">$(DefaultAppHostRuntimeIdentifier)</RidOrDefault>
-    <HostLibsFlavor Condition="'$(RidOrDefault)' != '' and $(RidOrDefault.StartsWith('win'))">no-pgo</HostLibsFlavor>
+    <HostLibsFlavor Condition="'$(RidOrDefault)' != '' and $(RidOrDefault.StartsWith('win'))">default</HostLibsFlavor>
     <HostLibsRoot>$([MSBuild]::NormalizePath('$(HostLibsBaseRoot)', '$(HostLibsFlavor)'))</HostLibsRoot>
     <StaticHostAssetsBaseDir>$(HostLibsRoot)</StaticHostAssetsBaseDir>
   </PropertyGroup>