[Pkg-cli-apps-commits] [fsharp] 02/60: Correcting conditional defines for some flavors of FSharp.Core. (changeset 1290486)

[Christopher Halse Rogers]

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

raof-guest pushed a commit to branch master
in repository fsharp.

commit 0ed4da4f2e20a9be8b2d25a7d5a4b53230f68e54
Author: latkin <latkin at microsoft.com>
Date:   Wed Jul 2 11:09:28 2014 -0700

    Correcting conditional defines for some flavors of FSharp.Core. (changeset 1290486)
---
 src/FSharpSource.targets | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index 758529e..6fc1621 100644
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -94,8 +94,10 @@
 
   <!-- v2.0-specific flags -->
   <PropertyGroup Condition="'$(TargetFramework)'=='net20'">
-    <!-- If 3.5 is not configured explicitly, use 2.0 -->
-    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)'==''">v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <DefineConstants>$(DefineConstants);FSHARP_CORE_2_0</DefineConstants>
+    <DefineConstants>$(DefineConstants);RUNTIME</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
@@ -127,6 +129,7 @@
   <PropertyGroup Condition="'$(TargetFramework)'=='portable47'">
 
     <DefineConstants>$(DefineConstants);FSHARP_CORE_PORTABLE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>

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