From 35a7a31c74e6d3bd7ca1e81e3738f3188c03b8ad Mon Sep 17 00:00:00 2001
From: Jakub Majocha <1760221+majocha@users.noreply.github.com>
Date: Wed, 17 Sep 2025 19:08:45 +0200
Subject: [PATCH 1/3] do what the error says

---
 .../FSharp.ProjectSystem.FSharp.fsproj                           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj
index e6a2e4abe8e..d9308e294e1 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj
@@ -9,6 +9,7 @@
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <OtherFlags>$(OtherFlags) --subsystemversion:6.00</OtherFlags>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
+	<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
   <ItemGroup>

From 95ceff2df0f0a33764cc205a7901fc7495a51156 Mon Sep 17 00:00:00 2001
From: Jakub Majocha <1760221+majocha@users.noreply.github.com>
Date: Wed, 17 Sep 2025 19:35:29 +0200
Subject: [PATCH 2/3] try this

---
 .../FSharp.ProjectSystem.FSharp.fsproj                | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj
index d9308e294e1..f85d33a9a77 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj
@@ -9,7 +9,13 @@
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <OtherFlags>$(OtherFlags) --subsystemversion:6.00</OtherFlags>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
-	<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+    <!-- Enable preserialized resources by default (required by newer SDKs for non-string resources). -->
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+  </PropertyGroup>
+
+  <!-- When building in a VS/VSSDK context (VisualStudioVersion set) fall back to legacy format so the CTO merger can read the .resources file. -->
+  <PropertyGroup Condition="'$(VisualStudioVersion)' != ''">
+    <GenerateResourceUsePreserializedResources>false</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,7 +35,8 @@
     <EmbeddedResource Include="VSPackage.resx">
       <GenerateSource>true</GenerateSource>
       <GeneratedModuleName>Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpSR</GeneratedModuleName>
-      <MergeWithCTO>true</MergeWithCTO>
+      <!-- Only merge with CTO when we are using legacy (non-preserialized) resources. -->
+      <MergeWithCTO Condition="'$(GenerateResourceUsePreserializedResources)' != 'true'">true</MergeWithCTO>
       <ManifestResourceName>VSPackage</ManifestResourceName>
       <SubType>Designer</SubType>
       <IntermediateTargetPath>$(IntermediateOutputPath)resources\</IntermediateTargetPath>

From 350d2f8bfd330bb9d0f0d68714ce03142e3254ab Mon Sep 17 00:00:00 2001
From: Jakub Majocha <1760221+majocha@users.noreply.github.com>
Date: Wed, 17 Sep 2025 20:40:39 +0200
Subject: [PATCH 3/3] better condition

---
 .../FSharp.ProjectSystem.FSharp.fsproj                    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj
index f85d33a9a77..576dc2aa464 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj
@@ -13,8 +13,8 @@
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
-  <!-- When building in a VS/VSSDK context (VisualStudioVersion set) fall back to legacy format so the CTO merger can read the .resources file. -->
-  <PropertyGroup Condition="'$(VisualStudioVersion)' != ''">
+  <!-- When building with desktop MSBuild (Full), fall back to legacy resources so the CTO merger (VSSDK) can read .resources files. -->
+  <PropertyGroup Condition="'$(MSBuildRuntimeType)' != 'Core'">
     <GenerateResourceUsePreserializedResources>false</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
@@ -35,8 +35,8 @@
     <EmbeddedResource Include="VSPackage.resx">
       <GenerateSource>true</GenerateSource>
       <GeneratedModuleName>Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpSR</GeneratedModuleName>
-      <!-- Only merge with CTO when we are using legacy (non-preserialized) resources. -->
-      <MergeWithCTO Condition="'$(GenerateResourceUsePreserializedResources)' != 'true'">true</MergeWithCTO>
+      <!-- Only merge with CTO when building with desktop MSBuild (typical for VS/VSSDK builds). Skip for dotnet (MSBuild Core). -->
+      <MergeWithCTO Condition="'$(MSBuildRuntimeType)' != 'Core'">true</MergeWithCTO>
       <ManifestResourceName>VSPackage</ManifestResourceName>
       <SubType>Designer</SubType>
       <IntermediateTargetPath>$(IntermediateOutputPath)resources\</IntermediateTargetPath>