Skip to content

Commit fcb6868

Browse files
committed
Merge pull request #1103 from nosami/mono-el-capitan
Find the mono binary on OSX 10.11
2 parents 83fc572 + 69b6a38 commit fcb6868

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

‎.paket/paket.targets‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@
77
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
88
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
99
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
10+
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
11+
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
1012
</PropertyGroup>
1113
<PropertyGroup>
1214
<!-- Paket command -->
1315
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
1416
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
1517
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
16-
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
18+
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
1719
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
18-
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand>
20+
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand>
1921
<!-- Commands -->
2022
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
2123
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>

0 commit comments

Comments
 (0)