diff --git a/.gitignore b/.gitignore
index 49835c498..2ab68013c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,62 @@
+/packages
+/Tools
+/src/*.userprefs
+/src/fsharp/FSStrings.resources
+/src/fsharp/FSharp.Build/*.resx
+/src/fsharp/FSharp.Build-proto/*.resx
+/src/fsharp/FSharp.Build-proto/*.resources
+/src/fsharp/FSharp.Compiler-proto/*.resx
+/src/fsharp/FSharp.Compiler-proto/*.resources
+/src/fsharp/FSharp.Compiler-proto/*.sln
+/src/fsharp/FSharp.Compiler-proto/*.userprefs
+/src/fsharp/fsi/*.resx
+/src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx
+/src/fsharp/FSharp.Compiler.Server.Shared/*.resx
+/src/fsharp/fsi/Fsi.sln
+/src/fsharp/FSharp.Build/*.resources
+/src/fsharp/FSharp.Compiler/*.resx
+/src/fsharp/FSharp.Compiler/*.resources
+/src/fsharp/FSharp.Compiler/*.sln
+/src/fsharp/FSharp.Compiler/*.userprefs
+/src/*.log
+/src/fsharp/FSharp.Compiler/illex.fs
+/src/fsharp/FSharp.Compiler/ilpars.fs
+/src/fsharp/FSharp.Compiler/ilpars.fsi
+/src/fsharp/FSharp.Compiler/lex.fs
+/src/fsharp/FSharp.Compiler/pars.fs
+/src/fsharp/FSharp.Compiler/pars.fsi
+/src/fsharp/FSharp.Compiler/pplex.fs
+/src/fsharp/FSharp.Compiler/pppars.fs
+/src/fsharp/FSharp.Compiler/pppars.fsi
+/src/fsharp/FSharp.Compiler-proto/illex.fs
+/src/fsharp/FSharp.Compiler-proto/ilpars.fs
+/src/fsharp/FSharp.Compiler-proto/ilpars.fsi
+/src/fsharp/FSharp.Compiler-proto/lex.fs
+/src/fsharp/FSharp.Compiler-proto/pars.fs
+/src/fsharp/FSharp.Compiler-proto/pars.fsi
+/src/fsharp/FSharp.Compiler-proto/pplex.fs
+/src/fsharp/FSharp.Compiler-proto/pppars.fs
+/src/fsharp/FSharp.Compiler-proto/pppars.fsi
+/src/fsharp/FSharp.LanguageService.Compiler/illex.*
+/src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
+/src/fsharp/FSharp.LanguageService.Compiler/lex.*
+/src/fsharp/FSharp.LanguageService.Compiler/pars.*
+/src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
+/src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
+/src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
+/vsintegration/src/unittests/Unittests.fsi
+/tests/*FSharp_Failures.env
+/tests/*FSharp_Failures.lst
+/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
+/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
+/tests/XFSharpQA_Failures.log.*
+/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
+/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
+/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
+/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
+/tests/fsharpqa/Source/*FSharpQA_Failures.env
+/tests/fsharpqa/Source/*FSharpQA_Failures.lst
+/tests/**/FSharp.Core.dll
 lib/debug
 lib/release
 lib/proto
@@ -7,26 +66,6 @@ lib/bootstrap/4.1/fsharpc
 lib/bootstrap/4.1/fsharpi
 lib/bootstrap/4.1/policy*
 aclocal.m4
