feat: Support NativeAOT static linking on Linux and macOS

.github/workflows/build.yaml

@@ -55,6 +55,11 @@ jobs:
       - name: Test
         shell: bash
         run: dotnet test -c Release
+      - name: Build libminipty_unix
+        if: ${{ !startsWith(matrix.rid, 'win') }}
+        shell: bash
+        run: bash scripts/build-native.sh "${{ matrix.rid }}"
+
       - name: Publish and run samples (NativeAOT)
         shell: bash
         run: |
@@ -66,6 +71,15 @@ jobs:
               exe="$out/${sample}.exe"
             fi
             test -f "$exe"
+            if [[ "${{ matrix.rid }}" == linux-* ]]; then
+              test ! -f "$out/libminipty_unix.so"
+              test ! -f "$out/libminipty_unix.a"
+            fi
+            if [[ "${{ matrix.rid }}" == osx-* ]]; then
+              test ! -f "$out/libminipty_unix.dylib"
+              test ! -f "$out/libminipty_unix.a"
+              test -f "$out/minipty_spawn_helper"
+            fi
             "$exe"
           done
 
@@ -145,11 +159,17 @@ jobs:
       matrix:
         include:
           - os: ubuntu-24.04
+            rid: linux-x64
           - os: ubuntu-24.04-arm
+            rid: linux-arm64
           - os: windows-2025
+            rid: win-x64
           - os: windows-11-arm
+            rid: win-arm64
           - os: macos-26
+            rid: osx-arm64
           - os: macos-26-intel
+            rid: osx-x64
     permissions:
       contents: read
     runs-on: ${{ matrix.os }}
@@ -172,7 +192,7 @@ jobs:
           path: ./publish
       - name: Run NuGet smoke sample
         shell: bash
-        run: bash scripts/run-nuget-smoke.sh "${MINIPTY_CI_PACKAGE_VERSION}" ./publish
+        run: bash scripts/run-nuget-smoke.sh "${MINIPTY_CI_PACKAGE_VERSION}" ./publish "${{ matrix.rid }}"
 
   build-complete:
     needs: [build, nuget-smoke]

.github/workflows/release.yaml

@@ -149,11 +149,17 @@ jobs:
       matrix:
         include:
           - os: ubuntu-24.04
+            rid: linux-x64
           - os: ubuntu-24.04-arm
+            rid: linux-arm64
           - os: windows-2025
+            rid: win-x64
           - os: windows-11-arm
+            rid: win-arm64
           - os: macos-26
+            rid: osx-arm64
           - os: macos-26-intel
+            rid: osx-x64
     permissions:
       contents: read
     runs-on: ${{ matrix.os }}
@@ -176,7 +182,7 @@ jobs:
           path: ./publish
       - name: Run NuGet smoke sample
         shell: bash
-        run: bash scripts/run-nuget-smoke.sh "${{ needs.verify.outputs.version }}" ./publish
+        run: bash scripts/run-nuget-smoke.sh "${{ needs.verify.outputs.version }}" ./publish "${{ matrix.rid }}"
 
   attest:
     name: Attest packages

Directory.Build.props

@@ -10,7 +10,7 @@
     <IsAotCompatible>true</IsAotCompatible>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <IsPackable>false</IsPackable>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <Authors>guitarrapc</Authors>
     <Copyright>© guitarrapc</Copyright>
     <PackageTags>pty</PackageTags>

Directory.Build.targets

@@ -0,0 +1,4 @@
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)buildTransitive\MiniPty.targets"
+          Condition="Exists('$(MSBuildThisFileDirectory)buildTransitive\MiniPty.targets')" />
+</Project>

buildTransitive/MiniPty.targets

