Merge branch 'master' into fsharp4

Conflicts:
	DEVGUIDE.md
	README.md
	appveyor-build.cmd
	appveyor.yml
	src/fsharp/FSharp.Core.Unittests/SurfaceArea.net40.fs
	tests/test.lst

DEVGUIDE.md

@@ -27,7 +27,6 @@ See the script for what this does.  After you do this, you can do further testin
 The compiler is compiled as a set of .NET 4.0 components using a bootstrap process. This uses the Last Known Good (LKG) compiler to build.  
 Note that you need the .NET framework 3.5 installed on your machine in order to complete this step.
 
-    gacutil /i lkg\FSharp-2.0.50726.900\bin\FSharp.Core.dll
     msbuild src\fsharp-proto-build.proj
     
 ## 2.  Building an F# (Debug) library and compiler

appveyor-build.cmd

@@ -9,9 +9,6 @@ if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin
 if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
 if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe.  Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760. && goto :eof
 
-set _gacutilexe="%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\gacutil.exe"
-if not exist %_gacutilexe% echo Error: Could not find gacutil.exe.  && goto :eof
-
 set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
 if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :eof
 
@@ -19,78 +16,71 @@ if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :eof
 @if ERRORLEVEL 1 echo Error: Nuget restore failed  && goto :eof
 
 ::Build
-%_gacutilexe%  /i lkg\FSharp-2.0.50726.900\bin\FSharp.Core.dll
-@if ERRORLEVEL 1 echo Error: gacutil failed && goto :eof
-
 %_msbuildexe% src\fsharp-proto-build.proj
 @if ERRORLEVEL 1 echo Error: compiler proto build failed && goto :eof
 
 %_ngenexe% install Proto\net40\bin\fsc-proto.exe
 @if ERRORLEVEL 1 echo Error: NGen of proto failed  && goto :eof
 
-%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true 
-@if ERRORLEVEL 1 echo Error: library debug build failed && goto :eof
+%_msbuildexe% src/fsharp-library-build.proj /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: library build failed && goto :eof
 
-%_msbuildexe% src/fsharp-compiler-build.proj /p:UseNugetPackages=true 
-@if ERRORLEVEL 1 echo Error: compile debug build failed && goto :eof
+%_msbuildexe% src/fsharp-compiler-build.proj /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: compiler build failed && goto :eof
 
 REM We don't build new net20 FSharp.Core anymore
-REM %_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=net20
-REM @if ERRORLEVEL 1 echo Error: library net20 debug build failed && goto :eof
-
-%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
-@if ERRORLEVEL 1 echo Error: library portable47 debug build failed && goto :eof
-
-%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
-@if ERRORLEVEL 1 echo Error: library portable7 debug build failed && goto :eof
+REM %_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
+REM @if ERRORLEVEL 1 echo Error: library net20 build failed && goto :eof
 
+%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: library portable47 build failed && goto :eof
 
-%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
-@if ERRORLEVEL 1 echo Error: library portable78 debug build failed && goto :eof
+%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: library portable7 build failed && goto :eof
 
-%_msbuildexe% src/fsharp-library-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable259
-@if ERRORLEVEL 1 echo Error: library portable259 debug build failed && goto :eof
+%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: library portable78 build failed && goto :eof
 
+%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: library portable259 build failed && goto :eof
 
 
+%_msbuildexe% src/fsharp-library-unittests-build.proj /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: library unittests build failed && goto :eof
 
-%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true
-@if ERRORLEVEL 1 echo Error: library unittests debug build failed && goto :eof
+%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: library unittests build failed portable47 && goto :eof
 
-%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable47
-@if ERRORLEVEL 1 echo Error: library unittests debug build failed portable47 && goto :eof
+%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: library unittests build failed portable7 && goto :eof
 
-%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable7
-@if ERRORLEVEL 1 echo Error: library unittests debug build failed portable7 && goto :eof
+%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: library unittests build failed portable78 && goto :eof
 
-%_msbuildexe% src/fsharp-library-unittests-build.proj /p:UseNugetPackages=true /p:TargetFramework=portable78
-@if ERRORLEVEL 1 echo Error: library unittests debug build failed portable78 && goto :eof
+%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: library unittests build failed portable259 && goto :eof
 
 
 @echo on
