From 356dbee4b7f1fbc978e63ab4a4108b52d45b57c5 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Wed, 7 Oct 2026 22:44:37 +1100
Subject: [PATCH] Trim with Squash

Unreachable IL is removed from each library at build time. Argon, Argon.JsonPath
and Argon.NodaTime honor InternalsVisibleTo, since the other libraries and the
tests use their internals. Version 0.38.1.
---
 src/Argon.DataSets/Argon.DataSets.csproj                    | 1 +
 src/Argon.FSharp/Argon.FSharp.csproj                        | 1 +
 .../Argon.InterfaceCallbacks.csproj                         | 1 +
 src/Argon.JsonPath/Argon.JsonPath.csproj                    | 3 +++
 src/Argon.NodaTime/Argon.NodaTime.csproj                    | 3 +++
 src/Argon.Xml/Argon.Xml.csproj                              | 1 +
 src/Argon/Argon.csproj                                      | 3 +++
 src/Directory.Build.props                                   | 6 ++++--
 src/Directory.Packages.props                                | 1 +
 9 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Argon.DataSets/Argon.DataSets.csproj b/src/Argon.DataSets/Argon.DataSets.csproj
index 1a0bed32..8f54702e 100644
--- a/src/Argon.DataSets/Argon.DataSets.csproj
+++ b/src/Argon.DataSets/Argon.DataSets.csproj
@@ -4,6 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
+    <PackageReference Include="Squash" PrivateAssets="all" />
     <ProjectReference Include="..\Argon\Argon.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Argon.FSharp/Argon.FSharp.csproj b/src/Argon.FSharp/Argon.FSharp.csproj
index 4bed808f..d2778119 100644
--- a/src/Argon.FSharp/Argon.FSharp.csproj
+++ b/src/Argon.FSharp/Argon.FSharp.csproj
@@ -10,6 +10,7 @@
     <Using Include="Microsoft.FSharp.Collections" />
     <PackageReference Include="FSharp.Core" />
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
+    <PackageReference Include="Squash" PrivateAssets="all" />
     <ProjectReference Include="..\Argon\Argon.csproj" />
   </ItemGroup>
 
diff --git a/src/Argon.InterfaceCallbacks/Argon.InterfaceCallbacks.csproj b/src/Argon.InterfaceCallbacks/Argon.InterfaceCallbacks.csproj
index 1a0bed32..8f54702e 100644
--- a/src/Argon.InterfaceCallbacks/Argon.InterfaceCallbacks.csproj
+++ b/src/Argon.InterfaceCallbacks/Argon.InterfaceCallbacks.csproj
@@ -4,6 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
+    <PackageReference Include="Squash" PrivateAssets="all" />
     <ProjectReference Include="..\Argon\Argon.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Argon.JsonPath/Argon.JsonPath.csproj b/src/Argon.JsonPath/Argon.JsonPath.csproj
index 1a0bed32..456f26f1 100644
--- a/src/Argon.JsonPath/Argon.JsonPath.csproj
+++ b/src/Argon.JsonPath/Argon.JsonPath.csproj
@@ -1,9 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
+    <!-- The tests use internals through InternalsVisibleTo -->
+    <SquashInternalsVisibleTo>Honor</SquashInternalsVisibleTo>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
+    <PackageReference Include="Squash" PrivateAssets="all" />
     <ProjectReference Include="..\Argon\Argon.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Argon.NodaTime/Argon.NodaTime.csproj b/src/Argon.NodaTime/Argon.NodaTime.csproj
index 89f398a3..82ab047e 100644
--- a/src/Argon.NodaTime/Argon.NodaTime.csproj
+++ b/src/Argon.NodaTime/Argon.NodaTime.csproj
@@ -3,12 +3,15 @@
   <PropertyGroup>
     <Description>Provides serialization support between Noda Time and Json.NET.</Description>
     <TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
+    <!-- The tests use internals through InternalsVisibleTo -->
+    <SquashInternalsVisibleTo>Honor</SquashInternalsVisibleTo>
     <PackageTags>nodatime;json;Argon</PackageTags>
   </PropertyGroup>
   <ItemGroup>
     <SupportedPlatform Include="browser" />
     <PackageReference Include="NodaTime" />
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
+    <PackageReference Include="Squash" PrivateAssets="all" />
     <ProjectReference Include="..\Argon\Argon.csproj" />
   </ItemGroup>
 
diff --git a/src/Argon.Xml/Argon.Xml.csproj b/src/Argon.Xml/Argon.Xml.csproj
index 1a0bed32..8f54702e 100644
--- a/src/Argon.Xml/Argon.Xml.csproj
+++ b/src/Argon.Xml/Argon.Xml.csproj
@@ -4,6 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
+    <PackageReference Include="Squash" PrivateAssets="all" />
     <ProjectReference Include="..\Argon\Argon.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Argon/Argon.csproj b/src/Argon/Argon.csproj
index 9b681ed4..bdb4f7ac 100644
--- a/src/Argon/Argon.csproj
+++ b/src/Argon/Argon.csproj
@@ -2,10 +2,13 @@
   <PropertyGroup>
     <TargetFrameworks>net462;net472;net48;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
     <PolyNullability>true</PolyNullability>
+    <!-- The other Argon libraries and the tests use internals through InternalsVisibleTo -->
+    <SquashInternalsVisibleTo>Honor</SquashInternalsVisibleTo>
     <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
+    <PackageReference Include="Squash" PrivateAssets="all" />
     <PackageReference Include="Polyfill" PrivateAssets="all" />
     <PackageReference Include="Sbom" PrivateAssets="all" />
     <PackageReference Include="System.ValueTuple" Condition="'$(TargetFramework)' == 'net462'" />
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 5399e048..31731b35 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,8 +1,10 @@
 <Project>
   <PropertyGroup>
-    <NoWarn>CS1591;CS1573;NU1605;NU1608;NU1109</NoWarn>
+    <!-- The IL codes are linker warnings from Squash, for reflection the trim analyzer
+         already checks at compile time, where the source suppresses it. -->
+    <NoWarn>CS1591;CS1573;NU1605;NU1608;NU1109;IL2026;IL2060;IL2067;IL2070;IL2072;IL2121</NoWarn>
     <LangVersion>preview</LangVersion>
-    <Version>0.38.0</Version>
+    <Version>0.38.1</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <Copyright>Copyright © James Newton-King 2008, Copyright © Simon Cropp 2022</Copyright>
     <PackageTags>Json</PackageTags>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index ce4adfc3..c754c19a 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -12,6 +12,7 @@
     <PackageVersion Include="NodaTime" Version="3.3.5" />
     <PackageVersion Include="Polyfill" Version="11.4.3" />
     <PackageVersion Include="ProjectDefaults" Version="1.0.184" />
+    <PackageVersion Include="Squash" Version="0.1.0-beta.2" />
     <PackageVersion Include="ProjectFiles" Version="1.6.0" />
     <PackageVersion Include="Sbom" Version="0.3.1" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" Pinned="true" />