Create .NET 4.0 branch?

src/FSharp.Compiler.CodeDom/Fsharp.Compiler.CodeDom.fsproj

@@ -6,6 +6,7 @@
     <SccProvider>SAK</SccProvider>
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(FSharpPowerPackSourcesRoot)\FSharpPowerPackSource.Settings.targets" />
   <PropertyGroup>
@@ -19,7 +20,7 @@
     <TreatWarningsAsErrors>
     </TreatWarningsAsErrors>
     <!-- 5310 tracks reenabling -->
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <!-- These dummy entries are needed for F# Beta2 -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,9 +47,10 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="FSharp.Core" />
+    <Reference Include="System.Numerics" />
   </ItemGroup>
   <Import Project="$(FSharpPowerPackSourcesRoot)\FSharpPowerPackSource.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
+  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
 </Project>

src/FSharp.PowerPack.Build.Tasks/FSLex.Build.fs

@@ -66,13 +66,10 @@ type FsLex() =
         with get ()  = toolPath
         and  set (s) = toolPath <- s
 
-#if FX_ATLEAST_35   
-#else 
     // Name of the .exe to call
-    member this.ToolExe
+    override this.ToolExe
         with get ()  = toolExe
         and  set (s) = toolExe <- s        
-#endif
 
     // ToolTask methods
     override this.ToolName = "fslex.exe"

src/FSharp.PowerPack.Build.Tasks/FSLex.Build.fsi

@@ -20,7 +20,4 @@ type FsLex =
     member OtherFlags : string with set
     member Unicode    : bool   with set
     member ToolPath   : string with set
-#if FX_ATLEAST_35   
-#else 
-    member ToolExe    : string with set    
-#endif
+    override ToolExe    : string with set    

src/FSharp.PowerPack.Build.Tasks/FSYacc.Build.fs

@@ -72,13 +72,10 @@ type FsYacc() =
         with get ()  = toolPath
         and  set (s) = toolPath <- s
 
-#if FX_ATLEAST_35
-#else
     // Name of the .exe to call
-    member this.ToolExe
+    override this.ToolExe
         with get ()  = toolExe
         and  set (s) = toolExe <- s        
-#endif
 
     // ToolTask methods
     override this.ToolName = "fsyacc.exe"

src/FSharp.PowerPack.Build.Tasks/FSYacc.Build.fsi

@@ -22,7 +22,4 @@ type FsYacc =
     member Open : string with set
     member Module   : string with set
     member ToolPath   : string with set
-#if FX_ATLEAST_35
-#else
-    member ToolExe   : string with set    
-#endif
+    override ToolExe   : string with set    

src/FSharp.PowerPack.Build.Tasks/FSharp.PowerPack.Build.Tasks.fsproj

@@ -6,6 +6,7 @@
     <SccProvider>SAK</SccProvider>
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(FSharpPowerPackSourcesRoot)\FSharpPowerPackSource.Settings.targets" />
   <PropertyGroup>
@@ -16,7 +17,7 @@
     <OutputType>Library</OutputType>
     <AssemblyName>FSharp.PowerPack.Build.Tasks</AssemblyName>
     <AllowCrossTargeting>true</AllowCrossTargeting>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <DocumentationFile>FSharp.PowerPack.Build.Tasks.xml</DocumentationFile>
     <NoWarn>$(NoWarn);9;60;35;42;62;86;47;40</NoWarn>
   </PropertyGroup>
@@ -47,12 +48,14 @@
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="Microsoft.Build.Engine" />
+    <Reference Include="Microsoft.Build" />
     <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities" />
-    <Reference Include="FSharp.Core" />
+    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.Build.Tasks.v4.0" />
+    <Reference Include="System.Numerics" />
   </ItemGroup>
   <Import Project="$(FSharpPowerPackSourcesRoot)\FSharpPowerPackSource.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
+  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
 </Project>

src/FSharp.PowerPack.Build.Tasks/FSharp.PowerPack.targets

@@ -8,7 +8,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 
 PowerPack build rules.
 
-Copyright (C) Microsoft Corporation. All rights reserved.
+Copyright (C) Microsoft Corporation. Apache 2.0 License.
 ***********************************************************************************************
 -->
 

src/FSharp.PowerPack.Compatibility/FSharp.PowerPack.Compatibility.fsproj

@@ -6,6 +6,7 @@
     <SccProvider>SAK</SccProvider>
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(FSharpPowerPackSourcesRoot)\FSharpPowerPackSource.Settings.targets" />
   <PropertyGroup>
@@ -169,6 +170,7 @@
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
+    <Reference Include="System.Numerics" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FSharp.PowerPack\FSharp.PowerPack.fsproj">
@@ -178,7 +180,8 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(FSharpPowerPackSourcesRoot)\FSharpPowerPackSource.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
-  <Import Condition="'$(TargetFramework)'=='Silverlight'" Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.Common.targets"/>
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
+  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
+  <Import Condition="'$(TargetFramework)'=='Silverlight'" Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.Common.targets" />
 </Project>

src/FSharp.PowerPack.Compatibility/parsing.fs