@@ -0,0 +1,56 @@
+<Project>
+  <PropertyGroup>
+    <_MiniPtyStaticUnixRid>false</_MiniPtyStaticUnixRid>
+    <_MiniPtyStaticUnixRid Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64' or '$(RuntimeIdentifier)' == 'osx-x64' or '$(RuntimeIdentifier)' == 'osx-arm64'">true</_MiniPtyStaticUnixRid>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(PublishAot)' == 'true' and '$(_MiniPtyStaticUnixRid)' == 'true'">
+    <MiniPtyStaticUnixNative>true</MiniPtyStaticUnixNative>
+    <MiniPtyBuildUnixNative>false</MiniPtyBuildUnixNative>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(MiniPtyStaticUnixNative)' == 'true'">
+    <DirectPInvoke Include="minipty_unix" />
+    <NativeLibrary Include="$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\libminipty_unix.a" />
+    <LinkerArg Include="-lutil" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(MiniPtyStaticUnixNative)' == 'true' and $(RuntimeIdentifier.StartsWith('osx'))">
+    <None Include="$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\minipty_spawn_helper"
+          Link="minipty_spawn_helper"
+          CopyToOutputDirectory="PreserveNewest"
+          CopyToPublishDirectory="PreserveNewest"
+          Condition="Exists('$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\minipty_spawn_helper')" />
+  </ItemGroup>
+
+  <Target Name="_MiniPtyValidateStaticArchive"
+          BeforeTargets="PrepareForBuild"
+          Condition="'$(MiniPtyStaticUnixNative)' == 'true' and !Exists('$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\libminipty_unix.a')">
+    <Error Text="MiniPty: missing runtimes/$(RuntimeIdentifier)/native/libminipty_unix.a. Ensure the package contains the static archive; when building from source, run: bash scripts/build-native.sh $(RuntimeIdentifier)" />
+  </Target>
+
+  <Target Name="_MiniPtyValidateSpawnHelper"
+          BeforeTargets="PrepareForBuild"
+          Condition="'$(MiniPtyStaticUnixNative)' == 'true' and $(RuntimeIdentifier.StartsWith('osx')) and !Exists('$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\minipty_spawn_helper')">
+    <Error Text="MiniPty: missing runtimes/$(RuntimeIdentifier)/native/minipty_spawn_helper (required on macOS). When building from source, run: bash scripts/build-native.sh $(RuntimeIdentifier)" />
+  </Target>
+
+  <!-- Drop shared shim and the link-time archive from publish output. -->
+  <Target Name="_MiniPtyExcludeUnixSharedNativeFromPublish"
+          AfterTargets="ComputeResolvedFilesToPublishList"
+          BeforeTargets="CopyFilesToPublishDirectory"
+          Condition="'$(MiniPtyStaticUnixNative)' == 'true'">
+    <ItemGroup>
+      <None Remove="@(None)"
+            Condition="$([System.String]::Copy('%(Filename)%(Extension)').Equals('libminipty_unix.so')) or $([System.String]::Copy('%(Filename)%(Extension)').Equals('libminipty_unix.dylib')) or $([System.String]::Copy('%(Filename)%(Extension)').Equals('libminipty_unix.a'))" />
+      <Content Remove="@(Content)"
+               Condition="$([System.String]::Copy('%(Filename)%(Extension)').Equals('libminipty_unix.so')) or $([System.String]::Copy('%(Filename)%(Extension)').Equals('libminipty_unix.dylib')) or $([System.String]::Copy('%(Filename)%(Extension)').Equals('libminipty_unix.a'))" />
+      <ContentWithTargetPath Remove="@(ContentWithTargetPath)"
+                             Condition="$([System.String]::Copy('%(TargetPath)').EndsWith('libminipty_unix.so')) or $([System.String]::Copy('%(TargetPath)').EndsWith('libminipty_unix.dylib')) or $([System.String]::Copy('%(TargetPath)').EndsWith('libminipty_unix.a'))" />
+      <_ResolvedCopyLocalPublishAssets Remove="@(_ResolvedCopyLocalPublishAssets)"
+                                       Condition="$([System.String]::Copy('%(Filename)%(Extension)').Equals('libminipty_unix.so')) or $([System.String]::Copy('%(Filename)%(Extension)').Equals('libminipty_unix.dylib')) or $([System.String]::Copy('%(Filename)%(Extension)').Equals('libminipty_unix.a'))" />
+      <ResolvedFileToPublish Remove="@(ResolvedFileToPublish)"
+                             Condition="$([System.String]::Copy('%(RelativePath)').EndsWith('libminipty_unix.so')) or $([System.String]::Copy('%(RelativePath)').EndsWith('libminipty_unix.dylib')) or $([System.String]::Copy('%(RelativePath)').EndsWith('libminipty_unix.a'))" />
+    </ItemGroup>
+  </Target>
+</Project>

