@@ -20,14 +20,15 @@ if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :eof
2020.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages
2121@ if ERRORLEVEL1 echo Error: Nuget restore failed&& goto :eof
2222
23- :: Build
23+ ::
2424%_msbuildexe% src\fsharp-proto-build.proj
2525@ if ERRORLEVEL1 echo Error: compiler proto build failed&& goto :eof
2626
2727%_ngenexe% install proto\net40\bin\FSharp.Compiler-proto.dll
2828%_ngenexe% install proto\net40\bin\fsharp.core.dll
2929%_ngenexe% install proto\net40\bin\FSharp.Build-proto.dll
30- %_ngenexe% install proto\net40\bin\fsc-proto.exe
30+ %_ngenexe% install Proto\net40\bin\fsc-proto.exe
31+ @ if ERRORLEVEL1 echo Error: NGen of proto failed&& goto :eof
3132
3233%_msbuildexe% src/fsharp-library-build.proj /p:Configuration=Release
3334@ if ERRORLEVEL1 echo Error: library release build failed&& goto :eof
@@ -50,8 +51,8 @@ REM @if ERRORLEVEL 1 echo Error: library net20 build failed && goto :eof
5051
5152%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
5253@ if ERRORLEVEL1 echo Error: library portable259 build failed&& goto :eof
53- %_msbuildexe% src/fsharp-compiler-unittests-build.proj
54- @ if ERRORLEVEL1 echo Error: compiler unittestsRelease build failed&& goto :eof
54+ %_msbuildexe% src/fsharp-compiler-unittests-build.proj /p:Configuration=Release
55+ @ if ERRORLEVEL1 echo Error: compiler unittests build failed&& goto :eof
5556
5657%_msbuildexe% src/fsharp-library-unittests-build.proj /p:Configuration=Release
5758@ if ERRORLEVEL1 echo Error: library unittests build failed&& goto :eof
@@ -81,17 +82,19 @@ call src\update.cmd release -ngen
8182call tests\BuildTestTools.cmd release
8283@ if ERRORLEVEL1 echo Error: 'tests\BuildTestTools.cmd release' failed&& goto :eof
8384
84- @ echo on
85+ %_msbuildexe% vsintegration\fsharp-vsintegration-build.proj /p:Configuration=Release
86+ @ if ERRORLEVEL1 echo Error: vsintegration build failed&& goto :eof
87+ %_msbuildexe% vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release
88+ @ if ERRORLEVEL1 echo Error: vsintegration unittests build failed&& goto :eof
8589
90+ @ echo on
8691pushd tests
8792
88- REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
89- REM call RunTests.cmd release fsharp Smoke
90- REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd Release fsharpqa Smoke' failed && goto :eof
93+ call RunTests.cmd release fsharp Smoke
94+ @ if ERRORLEVEL1 echo Error: 'RunTests.cmd release fsharp Smoke' failed&& goto :eof
9195
92- REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
93- REM call RunTests.cmd release fsharpqa Smoke
94- REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release fsharpqa Smoke' failed && goto :eof
96+ call RunTests.cmd release fsharpqa Smoke
97+ @ if ERRORLEVEL1 echo Error: 'RunTests.cmd release fsharpqa Smoke' failed&& goto :eof
9598
9699call RunTests.cmd release compilerunit
97100@ if ERRORLEVEL1 echo Error: 'RunTests.cmd release compilerunit' failed&& goto :eof