Skip to content

Commit c061d0f

Browse files
authored
Fix dotnet build VisualFSharp.sln (#18914)
1 parent 234ce6d commit c061d0f

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1010
<OtherFlags>$(OtherFlags) --subsystemversion:6.00</OtherFlags>
1111
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
12+
<!-- Enable preserialized resources by default (required by newer SDKs for non-string resources). -->
13+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
14+
</PropertyGroup>
15+
16+
<!-- When building with desktop MSBuild (Full), fall back to legacy resources so the CTO merger (VSSDK) can read .resources files. -->
17+
<PropertyGroup Condition="'$(MSBuildRuntimeType)' != 'Core'">
18+
<GenerateResourceUsePreserializedResources>false</GenerateResourceUsePreserializedResources>
1219
</PropertyGroup>
1320

1421
<ItemGroup>
@@ -28,7 +35,8 @@
2835
<EmbeddedResource Include="VSPackage.resx">
2936
<GenerateSource>true</GenerateSource>
3037
<GeneratedModuleName>Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpSR</GeneratedModuleName>
31-
<MergeWithCTO>true</MergeWithCTO>
38+
<!-- Only merge with CTO when building with desktop MSBuild (typical for VS/VSSDK builds). Skip for dotnet (MSBuild Core). -->
39+
<MergeWithCTO Condition="'$(MSBuildRuntimeType)' != 'Core'">true</MergeWithCTO>
3240
<ManifestResourceName>VSPackage</ManifestResourceName>
3341
<SubType>Designer</SubType>
3442
<IntermediateTargetPath>$(IntermediateOutputPath)resources\</IntermediateTargetPath>

0 commit comments

Comments
 (0)