scripts/build-native.sh

@@ -12,12 +12,35 @@ out_dir="$root/runtimes/$rid/native"
 
 mkdir -p "$out_dir"
 
+build_static_archive() {
+  local out="$1"
+  shift
+  local src
+  local work
+  local objs=()
+
+  work="$(mktemp -d)"
+  trap 'rm -rf "$work"; trap - RETURN' RETURN
+  for src in "$@"; do
+    local base
+    base="$(basename "$src")"
+    cp "$src" "$work/$base"
+    local obj="$work/${base%.c}.o"
+    cc -c -fPIC -O2 -I"$native_dir" -o "$obj" "$work/$base"
+    objs+=("$obj")
+  done
+
+  ar rcs "$out" "${objs[@]}"
+}
+
 case "$rid" in
   linux-*)
     cc -shared -fPIC -O2 -lutil -o "$out_dir/libminipty_unix.so" "${sources[@]}"
+    build_static_archive "$out_dir/libminipty_unix.a" "${sources[@]}"
     ;;
   osx-*)
     cc -shared -fPIC -O2 -lutil -o "$out_dir/libminipty_unix.dylib" "${sources[@]}"
+    build_static_archive "$out_dir/libminipty_unix.a" "${sources[@]}"
     cc -O2 -o "$out_dir/minipty_spawn_helper" "$native_dir/minipty_spawn_helper.c" "$native_dir/minipty_unix_exec.c"
     ;;
   win-*)

scripts/pack-with-native.sh

@@ -8,10 +8,14 @@ root="$(cd "$(dirname "$0")/.." && pwd)"
 
 required=(
   "linux-x64/native/libminipty_unix.so"
+  "linux-x64/native/libminipty_unix.a"
   "linux-arm64/native/libminipty_unix.so"
+  "linux-arm64/native/libminipty_unix.a"
   "osx-x64/native/libminipty_unix.dylib"
+  "osx-x64/native/libminipty_unix.a"
   "osx-x64/native/minipty_spawn_helper"
   "osx-arm64/native/libminipty_unix.dylib"
+  "osx-arm64/native/libminipty_unix.a"
   "osx-arm64/native/minipty_spawn_helper"
 )
 

