Split Avalonia Native package workflow

.github/workflows/nuget-static-graphics.yml

@@ -194,9 +194,6 @@ jobs:
       - name: Build macOS static graphics libraries
         run: bash ./scripts/build-macos-static-graphics.sh all
 
-      - name: Build macOS font preinit object
-        run: bash scripts/build-macos-font-preinit.sh
-
       - name: Upload macOS static archives
         uses: actions/upload-artifact@v4
         with:
@@ -204,61 +201,12 @@ jobs:
           path: External/NativeStatic/${{ matrix.rid }}/*
           if-no-files-found: error
 
-  build-macos-avalonia-native:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - rid: osx-x64
-            runner: macos-14
-            avalonia_version: 11.3.14
-          - rid: osx-arm64
-            runner: macos-15
-            avalonia_version: 11.3.14
-          - rid: osx-x64
-            runner: macos-14
-            avalonia_version: 12.0.3
-          - rid: osx-arm64
-            runner: macos-15
-            avalonia_version: 12.0.3
-    runs-on: ${{ matrix.runner }}
-    env:
-      RID: ${{ matrix.rid }}
-      WORK_DIR: ${{ github.workspace }}/External/NativeStatic/.work
-      OUTPUT_DIR: ${{ github.workspace }}/External/NativeStatic/${{ matrix.rid }}/native
-      AVALONIA_VERSION: ${{ matrix.avalonia_version }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup .NET for Avalonia header generation
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: |
-            8.0.x
-            10.0.x
-
-      - name: Build static AvaloniaNative
-        run: bash ./scripts/build-macos-avalonia-native-static.sh
-
-      - name: Build macOS font preinit object
-        run: bash scripts/build-macos-font-preinit.sh
-
-      - name: Upload static AvaloniaNative
-        uses: actions/upload-artifact@v4
-        with:
-          name: native-avalonia-${{ matrix.avalonia_version }}-${{ matrix.rid }}
-          path: |
-            External/NativeStatic/${{ matrix.rid }}/native/libAvaloniaNative.a
-            External/NativeStatic/${{ matrix.rid }}/native/macos_font_preinit.o
-          if-no-files-found: error
-
   pack:
     runs-on: ubuntu-latest
     needs:
       - build-linux
       - build-windows
       - build-macos
-      - build-macos-avalonia-native
     permissions:
       contents: read
     steps:
@@ -276,13 +224,6 @@ jobs:
           path: External/NativeStatic
           merge-multiple: false
 
-      - name: Download static AvaloniaNative archives
-        uses: actions/download-artifact@v4
-        with:
-          pattern: native-avalonia-*
-          path: External/AvaloniaNative
-          merge-multiple: false
-
       - name: Move static archives into RID directories
         run: |
           for rid in win-x64 win-x86 win-arm64 linux-x64 linux-arm64 linux-musl-x64 linux-musl-arm64 osx-x64 osx-arm64; do
@@ -315,18 +256,7 @@ jobs:
           test -f External/NativeStatic/win-x86/native/skia_x86_stdcall_thunks.lib
 
       - name: Pack NuGet package
-        run: |
-          dotnet pack NuGet/StaticGraphics/StaticLink.Avalonia.csproj -c Release -o artifacts/nuget
-          for version in 11.3.14 12.0.3; do
-            mkdir -p External/NativeStatic/osx-x64/native External/NativeStatic/osx-arm64/native
-            cp External/AvaloniaNative/native-avalonia-$version-osx-x64/* External/NativeStatic/osx-x64/native/
-            cp External/AvaloniaNative/native-avalonia-$version-osx-arm64/* External/NativeStatic/osx-arm64/native/
-            dotnet pack NuGet/AvaloniaNative/StaticLink.Avalonia.Native.csproj \
-              -c Release \
-              -o artifacts/nuget \
-              /p:PackageVersion=$version.1 \
-              /p:Version=$version.1
-          done
+        run: dotnet pack NuGet/StaticGraphics/StaticLink.Avalonia.csproj -c Release -o artifacts/nuget
 
       - name: Upload NuGet artifact
         uses: actions/upload-artifact@v4
@@ -380,19 +310,9 @@ jobs:
           - rid: osx-x64
             runner: macos-14
             avalonia_version: 11.3.14
-            native_version: 11.3.14.1
           - rid: osx-arm64
             runner: macos-15
             avalonia_version: 11.3.14
-            native_version: 11.3.14.1
-          - rid: osx-x64
-            runner: macos-14
-            avalonia_version: 12.0.3
-            native_version: 12.0.3.1
-          - rid: osx-arm64
-            runner: macos-15
-            avalonia_version: 12.0.3
-            native_version: 12.0.3.1
     runs-on: ${{ matrix.runner }}
     steps:
       - uses: actions/checkout@v4
@@ -429,15 +349,10 @@ jobs:
           if (-not $package) { throw "StaticLink NuGet package was not downloaded." }
           if ($package.BaseName -notmatch '^StaticLink\.Avalonia\.(.+)$') { throw "Unexpected package name: $($package.Name)" }
           $version = $Matches[1]
-          $nativeVersion = "${{ matrix.native_version }}"
           $avaloniaVersion = "${{ matrix.avalonia_version }}"
           if (-not $avaloniaVersion) { $avaloniaVersion = "11.3.14" }
-          if ($nativeVersion) {
-            $nativePackage = Get-ChildItem -Path "artifacts/nuget" -Filter "StaticLink.Avalonia.Native.$nativeVersion.nupkg" | Select-Object -First 1
-            if (-not $nativePackage) { throw "StaticLink AvaloniaNative NuGet package $nativeVersion was not downloaded." }
-          }
           $projectDir = Join-Path $PWD "artifacts/avalonia-smoke-src"
-          pwsh ./scripts/create-avalonia-smoke.ps1 -ProjectDir $projectDir -NuGetSource (Resolve-Path "artifacts/nuget") -StaticLinkVersion $version -AvaloniaVersion $avaloniaVersion -StaticLinkNativeVersion $nativeVersion
+          pwsh ./scripts/create-avalonia-smoke.ps1 -ProjectDir $projectDir -NuGetSource (Resolve-Path "artifacts/nuget") -StaticLinkVersion $version -AvaloniaVersion $avaloniaVersion
           dotnet publish (Join-Path $projectDir "AvaloniaStaticLinkSmoke.csproj") `
             -c Release `
             -r "${{ matrix.rid }}" `
@@ -470,7 +385,7 @@ jobs:
         run: |
           $publishDir = "artifacts/smoke-${{ matrix.rid }}"
           $blocked = Get-ChildItem -Path $publishDir -Recurse -File | Where-Object {
-            $_.Name -in @("libSkiaSharp.dll", "libHarfBuzzSharp.dll", "av_libglesv2.dll", "libSkiaSharp.so", "libHarfBuzzSharp.so", "libAvaloniaNative.dylib", "libSkiaSharp.dylib", "libHarfBuzzSharp.dylib")
+            $_.Name -in @("libSkiaSharp.dll", "libHarfBuzzSharp.dll", "av_libglesv2.dll", "libSkiaSharp.so", "libHarfBuzzSharp.so", "libSkiaSharp.dylib", "libHarfBuzzSharp.dylib")
           }
           if ($blocked) {
             $blocked | ForEach-Object { Write-Error "Unexpected dynamic graphics library: $($_.FullName)" }