@@ -33,7 +33,7 @@ let symbol_end_pos ()     = parse_information.ResultRange   |> snd |> enforce_no
 let rhs_start_pos (n:int) = parse_information.InputRange(n) |> fst |> enforce_nonnull_pos
 let rhs_end_pos (n:int)   = parse_information.InputRange(n) |> snd |> enforce_nonnull_pos
 
-exception Parse_error  = RecoverableParseError
+exception Parse_error  = RecoverableParseErrorException
 let parse_error s = parse_information.RaiseError()(failwith s : unit)
 
 let symbol_start () = (symbol_start_pos()).pos_cnum

src/FSharp.PowerPack.Compatibility/parsing.fsi

@@ -52,6 +52,6 @@ val set_parse_state: IParseState -> unit
 
 /// You can initialize error recovery by raising the Parse_error exception. 
 
-exception Parse_error = Microsoft.FSharp.Text.Parsing.RecoverableParseError
+exception Parse_error = Microsoft.FSharp.Text.Parsing.RecoverableParseErrorException
 
 

src/FSharp.PowerPack.Compatibility/pervasives.fs

@@ -403,6 +403,8 @@ let set_binary_mode_out (os:out_channel) b =
     | TextW _ when b -> failwith "cannot set this stream to binary mode"
     | TextW _ -> ()
 
+#if FX_NO_STDIN
+#else
 let print_int (x:int)        = prim_output_int stdout x
 let print_float (x:float)    = prim_output_float stdout x
 let print_string (x:string)  = output_string stdout x
@@ -416,6 +418,7 @@ let prerr_string (x:string)  = output_string stderr x
 let prerr_newline ()         = prim_output_newline stderr
 let prerr_endline (x:string) = prerr_string x; prerr_newline ()
 let prerr_char (c:char)      = output_char stderr c
+#endif
 
 #if FX_NO_BINARY_SERIALIZATION
 #else
@@ -599,9 +602,12 @@ let set_binary_mode_in (is:in_channel) b =
     | TextR _ when b -> failwith "set_binary_mode_in: cannot set this stream to binary mode"
     | TextR _ -> ()
 
+#if FX_NO_STDIN
+#else
 let read_line ()  = stdout.Flush(); input_line stdin
 let read_int ()   = int_of_string (read_line())
 let read_float () = float_of_string (read_line ())
+#endif
 
 #if FX_NO_BINARY_SERIALIZATION
 #else

src/FSharp.PowerPack.Compatibility/pervasives.fsi

@@ -518,6 +518,8 @@ val flush: channel:out_channel -> unit
 //Printing data to stdout/stderr
 
 
+#if FX_NO_STDIN
+#else
 /// Print a character to the stderr stream
 [<CompilerMessage("This construct is for ML compatibility. Consider using 'System.Console.Error.Write(char)' instead. This message can be disabled using '--nowarn:62' or '#nowarn \"62\"'.", 62, IsHidden=true)>]
 val prerr_char: char -> unit
@@ -554,11 +556,14 @@ val print_newline: unit -> unit
 
 [<CompilerMessage("This construct is for ML compatibility. Consider using 'System.Console.Write(string)' instead. This message can be disabled using '--nowarn:62' or '#nowarn \"62\"'.", 62, IsHidden=true)>]
 val print_string: string -> unit
+#endif
 
 //--------------------------------------------------------------------------
 //Reading data from the console.
 
 
+#if FX_NO_STDIN
+#else
 ///Read a floating point number from the console.
 [<CompilerMessage("This construct is for ML compatibility. Consider using 'System.Console.ReadLine() |> float' instead. This message can be disabled using '--nowarn:62' or '#nowarn \"62\"'.", 62, IsHidden=true)>]
 val read_float: unit -> float
@@ -570,6 +575,7 @@ val read_int: unit -> int
 ///Read a line from the console, without the end-of-line character.
 [<CompilerMessage("This construct is for ML compatibility. Consider using 'System.Console.ReadLine()' instead. This message can be disabled using '--nowarn:62' or '#nowarn \"62\"'.", 62, IsHidden=true)>]
 val read_line: unit -> string
+#endif
 
 
 [<CompilerMessage("This construct is for ML compatibility. Consider using Microsoft.FSharp.Core.Format<_,_,_,_> instead. This message can be disabled using '--nowarn:62' or '#nowarn \"62\"'.", 62, IsHidden=true)>]

src/FSharp.PowerPack.Compatibility/printexc.fs

@@ -15,4 +15,7 @@ let to_string (e:exn) =
   | MatchFailureException(s,n,m) -> sprintf "match failure, file '%s', line %d, column %d" s n m
   | _ -> sprintf "%A\n" e
 
+#if FX_NO_STDIN
+#else
 let print f x = try f x with e -> stderr.WriteLine (to_string e) ; raise e 
+#endif

src/FSharp.PowerPack.Compatibility/printexc.fsi

