From 13db7e0df8d497e2a8d4b692b758d93f82890977 Mon Sep 17 00:00:00 2001
From: Andrii Chebukin <XperiAndri@Outlook.com>
Date: Sat, 13 Jun 2026 20:01:54 +0200
Subject: [PATCH 1/2] Fixed NuGet packaging of DesignTime DLL for F# provider

Added MSBuild target to ensure DesignTime DLL is included in NuGet package, working around F# SDK limitations with ProjectReference-based providers. Removed obsolete target for cleaning NuGet pack input and updated conditions for consistency.
---
 .../FSharp.Data.GraphQL.Client.fsproj         | 69 ++++++++++++++-----
 1 file changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/FSharp.Data.GraphQL.Client/FSharp.Data.GraphQL.Client.fsproj b/src/FSharp.Data.GraphQL.Client/FSharp.Data.GraphQL.Client.fsproj
index ee00d2dbb..f25215ca6 100644
--- a/src/FSharp.Data.GraphQL.Client/FSharp.Data.GraphQL.Client.fsproj
+++ b/src/FSharp.Data.GraphQL.Client/FSharp.Data.GraphQL.Client.fsproj
@@ -4,13 +4,57 @@
     <OutputType>Library</OutputType>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
-    <PackagePath>typeproviders</PackagePath>
 
     <Description>FSharp implementation of Facebook GraphQL query language (Client)</Description>
-    <NoWarn>$(NoWarn);NU5100</NoWarn>
   </PropertyGroup>
 
+  <!-- Include the DesignTime DLL into the package alongside the runtime DLL.
+       The F# compiler searches for the DesignTime DLL in the same directory as the runtime DLL.
+
+       The standard SDK mechanism (PackageFSharpDesignTimeTools via IsFSharpDesignTimeProvider) does not
+       work here for the "runtime project references designtime via ProjectReference" pattern.
+
+       Root cause: dotnet pack invokes the project a second time with BuildProjectReferences=false
+       to collect package content (_GetTfmSpecificContentForPackage). This flag prevents MSBuild from
+       running ResolveProjectReferences, so _ResolvedProjectReferencePaths is empty in that inner context.
+       PackageFSharpDesignTimeTools reads _ResolvedProjectReferencePaths to find the DesignTime DLL —
+       and finds nothing.
+
+       This is a known MSBuild/F# SDK limitation. Relevant references:
+         - dotnet/fsharp#18924  PackageFSharpDesignTimeTools target interacts unpredictably with the build
+                                https://github.com/dotnet/fsharp/issues/18924
+         - dotnet/fsharp#18929  Fix early/unconditional execution of PackageFSharpDesignTimeTools (merged
+                                Oct 2025, SDK 10.0.301) — fixes the direct IsFSharpDesignTimeProvider=true
+                                case but explicitly does NOT fix the ProjectReference case due to MSBuild
+                                evaluation-phase constraints
+                                https://github.com/dotnet/fsharp/pull/18929
+         - dotnet/fsharp#12320  NETSDK1085 when packing with `no-build`
+                                https://github.com/dotnet/fsharp/issues/12320
+
+       Workaround: hook into TargetsForTfmSpecificContentInPackage at evaluation time (PropertyGroup),
+       then use GetTargetPath to resolve the DesignTime DLL path without triggering a build, and inject
+       it directly as a TfmSpecificPackageFile. -->
+  <PropertyGroup Condition="'$(IsNuGet)' != ''">
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_IncludeDesignTimeDllInPackage</TargetsForTfmSpecificContentInPackage>
+  </PropertyGroup>
+
+  <Target Name="_IncludeDesignTimeDllInPackage" Condition="'$(IsNuGet)' != ''">
+    <ItemGroup>
+      <_DesignTimeProjectRef Include="@(ProjectReference)"
+          Condition="'%(ProjectReference.IsFSharpDesignTimeProvider)' == 'true'" />
+    </ItemGroup>
+    <MSBuild Projects="@(_DesignTimeProjectRef)"
+             Targets="GetTargetPath"
+             Properties="Configuration=$(Configuration);TargetFramework=$(TargetFramework)">
+      <Output TaskParameter="TargetOutputs" ItemName="_DesignTimeDllPath" />
+    </MSBuild>
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="@(_DesignTimeDllPath)">
+        <PackagePath>lib\$(TargetFramework)</PackagePath>
+      </TfmSpecificPackageFile>
+    </ItemGroup>
+  </Target>
+
   <ItemGroup>
     <PackageReference Update="FSharp.Core" VersionOverride="$(FSharpCoreVersion)">
       <PrivateAssets>all</PrivateAssets>