-call src\update.cmd debug -ngen
+call src\update.cmd release -ngen
 
 @echo on
-call tests\BuildTestTools.cmd debug 
-REM @if ERRORLEVEL 1 echo Error: 'tests\BuildTestTools.cmd debug' failed && goto :eof
+call tests\BuildTestTools.cmd release 
+@if ERRORLEVEL 1 echo Error: 'tests\BuildTestTools.cmd release' failed && goto :eof
 
 @echo on
 
 pushd tests
 
 REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
-REM call RunTests.cmd debug fsharp Smoke
-REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd debug fsharpqa Smoke' failed && goto :eof
+REM call RunTests.cmd release fsharp Smoke
+REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release fsharpqa Smoke' failed && goto :eof
 
 REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
-REM call RunTests.cmd debug fsharpqa Smoke
-REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd debug fsharpqa Smoke' failed && goto :eof
+REM call RunTests.cmd release fsharpqa Smoke
+REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release fsharpqa Smoke' failed && goto :eof
 
-set PATH=%PATH%;%~dp0%packages\NUnit.Runners.2.6.3\tools\
-call RunTests.cmd debug coreunit
-@if ERRORLEVEL 1 echo Error: 'RunTests.cmd debug coreunit' failed && goto :eof
+call RunTests.cmd release coreunit
+@if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunit' failed && goto :eof
 
 popd
-
-
-

appveyor.yml

@@ -4,5 +4,5 @@ build_script:
 test: off 
 version: 0.0.1.{build} 
 artifacts: 
-  - path: Debug
-    name: Debug
+  - path: Release
+    name: Release

lkg/FSharp-4.0.30319.1/bin/FSharp.Core/README.txt

+The copy of FSharp.Core in this directory is version 2.0.50726.900, required by FSharp.SRGen.Build.Tasks.dll and other legacy Power Pack libraries in the parent directory.
+
+This copy of FSharp.Core.dll should not be referenced as an LKG, it is present merely as a workaround to enable the legacy libraries to work without needing to update the GAC.
\ No newline at end of file

src/FSharpSource.targets

@@ -740,4 +740,7 @@
         <CompileBefore Remove="@(CompileBefore)"/>   
     </ItemGroup>
   </Target>
+  <Target Name="BeforeBuild" BeforeTargets="Build">
+    <Exec Command=".\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages" WorkingDirectory="$(FSharpSourcesRoot)\.."/>
+  </Target>
 </Project>

src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj

@@ -20,12 +20,6 @@
     <Optimize>false</Optimize>
     <Tailcalls>false</Tailcalls>
     <TargetProfile Condition=" '$(TargetFramework)' == 'portable7' or '$(TargetFramework)' == 'portable78' or '$(TargetFramework)' == 'portable259' ">netcore</TargetProfile>
-    <!-- workaround for msbuild narrowing the assembly search paths when building portable libs -->
-    <AssemblySearchPaths Condition="$(TargetFramework.Contains('portable'))">
-      {CandidateAssemblyFiles};
-      {TargetFrameworkDirectory};
-      {Registry:Software\Microsoft\.NETFramework,v4.5,AssemblyFoldersEx};
-    </AssemblySearchPaths>
   </PropertyGroup>
   <PropertyGroup>
     <DefineConstants Condition=" '$(TargetFramework)' == 'sl5' ">$(DefineConstants);SILVERLIGHT</DefineConstants>
@@ -52,6 +46,7 @@
     <!-- need full name and SpecificVersion = true in order to convince msbuild to allow this reference when targeting portable47 -->
     <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" Condition="'$(TargetFramework)' != 'sl5' AND '$(TargetFramework)' != 'sl3-wp'" >
         <SpecificVersion>true</SpecificVersion>
+        <HintPath>$(FSharpSourcesRoot)\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="NUnitFramework" Condition="'$(TargetFramework)' == 'sl5' OR '$(TargetFramework)' == 'sl3-wp'" />
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
@@ -110,10 +105,4 @@
     <Compile Include="SurfaceArea.$(TargetFramework).fs" />
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
-  <Target Name="BeforeResolveReferences" Condition="'$(UseNugetPackages)'=='true'">
-    <CreateProperty Value="$(ProjectDir)..\..\..\packages\NUnit.2.6.3\lib\;$(AssemblySearchPaths)">
-      <Output TaskParameter="Value"
-              PropertyName="AssemblySearchPaths" />
-    </CreateProperty>
-  </Target>
 </Project>
