merge master

Author: dsyme

build.fsx

@@ -87,9 +87,8 @@ Target "GenerateFSIStrings" (fun _ ->
 Target "Build" (fun _ ->
     netFrameworks
     |> List.iter (fun framework -> 
-        let outputPath = buildDir </> framework
         !! (project + ".sln")
-        |> MSBuild outputPath "Build" ["Configuration","Release"; "TargetFrameworkVersion", framework]
+        |> MSBuild "" "Build" ["Configuration","Release"; "TargetFrameworkVersion", framework]
         |> Log (".NET " + framework + " Build-Output: "))
 )
 

samples/FscExe/App.config

@@ -12,4 +12,4 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
-</configuration>
+</configuration>

samples/FsiExe/FsiExe.fsproj

@@ -76,8 +76,11 @@
   <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
 <!--
   <Target Name="BeforeBuild">
-    <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" />
-    <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" />
+    <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" Condition="Exists('$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.sigdata')" />
+    <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" Condition="Exists('$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.optdata')" />
+    <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.dll" DestinationFolder="$(OutputPath)" Condition="Exists('$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.dll')" />
+    <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" Condition="Exists('$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.sigdata')" />
+    <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" Condition="Exists('$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.optdata')"  />
   </Target>
 -->
 </Project>