@@ -20,25 +20,22 @@ 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
3435
3536%_msbuildexe% src/fsharp-compiler-build.proj /p:Configuration=Release
3637@ if ERRORLEVEL1 echo Error: compile Release build failed&& goto :eof
3738
38- REM We don't build new net20 FSharp.Core anymore
39- REM %_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
40- REM @if ERRORLEVEL 1 echo Error: library net20 build failed && goto :eof
41-
4239%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
4340@ if ERRORLEVEL1 echo Error: library portable47 build failed&& goto :eof
4441
@@ -50,8 +47,8 @@ REM @if ERRORLEVEL 1 echo Error: library net20 build failed && goto :eof
5047
5148%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
5249@ 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
50+ %_msbuildexe% src/fsharp-compiler-unittests-build.proj /p:Configuration=Release
51+ @ if ERRORLEVEL1 echo Error: compiler unittests build failed&& goto :eof
5552
5653%_msbuildexe% src/fsharp-library-unittests-build.proj /p:Configuration=Release
5754@ if ERRORLEVEL1 echo Error: library unittests build failed&& goto :eof
@@ -82,16 +79,13 @@ call tests\BuildTestTools.cmd release
8279@ if ERRORLEVEL1 echo Error: 'tests\BuildTestTools.cmd release' failed&& goto :eof
8380
8481@ echo on
85-
8682pushd tests
8783
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
84+ call RunTests.cmd release fsharp Smoke
85+ @ if ERRORLEVEL1 echo Error: 'RunTests.cmd release fsharp Smoke' failed&& goto :eof
9186
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
87+ call RunTests.cmd release fsharpqa Smoke
88+ @ if ERRORLEVEL1 echo Error: 'RunTests.cmd release fsharpqa Smoke' failed&& goto :eof
9589
9690call RunTests.cmd release compilerunit
9791@ if ERRORLEVEL1 echo Error: 'RunTests.cmd release compilerunit' failed&& goto :eof