-src/*.userprefs
-src/fsharp/FSStrings.resources
-packages
-src/fsharp/FSharp.Build/*.resx
-src/fsharp/FSharp.Build-proto/*.resx
-src/fsharp/FSharp.Build-proto/*.resources
-src/fsharp/FSharp.Compiler-proto/*.resx
-src/fsharp/FSharp.Compiler-proto/*.resources
-src/fsharp/FSharp.Compiler-proto/*.sln
-src/fsharp/FSharp.Compiler-proto/*.userprefs
-src/fsharp/fsi/*.resx
-src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx
-src/fsharp/FSharp.Compiler.Server.Shared/*.resx
-src/fsharp/fsi/Fsi.sln
-src/fsharp/FSharp.Build/*.resources
-src/fsharp/FSharp.Compiler/*.resx
-src/fsharp/FSharp.Compiler/*.resources
-src/fsharp/FSharp.Compiler/*.sln
-src/fsharp/FSharp.Compiler/*.userprefs
-src/*.log
 Debug
 Release
 Proto
@@ -39,51 +78,11 @@ autom4te.cache
 config.log
 config.make
 config.status
-src/fsharp/FSharp.Compiler/illex.fs
-src/fsharp/FSharp.Compiler/ilpars.fs
-src/fsharp/FSharp.Compiler/ilpars.fsi
-src/fsharp/FSharp.Compiler/lex.fs
-src/fsharp/FSharp.Compiler/pars.fs
-src/fsharp/FSharp.Compiler/pars.fsi
-src/fsharp/FSharp.Compiler/pplex.fs
-src/fsharp/FSharp.Compiler/pppars.fs
-src/fsharp/FSharp.Compiler/pppars.fsi
-src/fsharp/FSharp.Compiler-proto/illex.fs
-src/fsharp/FSharp.Compiler-proto/ilpars.fs
-src/fsharp/FSharp.Compiler-proto/ilpars.fsi
-src/fsharp/FSharp.Compiler-proto/lex.fs
-src/fsharp/FSharp.Compiler-proto/pars.fs
-src/fsharp/FSharp.Compiler-proto/pars.fsi
-src/fsharp/FSharp.Compiler-proto/pplex.fs
-src/fsharp/FSharp.Compiler-proto/pppars.fs
-src/fsharp/FSharp.Compiler-proto/pppars.fsi
 *~
-tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.sln
-tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.userprefs
 *.suo
 obj
 extras
 ossreadme*.txt
-src/fsharp/FSharp.LanguageService.Compiler/illex.*
-src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
-src/fsharp/FSharp.LanguageService.Compiler/lex.*
-src/fsharp/FSharp.LanguageService.Compiler/pars.*
-src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
-src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
-src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
-vsintegration/src/unittests/Unittests.fsi
-vsintegration/src/FSharp.ProjectSystem.FSharp/ctofiles/MenusAndCommands.cto
-tests/*FSharp_Failures.env
-tests/*FSharp_Failures.lst
-tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
-tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
-tests/XFSharpQA_Failures.log.*
-vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
-vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
-tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
-tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
-tests/fsharpqa/Source/*FSharpQA_Failures.env
-tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.csproj.user
 *.sln.DotSettings.user
 *.ide
@@ -95,5 +94,4 @@ tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.mdf
 *.ldf
 *.cto
-tests/**/FSharp.Core.dll
 project.lock.json
diff --git a/build.cmd b/build.cmd
index b747025c4..e51f54f7b 100644
--- a/build.cmd
+++ b/build.cmd
@@ -34,7 +34,6 @@ set BUILD_VS=0
 set BUILD_CONFIG=release
 set BUILD_CONFIG_LOWERCASE=release
 set BUILD_DIAG=
-set BUILD_LOG=con
 
 set TEST_COMPILERUNIT=0
 set TEST_NET40_COREUNIT=0
@@ -80,7 +79,6 @@ if /i '%ARG%' == 'vs' (
 
 if /i '%ARG%' == 'diag' (
     set BUILD_DIAG=/v:diag
-    set BUILD_LOG=fsharp_build_log.log
 )
 
 if /i '%ARG%' == 'all' (
@@ -342,8 +340,8 @@ if '%BUILD_PROTO%' == '1' (
     @if ERRORLEVEL 1 echo Error: NGen of proto failed  && goto :failure
 )
 
-%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG% >%BUILD_LOG%
-@if ERRORLEVEL 1 echo Error: '%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%' failed && goto :failure
+%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG%
+@if ERRORLEVEL 1 echo Error: '%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG% %BUILD_DIAG%' failed && goto :failure
 
 @echo on
 call src\update.cmd %BUILD_CONFIG_LOWERCASE% -ngen