Skip to content

Commit 6d2852f

Browse files
committed
Merge pull request #525 from directhex/fix-targets-for-mono-4
Assume we are inside XBuild when 4.5/Mono.Posix.dll exists
2 parents fe1c94a + d995c59 commit 6d2852f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/bootstrap/4.0/Microsoft.FSharp.Targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Copyright (C) Microsoft Corporation. Apache 2.0 License.
6868

6969
<PropertyGroup>
7070
<UsingXBuild>false</UsingXBuild>
71-
<UsingXBuild Condition="Exists('$(MSBuildExtensionsPath32)\..\4.0\Mono.Posix.dll')">true</UsingXBuild>
71+
<UsingXBuild Condition="$(MSBuildExtensionsPath32.Contains('xbuild'))">true</UsingXBuild>
7272
</PropertyGroup>
7373

7474

src/fsharp/FSharp.Build/Microsoft.FSharp.Targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Copyright (C) Microsoft Corporation. Apache 2.0 License.
6868

6969
<PropertyGroup>
7070
<UsingXBuild>false</UsingXBuild>
71-
<UsingXBuild Condition="Exists('$(MSBuildExtensionsPath32)\..\4.0\Mono.Posix.dll')">true</UsingXBuild>
71+
<UsingXBuild Condition="$(MSBuildExtensionsPath32.Contains('xbuild'))">true</UsingXBuild>
7272
</PropertyGroup>
7373

7474
<Target

0 commit comments

Comments
 (0)