@@ -11,6 +11,9 @@
 [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module Microsoft.FSharp.Compatibility.OCaml.Printexc
 
+#if FX_NO_STDIN
+#else
 val print: mapping:('a -> 'b) -> 'a -> 'b
+#endif
 val to_string: exn -> string
 

src/FSharp.PowerPack.Compatibility/sys.fs

@@ -34,7 +34,10 @@ let command (s:string) =
     p.ExitCode
 #endif
 
+#if FX_NO_SET_CURRENT_DIRECTORY
+#else
 let chdir (s:string) = System.IO.Directory.SetCurrentDirectory(s)
+#endif
 let getcwd () = System.IO.Directory.GetCurrentDirectory()
 
 let word_size = sizeof<int> * 8

src/FSharp.PowerPack.Compatibility/sys.fsi

@@ -42,9 +42,12 @@ val remove: string -> unit
 [<CompilerMessage("This construct is for ML compatibility. Consider using System.IO.File.Move directly. This message can be disabled using '--nowarn:62' or '#nowarn \"62\"'.", 62, IsHidden=true)>]
 val rename: string -> string -> unit
 
+#if FX_NO_SET_CURRENT_DIRECTORY
+#else
 /// Sets the current working directory for the process using <c>System.IO.Directory.SetCurrentDirectory</c> 
 [<CompilerMessage("This construct is for ML compatibility. Consider using System.IO.Directory.SetCurrentDirectory directly. This message can be disabled using '--nowarn:62' or '#nowarn \"62\"'.", 62, IsHidden=true)>]
 val chdir: string -> unit
+#endif
 
 /// Returns the current working directory for the process using <c>System.IO.Directory.GetCurrentDirectory</c>
 [<CompilerMessage("This construct is for ML compatibility. Consider using System.IO.Directory.GetCurrentDirectory directly. This message can be disabled using '--nowarn:62' or '#nowarn \"62\"'.", 62, IsHidden=true)>]

src/FSharp.PowerPack.Linq/FSharp.PowerPack.Linq.fsproj

@@ -6,6 +6,7 @@
     <SccProvider>SAK</SccProvider>
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(FSharpPowerPackSourcesRoot)\FSharpPowerPackSource.Settings.targets" />
   <PropertyGroup>
@@ -16,7 +17,7 @@
     <OutputType>Library</OutputType>
     <AssemblyName>FSharp.PowerPack.Linq</AssemblyName>
     <AllowCrossTargeting>true</AllowCrossTargeting>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <DocumentationFile>FSharp.PowerPack.Linq.xml</DocumentationFile>
     <NoWarn>$(NoWarn);9</NoWarn>
   </PropertyGroup>
@@ -29,7 +30,8 @@
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Core"/>   
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
   </ItemGroup>
   <!-- Files -->
   <ItemGroup>
@@ -48,7 +50,8 @@
     <Compile Include="Assembly.fs" />
   </ItemGroup>
   <Import Project="$(FSharpPowerPackSourcesRoot)\FSharpPowerPackSource.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
-  <Import Condition="'$(TargetFramework)'=='Silverlight'" Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.Common.targets"/>
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
+  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
+  <Import Condition="'$(TargetFramework)'=='Silverlight'" Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.Common.targets" />
 </Project>

src/FSharp.PowerPack.Metadata/FSComp.fs

@@ -2548,7 +2548,7 @@ type internal SR private() =
     /// Problem with codepage '%d': %s
     /// (Originally from C:\fsharp\staging\src\fsharp\FSComp.txt:868)
     static member optsProblemWithCodepage(a0 : System.Int32, a1 : System.String) = (1000, GetStringFunc("optsProblemWithCodepage",",,,%d,,,%s,,,") a0 a1)
-    /// Copyright (c) Microsoft Corporation. All Rights Reserved.
+    /// Copyright (c) Microsoft Corporation. Apache 2.0 License.
     /// (Originally from C:\fsharp\staging\src\fsharp\FSComp.txt:869)
     static member optsCopyright() = (GetStringFunc("optsCopyright",",,,") )
     /// Name of the output file (Short form: -o)

src/FSharp.PowerPack.Metadata/FSharp.PowerPack.Metadata.fsproj

@@ -6,6 +6,7 @@
     <SccProvider>SAK</SccProvider>
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(FSharpPowerPackSourcesRoot)\FSharpPowerPackSource.Settings.targets" />
   <PropertyGroup>
@@ -19,7 +20,7 @@
     <TreatWarningsAsErrors>
     </TreatWarningsAsErrors>
     <!-- 5310 tracks reenabling -->
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <DefineConstants>INCLUDE_METADATA_READER;$(DefineConstants)</DefineConstants>
     <DocumentationFile>FSharp.PowerPack.Metadata.xml</DocumentationFile>
     <NoWarn>$(NoWarn);9;62</NoWarn>
@@ -76,9 +77,10 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="FSharp.Core" />
+    <Reference Include="System.Numerics" />
   </ItemGroup>
   <Import Project="$(FSharpPowerPackSourcesRoot)\FSharpPowerPackSource.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
-  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets'))" />
+  <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="(!Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')) And (!Exists('$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets')) And (Exists('$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets'))" />
 </Project>