Skip to content

Commit c3d4eb8

Browse files
committed
Merge pull request #492 from rolfbjarne/mono-on-el-capitan
Find the mono binary on OSX 10.11.
2 parents 8f02ecb + de4b7f3 commit c3d4eb8

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.nuget/NuGet.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
3636
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
3737
<PackagesConfig>packages.config</PackagesConfig>
38+
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
39+
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
3840
</PropertyGroup>
3941

4042
<PropertyGroup>
@@ -43,7 +45,7 @@
4345
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
4446

4547
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
46-
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
48+
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
4749

4850
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
4951

FSharp.Core.Nuget/.nuget/NuGet.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
3636
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
3737
<PackagesConfig>packages.config</PackagesConfig>
38+
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
39+
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
3840
</PropertyGroup>
3941

4042
<PropertyGroup>
@@ -43,7 +45,7 @@
4345
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
4446

4547
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
46-
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
48+
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
4749

4850
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
4951

0 commit comments

Comments
 (0)