@@ -36,25 +80,12 @@
     <Compile Include="GraphQLProvider.Runtime.fs" />
   </ItemGroup>
 
-  <Target Name="RemoveUnnecessaryNuGetPackInput" BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <FSharpCoreNuGetPackInput Include="@(NuGetPackInput)" Condition="$([System.String]::Copy( %(FullPath) ).EndsWith('FSharp.Core.resources.dll'))" />
-      <PdbNuGetPackInput Include="@(NuGetPackInput)" Condition="$([System.String]::Copy( %(FullPath) ).Contains('DesignTime')) And ('%(Extension)' == '.pdb' OR '%(Extension)' == '.xml')" />
-    </ItemGroup>
-    <ItemGroup>
-      <NuGetPackInput Remove="@(FSharpCoreNuGetPackInput)" />
-      <NuGetPackInput Remove="@(PdbNuGetPackInput)" />
-      <_PackageFiles Remove="@(FSharpCoreNuGetPackInput)" />
-      <_PackageFiles Remove="@(PdbNuGetPackInput)" />
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
-    <ProjectReference Condition="$(IsNuGet) != ''" Include="..\FSharp.Data.GraphQL.Client.DesignTime\FSharp.Data.GraphQL.Client.DesignTime.fsproj">
+    <ProjectReference Condition="'$(IsNuGet)' != ''" Include="..\FSharp.Data.GraphQL.Client.DesignTime\FSharp.Data.GraphQL.Client.DesignTime.fsproj">
       <IsFSharpDesignTimeProvider>true</IsFSharpDesignTimeProvider>
       <PrivateAssets>all</PrivateAssets>
     </ProjectReference>
-    <PackageReference Condition="$(IsNuGet) != ''" Include="FSharp.Data.GraphQL.Shared" VersionOverride="$(Version)" />
-    <ProjectReference Condition="$(IsNuGet) == ''" Include="..\FSharp.Data.GraphQL.Shared\FSharp.Data.GraphQL.Shared.fsproj" />
+    <PackageReference Condition="'$(IsNuGet)' != ''" Include="FSharp.Data.GraphQL.Shared" VersionOverride="$(Version)" />
+    <ProjectReference Condition="'$(IsNuGet)' == ''" Include="..\FSharp.Data.GraphQL.Shared\FSharp.Data.GraphQL.Shared.fsproj" />
   </ItemGroup>
 </Project>

From 56419ea2e3f28c7c9bab4590c502e14dbf93c602 Mon Sep 17 00:00:00 2001
From: Andrii Chebukin <XperiAndri@Outlook.com>
Date: Sat, 13 Jun 2026 20:07:04 +0200
Subject: [PATCH 2/2] Updated `FSharp.TypeProviders.SDK` to `8.10.0`

---
 .../FSharp.Data.GraphQL.Client.DesignTime.fsproj                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/FSharp.Data.GraphQL.Client.DesignTime/FSharp.Data.GraphQL.Client.DesignTime.fsproj b/src/FSharp.Data.GraphQL.Client.DesignTime/FSharp.Data.GraphQL.Client.DesignTime.fsproj
index 6d728c7a1..b0a2429bc 100644
--- a/src/FSharp.Data.GraphQL.Client.DesignTime/FSharp.Data.GraphQL.Client.DesignTime.fsproj
+++ b/src/FSharp.Data.GraphQL.Client.DesignTime/FSharp.Data.GraphQL.Client.DesignTime.fsproj
@@ -19,7 +19,7 @@
       <!-- This excludes FSharp.Core.xml and FSharp.Core.resources.dll while referencing the right FSharp.Core.dll version -->
       <ExcludeAssets>contentFiles;runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="FSharp.TypeProviders.SDK" VersionOverride="8.1.0" />
+    <PackageReference Include="FSharp.TypeProviders.SDK" VersionOverride="8.10.0" />
     <PackageReference Include="FsToolkit.ErrorHandling" />
     <PackageReference Include="FParsec" />
     <PackageReference Include="Microsoft.Extensions.Http">