\ No newline at end of file

tests/RunTests.cmd

@@ -43,6 +43,14 @@ IF NOT DEFINED APPVEYOR_CI (
 rem path to fsc.exe which will be used by tests
 set FSCBINPATH=%~dp0..\%FLAVOR%\net40\bin
 
+rem path to nunit runners
+set NUNITDIR=%~dp0..\packages\NUnit.Runners.2.6.3\tools
+if not exist "%NUNITDIR%" (
+    pushd %~dp0..
+    .\.nuget\nuget.exe restore packages.config -PackagesDirectory packages
+    popd
+)    
+
 rem folder where test logs/results will be dropped
 set RESULTSDIR=%~dp0\TestResults
 if not exist "%RESULTSDIR%" (mkdir "%RESULTSDIR%")
@@ -182,13 +190,8 @@ set XMLFILE=CoreUnit_%coreunitsuffix%_Xml.xml
 set OUTPUTFILE=CoreUnit_%coreunitsuffix%_Output.log
 set ERRORFILE=CoreUnit_%coreunitsuffix%_Error.log
 
-where.exe nunit-console.exe > NUL 2> NUL 
-if errorlevel 1 (
-  echo Error: nunit-console.exe is not in the PATH
-  exit /b 1
-)
-echo nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll 
-     nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll 
+echo "%NUNITDIR%\nunit-console.exe" /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll 
+     "%NUNITDIR%\nunit-console.exe" /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll 
 
 goto :EOF
 
@@ -198,13 +201,8 @@ set XMLFILE=ComplierUnit_%compilerunitsuffix%_Xml.xml
 set OUTPUTFILE=ComplierUnit_%compilerunitsuffix%_Output.log
 set ERRORFILE=ComplierUnit_%compilerunitsuffix%_Error.log
 
-where.exe nunit-console.exe > NUL 2> NUL
-if errorlevel 1 (
-  echo Error: nunit-console.exe is not in the PATH
-  exit /b 1
-)
-echo nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll 
-     nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll 
+echo "%NUNITDIR%\nunit-console.exe" /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll 
+     "%NUNITDIR%\nunit-console.exe" /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll 
 
 goto :EOF
 
@@ -214,16 +212,9 @@ set XMLFILE=IDEUnit_Xml.xml
 set OUTPUTFILE=IDEUnit_Output.log
 set ERRORFILE=IDEUnit_Error.log
 
-where.exe nunit-console-x86.exe > NUL 2> NUL 
-if errorlevel 1 (
-  echo Error: nunit-console-x86.exe is not in the PATH
-  exit /b 1
-)
-
-for /f "tokens=*" %%a in  ('where.exe nunit-console-x86.exe')  do  (set nunitlocation=%%~dpa)
-xcopy /y "%nunitlocation%\lib\*.dll" "%FSCBINPATH%"
+xcopy /y "%NUNITDIR%\lib\*.dll" "%FSCBINPATH%"
 
-echo nunit-console-x86.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\Unittests.dll 
-     nunit-console-x86.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\Unittests.dll 
+echo "%NUNITDIR%\nunit-console-x86.exe" /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\Unittests.dll 
+     "%NUNITDIR%\nunit-console-x86.exe" /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR% %FSCBINPATH%\Unittests.dll 
 
 goto :EOF
\ No newline at end of file

vsintegration/src/unittests/Unittests.fsproj

@@ -112,7 +112,10 @@
     <Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
     <Reference Include="Microsoft.VisualStudio.CommonIDE" />
     <Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
-    <Reference Include="nunit.framework.dll" />
+    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+        <SpecificVersion>true</SpecificVersion>
+        <HintPath>$(FSharpSourcesRoot)\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    </Reference>
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\Fsc\Fsc.fsproj">
       <Project>{ffde9e47-9675-4498-b540-69b2583dd600}</Project>
       <Name>Fsc</Name>