Simplify README usage

NuGet/StaticGraphics/README.md

@@ -1,19 +1,6 @@
 # StaticLink.Avalonia
 
-Static native libraries for Avalonia NativeAOT publishing.
-
-This package links Avalonia's graphics/native dependencies from static archives so NativeAOT publish output does not need the usual SkiaSharp, HarfBuzzSharp, ANGLE, or AvaloniaNative runtime files next to the executable.
-
-Repository: <https://github.com/greepar/StaticLink.Avalonia>
-
-## Supported RIDs
-
-- `win-x64`
-- `win-arm64`
-- `linux-x64`
-- `linux-arm64`
-- `osx-x64`
-- `osx-arm64`
+Static native libraries for Avalonia single-file NativeAOT publishing.
 
 ## Install
 
@@ -21,10 +8,16 @@ Repository: <https://github.com/greepar/StaticLink.Avalonia>
 dotnet add package StaticLink.Avalonia
 ```
 
-For fully static macOS output, also reference the AvaloniaNative package that matches your Avalonia version:
+Or add it manually:
 
-```bash
-dotnet add package StaticLink.Avalonia.Native --version 11.3.14.1
+```xml
+<PackageReference Include="StaticLink.Avalonia" Version="3.119.2-7151.10" />
+```
+
+For macOS, also reference `StaticLink.Avalonia.Native`. This package is macOS-only and must match your Avalonia version because it contains `libAvaloniaNative.a`.
+
+```xml
+<PackageReference Include="StaticLink.Avalonia.Native" Version="11.3.14.1" />
 ```
 
 ## Publish
@@ -37,32 +30,6 @@ dotnet publish -c Release -r win-x64 \
   -p:StripSymbols=true
 ```
 
-Use the RID you need, for example `linux-x64`, `linux-arm64`, `osx-arm64`, or `osx-x64`.
+Use the RID you need, such as `win-x86`, `linux-x64`, `linux-arm64`, `osx-arm64`, or `osx-x64`.
 
-For Linux, `lld` is recommended:
-
-```bash
-dotnet publish -c Release -r linux-x64 \
-  -p:PublishAot=true \
-  -p:SelfContained=true \
-  -p:PublishSingleFile=true \
-  -p:StripSymbols=true \
-  -p:LinkerFlavor=lld
-```
-
-For macOS, avoid the Metal renderer for fully static output. Use OpenGL or Software:
-
-```csharp
-.With(new AvaloniaNativePlatformOptions
-{
-    RenderingMode = [AvaloniaNativeRenderingMode.OpenGl, AvaloniaNativeRenderingMode.Software]
-})
-```
-
-## Notes
-
-- The package is intended for Avalonia `11.3.x` NativeAOT apps.
-- `StaticLink.Avalonia.Native` is version-specific because `libAvaloniaNative.a` must match Avalonia's native ABI.
-- The CI builds and smoke-publishes all six supported RIDs.
-- macOS smoke tests run the published app on GitHub Actions and require it to stay alive for 15 seconds.
-- Other native dependencies used by your app, such as SQLite or audio libraries, are outside this package's scope.
+For macOS, avoid the Metal renderer for fully static output. Use OpenGL or Software.

NuGet/StaticGraphics/StaticLink.Avalonia.csproj

@@ -28,6 +28,7 @@
         <None Include="buildTransitive/StaticLink.Avalonia.props" Pack="true" PackagePath="buildTransitive/$(PackageId).props" />
         <None Include="buildTransitive/StaticLink.Avalonia.targets" Pack="true" PackagePath="buildTransitive/$(PackageId).targets" />
         <None Include="../../External/NativeStatic/win-x64/native/**/*" Pack="true" PackagePath="static/win-x64/native/%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="../../External/NativeStatic/win-x86/native/**/*" Pack="true" PackagePath="static/win-x86/native/%(RecursiveDir)%(Filename)%(Extension)" />
         <None Include="../../External/NativeStatic/win-arm64/native/**/*" Pack="true" PackagePath="static/win-arm64/native/%(RecursiveDir)%(Filename)%(Extension)" />
         <None Include="../../External/NativeStatic/linux-x64/native/**/*" Pack="true" PackagePath="static/linux-x64/native/%(RecursiveDir)%(Filename)%(Extension)" />
         <None Include="../../External/NativeStatic/linux-arm64/native/**/*" Pack="true" PackagePath="static/linux-arm64/native/%(RecursiveDir)%(Filename)%(Extension)" />

NuGet/StaticGraphics/buildTransitive/StaticLink.Avalonia.targets

@@ -1,6 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <_StaticLinkAvaloniaRid Condition="'$(RuntimeIdentifier)' == 'win-x64'">win-x64</_StaticLinkAvaloniaRid>
+        <_StaticLinkAvaloniaRid Condition="'$(RuntimeIdentifier)' == 'win-x86'">win-x86</_StaticLinkAvaloniaRid>
         <_StaticLinkAvaloniaRid Condition="'$(RuntimeIdentifier)' == 'win-arm64'">win-arm64</_StaticLinkAvaloniaRid>
         <_StaticLinkAvaloniaRid Condition="'$(RuntimeIdentifier)' == 'linux-x64'">linux-x64</_StaticLinkAvaloniaRid>
         <_StaticLinkAvaloniaRid Condition="'$(RuntimeIdentifier)' == 'linux-arm64'">linux-arm64</_StaticLinkAvaloniaRid>
@@ -10,7 +11,7 @@
         <LinkerFlavor Condition="'$(LinkerFlavor)' == '' and ('$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64')">lld</LinkerFlavor>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(PublishAot)' == 'true' and ('$(RuntimeIdentifier)' == 'win-x64' or '$(RuntimeIdentifier)' == 'win-arm64') and '$(_StaticLinkAvaloniaNativeRoot)' != ''">
+    <ItemGroup Condition="'$(PublishAot)' == 'true' and ('$(RuntimeIdentifier)' == 'win-x64' or '$(RuntimeIdentifier)' == 'win-x86' or '$(RuntimeIdentifier)' == 'win-arm64') and '$(_StaticLinkAvaloniaNativeRoot)' != ''">
         <DirectPInvoke Include="libHarfBuzzSharp" Condition="Exists('$(_StaticLinkAvaloniaNativeRoot)/libHarfBuzzSharp.lib')" />
         <DirectPInvoke Include="libSkiaSharp" Condition="Exists('$(_StaticLinkAvaloniaNativeRoot)/SkiaSharp.lib')" />
         <DirectPInvoke Include="libGLESv2" Condition="Exists('$(_StaticLinkAvaloniaNativeRoot)/libGLESv2_static.lib')" />