[Pkg-cli-apps-commits] [fsharp] 19/60: fix integration

[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 738eeb4dbd5c415739f9aaf13cd566a657f739ff
Author: F# Software Foundation <fsgit at fastmail.fm>
Date:   Thu Jul 17 20:52:04 2014 +0100

    fix integration
---
 src/FSharpSource.targets                                               | 3 +++
 src/fsharp/FSharp.Build/FSharp.Build.fsproj                            | 3 ---
 .../FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj | 3 ---
 src/fsharp/FSharp.Core.Unittests/SurfaceArea.2.0.fs                    | 2 +-
 src/fsharp/FSharp.Core.Unittests/SurfaceArea.4.0.fs                    | 2 +-
 src/fsharp/FSharp.Core.Unittests/SurfaceArea.Portable.fs               | 2 +-
 src/fsharp/FSharp.Core.Unittests/SurfaceArea.Silverlight.2.0.fs        | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index a7e5013..869dcc6 100755
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -98,6 +98,9 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
 
   <!-- v2.0-specific flags -->
   <PropertyGroup Condition="'$(TargetFramework)'=='net20'">
+    <!-- If 3.5 is not configured explicitly, use 2.0 -->
+    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)'==''">v2.0</TargetFrameworkVersion>
+    <TargetFrameworkOutputDirectory>net20</TargetFrameworkOutputDirectory>
     <DefineConstants>$(DefineConstants);FSHARP_CORE_2_0</DefineConstants>
     <DefineConstants>$(DefineConstants);RUNTIME</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
index 4dc3cac..ef5dead 100644
--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -20,9 +20,6 @@
     <FsSrGen Include="FSBuild.txt">
       <Link>FSBuild.txt</Link>
     </FsSrGen>
-      <FsSrGen Include="FSBuild.txt">
-        <Link>FSBuild.txt</Link>
-      </FsSrGen>
     <Compile Include="InternalsVisibleTo.fs" />
     <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs">
       <Link>Utilities/assemblyinfo.FSharp.Build.dll.fs</Link>
diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
index 80a217d..1842687 100644
--- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
+++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
@@ -19,9 +19,6 @@
     <FsSrGen Include="..\fsiserver\FSServerShared.txt">
       <Link>FSServerShared.txt</Link>
     </FsSrGen>
-      <FsSrGen Include="..\fsiserver\FSServerShared.txt">
-        <Link>FSServerShared.txt</Link>
-      </FsSrGen>
     <Compile Include="InternalsVisibleTo.fs" />
     <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs">
       <Link>assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs</Link>
diff --git a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.2.0.fs b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.2.0.fs
index 2513788..a92699d 100755
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.2.0.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.2.0.fs
@@ -3120,6 +3120,6 @@ System.Tuple`8[T1,T2,T3,T4,T5,T6,T7,TRest]: Void .ctor(T1, T2, T3, T4, T5, T6, T
 "
 
             let act = actual.ToString()
-            if expected <> act then
+            if expected.Replace("\r\n","\n") <> act.Replace("\r\n","\n") then
                 printf "%s" act
             Assert.AreEqual(expected, act)
diff --git a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.4.0.fs b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.4.0.fs
index b0a1f98..1b45a9a 100755
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.4.0.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.4.0.fs
@@ -3322,7 +3322,7 @@ Microsoft.FSharp.Reflection.UnionCaseInfo: System.Type get_DeclaringType()
             expectedSurfaceArea |> normalize
 
         let act = actual.ToString() |> normalize
-        if expected <> act then
+        if expected.Replace("\r\n","\n") <> act.Replace("\r\n","\n") then
             let mutable indexFirstDiff = 0
             while indexFirstDiff < expected.Length && expected.[indexFirstDiff] = act.[indexFirstDiff] do
                 indexFirstDiff <- indexFirstDiff + 1
diff --git a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Portable.fs b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Portable.fs
index fa50da4..44d9c77 100755
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Portable.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Portable.fs
@@ -3306,7 +3306,7 @@ System.IObserver`1[T]: Void OnNext(T)"
         // add padding to ensure diagnostics below don't get IndexOutOfRange
         let expected = expected + String.replicate 400 " "
         let act = act + String.replicate 400 " "
-        if expected <> act then
+        if expected.Replace("\r\n","\n") <> act.Replace("\r\n","\n") then
             let mutable indexFirstDiff = 0
             while indexFirstDiff < expected.Length && expected.[indexFirstDiff] = act.[indexFirstDiff] do
                 indexFirstDiff <- indexFirstDiff + 1
diff --git a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Silverlight.2.0.fs b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Silverlight.2.0.fs
index b3dc06c..fbdc9f4 100755
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Silverlight.2.0.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.Silverlight.2.0.fs
@@ -2908,6 +2908,6 @@ System.Tuple`8[T1,T2,T3,T4,T5,T6,T7,TRest]: Void .ctor(T1, T2, T3, T4, T5, T6, T
 "
 
         let act = actual.ToString()
-        if expected <> act then
+        if expected.Replace("\r\n","\n") <> act.Replace("\r\n","\n") then
             printf "%s" act
         Assert.AreEqual(expected, act)

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