scripts/run-nuget-smoke.sh

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-version="${1:?Usage: run-nuget-smoke.sh <package-version> <nupkg-directory>}"
-feed_dir="${2:?Usage: run-nuget-smoke.sh <package-version> <nupkg-directory>}"
+version="${1:?Usage: run-nuget-smoke.sh <package-version> <nupkg-directory> [runtime-identifier]}"
+feed_dir="${2:?Usage: run-nuget-smoke.sh <package-version> <nupkg-directory> [runtime-identifier]}"
+rid="${3:-}"
 version="${version#v}"
 
 to_dotnet_path() {
@@ -63,3 +64,25 @@ cat > "$tmp/NuGetSmoke.csproj" <<EOF
 EOF
 
 dotnet run --project "$tmp/NuGetSmoke.csproj" -c Release --configfile "$tmp/nuget.config"
+
+if [[ -n "$rid" ]]; then
+  out="$tmp/aot-publish"
+  dotnet publish "$tmp/NuGetSmoke.csproj" -c Release -r "$rid" \
+    --self-contained true -p:PublishAot=true -p:StripSymbols=true -p:DebugType=None \
+    -o "$out" --configfile "$tmp/nuget.config"
+  exe="$out/NuGetSmoke"
+  if [[ "$rid" == win-* ]]; then
+    exe="$out/NuGetSmoke.exe"
+  fi
+  test -f "$exe"
+  if [[ "$rid" == linux-* ]]; then
+    test ! -f "$out/libminipty_unix.so"
+    test ! -f "$out/libminipty_unix.a"
+  fi
+  if [[ "$rid" == osx-* ]]; then
+    test ! -f "$out/libminipty_unix.dylib"
+    test ! -f "$out/libminipty_unix.a"
+    test -f "$out/minipty_spawn_helper"
+  fi
+  "$exe"
+fi

src/MiniPty/MiniPty.csproj

@@ -9,6 +9,7 @@
     <MiniPtyPackUnixNative Condition="'$(MiniPtyPackUnixNative)' == ''">false</MiniPtyPackUnixNative>
     <_MiniPtyRuntimesRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\runtimes'))</_MiniPtyRuntimesRoot>
     <MiniPtyBuildUnixNative Condition="'$(MiniPtyPackUnixNative)' == 'true'">false</MiniPtyBuildUnixNative>
+    <MiniPtyBuildUnixNative Condition="'$(MiniPtyStaticUnixNative)' == 'true'">false</MiniPtyBuildUnixNative>
     <MiniPtyBuildUnixNative Condition="'$(MiniPtyBuildUnixNative)' == '' and ($([MSBuild]::IsOSPlatform('Linux')) Or $([MSBuild]::IsOSPlatform('OSX')) Or $([MSBuild]::IsOSPlatform('FreeBSD')))">true</MiniPtyBuildUnixNative>
     <MiniPtyUnixNativeLibraryName Condition="$([MSBuild]::IsOSPlatform('OSX'))">libminipty_unix.dylib</MiniPtyUnixNativeLibraryName>
     <MiniPtyUnixNativeLibraryName Condition="'$(MiniPtyUnixNativeLibraryName)' == ''">libminipty_unix.so</MiniPtyUnixNativeLibraryName>
@@ -33,6 +34,7 @@
 
   <ItemGroup Condition="'$(MiniPtyPackUnixNative)' == 'true'">
     <None Include="$(_MiniPtyRuntimesRoot)\**\*.so;
+                  $(_MiniPtyRuntimesRoot)\**\*.a;
                   $(_MiniPtyRuntimesRoot)\**\*.dylib"
           Pack="true"
           PackagePath="runtimes/%(RecursiveDir)%(Filename)%(Extension)" />
@@ -45,6 +47,12 @@
           PackagePath="runtimes/osx-x64/native" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\..\buildTransitive\MiniPty.targets"
+          Pack="true"
+          PackagePath="buildTransitive/" />
+  </ItemGroup>
+
   <Target Name="BuildMiniPtyUnixNative" BeforeTargets="AssignTargetPaths"
           Condition="'$(MiniPtyBuildUnixNative)' == 'true'">
     <MakeDir Directories="$(OutputPath)" Condition="!Exists('$(OutputPath)')" />
@@ -56,7 +64,7 @@
       <None Include="$(_MiniPtyUnixNativeOutput)">
         <Link>$(MiniPtyUnixNativeLibraryName)</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        <CopyToPublishDirectory Condition="'$(MiniPtyStaticUnixNative)' != 'true'">PreserveNewest</CopyToPublishDirectory>
       </None>
       <FileWrites Include="$(_MiniPtySpawnHelperOutput)" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
       <None Include="$(_MiniPtySpawnHelperOutput)" Condition="$([MSBuild]::IsOSPlatform('OSX'))">

tests/MiniPty.Tests/PtyTests.cs

@@ -1041,10 +1041,11 @@ public async Task PtyChildSeesResizedSize()
             if (!TryResolveWindowsPowerShell(out var powershell))
                 return;
 
+            // Block on stdin until after Resize so a fast runner cannot query size before ConPTY applies it.
             await using var session = Pty.Start(
-                Spawn(powershell, ["-NoLogo", "-NoProfile", "-Command", "$s = $Host.UI.RawUI.WindowSize; Start-Sleep -Milliseconds 200; Write-Output (\"{0} {1}\" -f $s.Width, $s.Height); exit 0"]));
+                Spawn(powershell, ["-NoLogo", "-NoProfile", "-Command", "[Console]::In.ReadLine() | Out-Null; $s = $Host.UI.RawUI.WindowSize; Write-Output (\"{0} {1}\" -f $s.Width, $s.Height); exit 0"]));
             session.Resize(new(100, 30));
-            var result = await session.CompleteAsync();
+            var result = await session.CompleteAsync(new PtyCompleteOptions { Input = "go\r\n" });
 
             await Assert.That(result.ExitCode).IsEqualTo(0);
             await Assert.That(result.Contains("100 30")).IsTrue();