[Pkg-cli-apps-commits] [fsharp] 16/17: Assume Mono has 4.5 runtime, not 4.0

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/4.0.0.4+dfsg2-1
in repository fsharp.

commit 60c2349e3d8916239f0412fcf9b29a0bbd8e8fe2
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Wed Dec 2 14:47:05 2015 +0000

    Assume Mono has 4.5 runtime, not 4.0
---
 ...re-inside-XBuild-when-4.5-Mono.Posix.dll-.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 41 insertions(+)

diff --git a/debian/patches/0001-Assume-we-are-inside-XBuild-when-4.5-Mono.Posix.dll-.patch b/debian/patches/0001-Assume-we-are-inside-XBuild-when-4.5-Mono.Posix.dll-.patch
new file mode 100644
index 0000000..a9edec7
--- /dev/null
+++ b/debian/patches/0001-Assume-we-are-inside-XBuild-when-4.5-Mono.Posix.dll-.patch
@@ -0,0 +1,40 @@
+From 66552d8871e39a3e2f24bf889f175d5c26aca3d6 Mon Sep 17 00:00:00 2001
+From: Jo Shields <jo.shields at xamarin.com>
+Date: Wed, 2 Dec 2015 14:36:37 +0000
+Subject: [PATCH] Assume we are inside XBuild when 4.5/Mono.Posix.dll exists
+
+4.0/Mono.Posix.dll is not guaranteed to exist, on Mono 4.0+
+---
+ lib/bootstrap/4.0/Microsoft.FSharp.Targets       | 2 +-
+ src/fsharp/FSharp.Build/Microsoft.FSharp.Targets | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/bootstrap/4.0/Microsoft.FSharp.Targets b/lib/bootstrap/4.0/Microsoft.FSharp.Targets
+index b8c51d4..5d6fe98 100644
+--- a/lib/bootstrap/4.0/Microsoft.FSharp.Targets
++++ b/lib/bootstrap/4.0/Microsoft.FSharp.Targets
+@@ -68,7 +68,7 @@ Copyright (C) Microsoft Corporation. Apache 2.0 License.
+ 
+   <PropertyGroup>
+     <UsingXBuild>false</UsingXBuild>
+-    <UsingXBuild Condition="Exists('$(MSBuildExtensionsPath32)\..\4.0\Mono.Posix.dll')">true</UsingXBuild>
++    <UsingXBuild Condition="Exists('$(MSBuildExtensionsPath32)\..\4.5\Mono.Posix.dll')">true</UsingXBuild>
+   </PropertyGroup>
+ 
+   
+diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
+index 5ff6508..66f521c 100644
+--- a/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
++++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
+@@ -68,7 +68,7 @@ Copyright (C) Microsoft Corporation. Apache 2.0 License.
+ 
+   <PropertyGroup>
+     <UsingXBuild>false</UsingXBuild>
+-    <UsingXBuild Condition="Exists('$(MSBuildExtensionsPath32)\..\4.0\Mono.Posix.dll')">true</UsingXBuild>
++    <UsingXBuild Condition="Exists('$(MSBuildExtensionsPath32)\..\4.5\Mono.Posix.dll')">true</UsingXBuild>
+   </PropertyGroup>
+ 
+     <Target
+-- 
+2.5.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 2cca439..09b1595 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0001-Assume-we-are-inside-XBuild-when-4.5-Mono.Posix.dll-.patch
 new-bootstrap-binaries-from-build-output.patch
 no-nuget.patch
 debian-cli-policy.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git