From 5a2d280f0cbac85823ba670f4862a2eaba62be31 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Jun 2026 06:28:29 +0000
Subject: [PATCH] Fix MSBuild condition quoting and DotnetFsiCompilerPath typo

- Fix DotnetFsiCompilerPath condition checking wrong variable (DotnetFscCompilerPath
  instead of DotnetFsiCompilerPath) in Microsoft.FSharp.NetSdk.props
- Quote property references in conditions per MSBuild best practices:
  - Microsoft.FSharp.NetSdk.targets: DisableILLinkSubstitutions, AssemblyName
  - Microsoft.FSharp.Targets: UsingXBuild boolean comparisons
  - FSharp.Profiles.props: TolerateUnusedBindings
  - FSharpBuild.Directory.Build.props: AdditionalFscCmdFlags

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 FSharp.Profiles.props                            | 4 ++--
 FSharpBuild.Directory.Build.props                | 2 +-
 src/FSharp.Build/Microsoft.FSharp.NetSdk.props   | 2 +-
 src/FSharp.Build/Microsoft.FSharp.NetSdk.targets | 2 +-
 src/FSharp.Build/Microsoft.FSharp.Targets        | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/FSharp.Profiles.props b/FSharp.Profiles.props
index aa25fe20055..e2171671a18 100644
--- a/FSharp.Profiles.props
+++ b/FSharp.Profiles.props
@@ -6,12 +6,12 @@
     <DefineConstants>BUILDING_WITH_LKG;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.fsproj' and $(TolerateUnusedBindings) != 'true'">
+  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.fsproj' and '$(TolerateUnusedBindings)' != 'true'">
     <WarningsAsErrors>1182;$(WarningsAsErrors)</WarningsAsErrors>
     <WarnOn>1182;3879;$(WarnOn)</WarnOn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.fsproj' and $(TolerateUnusedBindings) == 'true'">
+  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.fsproj' and '$(TolerateUnusedBindings)' == 'true'">
     <WarningsNotAsErrors>1182;$(WarningsNotAsErrors)</WarningsNotAsErrors>
     <NoWarn>1182;$(NoWarn)</NoWarn>
   </PropertyGroup>
diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props
index f9f9128feb6..733d843fefc 100644
--- a/FSharpBuild.Directory.Build.props
+++ b/FSharpBuild.Directory.Build.props
@@ -30,7 +30,7 @@
     <WarningsAsErrors>0025;$(WarningsAsErrors)</WarningsAsErrors>
     <OtherFlags>$(OtherFlags) --nowarn:3384</OtherFlags>
     <OtherFlags>$(OtherFlags) --times --nowarn:75</OtherFlags>
-    <OtherFlags Condition="$(AdditionalFscCmdFlags) != ''">$(OtherFlags) $(AdditionalFscCmdFlags)</OtherFlags>
+    <OtherFlags Condition="'$(AdditionalFscCmdFlags)' != ''">$(OtherFlags) $(AdditionalFscCmdFlags)</OtherFlags>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Proto'">
diff --git a/src/FSharp.Build/Microsoft.FSharp.NetSdk.props b/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
index 5c59b4993e6..396ce4d09a1 100644
--- a/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
+++ b/src/FSharp.Build/Microsoft.FSharp.NetSdk.props
@@ -76,7 +76,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 
     <FsiToolPath Condition="'$(FsiToolPath)' == ''">$([System.IO.Path]::GetDirectoryName($(DOTNET_HOST_PATH)))</FsiToolPath>
     <FsiToolExe Condition="'$(FsiToolExe)' == ''">$([System.IO.Path]::GetFileName($(DOTNET_HOST_PATH)))</FsiToolExe>
-    <DotnetFsiCompilerPath Condition="'$(DotnetFscCompilerPath)' == ''">"$(MSBuildThisFileDirectory)fsi.dll"</DotnetFsiCompilerPath>
+    <DotnetFsiCompilerPath Condition="'$(DotnetFsiCompilerPath)' == ''">"$(MSBuildThisFileDirectory)fsi.dll"</DotnetFsiCompilerPath>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(ManagePackageVersionsCentrally)' == 'true' ">
diff --git a/src/FSharp.Build/Microsoft.FSharp.NetSdk.targets b/src/FSharp.Build/Microsoft.FSharp.NetSdk.targets
index 3761a84fad5..dcaf578891a 100644
--- a/src/FSharp.Build/Microsoft.FSharp.NetSdk.targets
+++ b/src/FSharp.Build/Microsoft.FSharp.NetSdk.targets
@@ -171,7 +171,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
   <UsingTask TaskName="GenerateILLinkSubstitutions" AssemblyFile="$(FSharpBuildAssemblyFile)" />
   
   <!-- Generate ILLink.Substitutions.xml to remove F# metadata resources during trimming. F# Core already has the resource defined -->
-  <Target Name="GenerateFSharpILLinkSubstitutions" BeforeTargets="CoreCompile" Condition="$(DisableILLinkSubstitutions) != 'true' and $(AssemblyName) != 'FSharp.Core'">
+  <Target Name="GenerateFSharpILLinkSubstitutions" BeforeTargets="CoreCompile" Condition="'$(DisableILLinkSubstitutions)' != 'true' and '$(AssemblyName)' != 'FSharp.Core'">
     <GenerateILLinkSubstitutions
       AssemblyName="$(AssemblyName)"
       IntermediateOutputPath="$(IntermediateOutputPath)">
diff --git a/src/FSharp.Build/Microsoft.FSharp.Targets b/src/FSharp.Build/Microsoft.FSharp.Targets
index 8853320e587..2dcd4b9a1cd 100644
--- a/src/FSharp.Build/Microsoft.FSharp.Targets
+++ b/src/FSharp.Build/Microsoft.FSharp.Targets
@@ -330,10 +330,10 @@ this file.
         -->
         <ItemGroup>
             <ActualEmbeddedResources
-                Condition=" '$(UsingXBuild)' == true"
+                Condition=" '$(UsingXBuild)' == 'true'"
                 Include="@(_CoreCompileResourceInputs);@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile);@(AdditionalEmbeddedResource)" />
           <ActualEmbeddedResources
-                Condition=" '$(UsingXBuild)' != true"
+                Condition=" '$(UsingXBuild)' != 'true'"
                 Include="@(_CoreCompileResourceInputs);@(CompiledLicenseFile);@(AdditionalEmbeddedResource)" />
         </ItemGroup>