Fixes: 1. nuget build to support msbuild with /m. 2. Some FSharpqa tests that fail in the absense of .Net 2.0

packages.config

@@ -6,16 +6,12 @@
   <package id="NUnit.Runners" version="3.0.0" targetFramework="net45" />
   <package id="NUnit" version="3.0.0" targetFramework="net45" />
   <package id="NUnit.Console" version="3.0.0" targetFramework="net45" />
-<<<<<<< HEAD
   <package id="NUnitLite" version="3.0.0" targetFramework="net45" />
   <package id="System.Collections.Immutable" version="1.2.0-rc3-23805" />
   <package id="System.Reflection.Metadata" version="1.3.0-beta-23816" />
   <package id="Microsoft.DiaSymReader.PortablePdb" version="1.0.0-rc-60301"  />
   <package id="Microsoft.DiaSymReader" version="1.0.7" />
-=======
   <package id="NUnit3TestAdapter" version="3.0.8-ctp-8" targetFramework="net45" />
   <package id="FsSrGen" version="2.0.0" targetFramework="net46" />
-  <package id="FSharp.SRGen.Build.Tasks" version="2.0.0" targetFramework="net46" />
   <package id="MicroBuild.Core" version="0.2.0" />
->>>>>>> master
 </packages>

src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj

@@ -11,7 +11,14 @@
     <OutDir>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin</OutDir>
   </PropertyGroup>
 
-  <Target Name="Build" Outputs="$(TargetPath)"  DependsOnTargets="$(BuildDependsOn)">
+  <ItemGroup>
+    <ProjectReference Include="..\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj" />
+    <ProjectReference Include="..\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
+    <ProjectReference Include="..\fsharp\Fsc\Fsc.fsproj" />
+    <ProjectReference Include="..\fsharp\Fsc\Fsi.fsproj" />
+  </ItemGroup>
+
+  <Target Name="Build" Inputs="$(ProjectReference)" Outputs="$(TargetPath)"  DependsOnTargets="$(BuildDependsOn)">
     <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec layoutfscnuget.fsx --nuspec:.\Microsoft.FSharp.Compiler.netcore.nuspec --bindir:$(OutDir)"/>
     <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec ..\..\buildtools\buildnugets.fsx --version:$(PkgVersion) --nuspec:.\Microsoft.FSharp.Compiler.netcore.nuspec --bindir:$(OutDir)"/>
   </Target>

src/fsharp/fsharp.core.netcore.nuget/FSharp.Core.netcore.nuget.proj

@@ -11,7 +11,11 @@
     <OutDir>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin</OutDir>
   </PropertyGroup>
 
-  <Target Name="Build" Outputs="$(TargetPath)"  DependsOnTargets="$(BuildDependsOn)">
+  <ItemGroup>
+    <ProjectReference Include="..\fsharp\FSharp.Core\FSharp.Core.fsproj" />
+  </ItemGroup>
+
+  <Target Name="Build" Inputs="$(ProjectReference)" Outputs="$(TargetPath)"  DependsOnTargets="$(BuildDependsOn)">
     <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec layoutfscorenuget.fsx --nuspec:.\Microsoft.FSharp.Core.netcore.nuspec --bindir:$(OutDir)"/>
     <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec ..\..\buildtools\buildnugets.fsx --version:$(PkgVersion) --nuspec:.\Microsoft.FSharp.Core.netcore.nuspec --bindir:$(OutDir)"/>
   </Target>

tests/fsharpqa/Source/InteractiveSession/Misc/E_NoNoFrameworkWithFSCore.fs

@@ -1,13 +0,0 @@
-// #Regression #NoMT #FSI
-// Regression for FSHARP1.0:6425, the exception used to keep throwing after every statement
-// Note: we are happy with partial match on the error string, so we can run fine on LOC builds.
-// <Expect status="success" id="FS1222">--noframework</Expects>
-// <Expect status="success">val x : int = 1</Expect>
-// <Expect status="success">val y : int = 2</Expect>
-
-#r @"..\..\common\FSharp.Core.dll";;
-let x = 1;;
-
-let y = 2;;
-
-exit 0;;

tests/fsharpqa/Source/MultiTargeting/E_UseBinaryIncompatibleLibrary.fs

@@ -1,9 +0,0 @@
-// #Conformance #Regression #Multitargeting #Diagnostics
-// Regression test for FSHARP1.0:5111
-// <Expects status="error" id="FS0219">The referenced or default base CLI library 'mscorlib' is binary-incompatible with the referenced F# core library .*</Expects>
-
-open System
-
-let x = 1
-
-exit 1