Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FSI on coreclr with no cl args #3140

Closed
wants to merge 16 commits into from
Closed

FSI on coreclr with no cl args #3140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1bbde36
FSI on coreclr with no cl args
KevinRansom May 27, 2017
5339baf
Addback GetTypes
KevinRansom May 27, 2017
7913fe5
Wierdly ..
KevinRansom May 28, 2017
feb6594
Make fsi work on coreclr 2.0
KevinRansom May 30, 2017
a9e72b3
Add latest dotnet.exe
KevinRansom May 30, 2017
4702386
Merge https://github.com/Microsoft/visualfsharp into addfsitocompiler…
KevinRansom May 30, 2017
9b559df
Merge https://github.com/Microsoft/visualfsharp into addfsitocompiler…
KevinRansom May 31, 2017
129df73
merge
KevinRansom May 31, 2017
73638a9
Use latest dotnet cli for LKG
KevinRansom May 31, 2017
a0e3254
Merge https://github.com/Microsoft/visualfsharp into addfsitocompiler…
KevinRansom Jun 1, 2017
637a8bb
Merge https://github.com/Microsoft/visualfsharp into addfsitocompiler…
KevinRansom Jun 2, 2017
42ee630
merge
KevinRansom Jun 2, 2017
9e547f1
temporary
KevinRansom Jun 2, 2017
df926dd
Merge https://github.com/Microsoft/visualfsharp into addfsitocompiler…
KevinRansom Jun 2, 2017
f628c52
Merge branch 'addfsitocompilerpackage' of https://github.com/kevinran…
KevinRansom Jun 5, 2017
0c1d1cf
temp
KevinRansom Jun 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions DotnetCLIToolsVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.0.0-preview2-006210
35 changes: 10 additions & 25 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,10 +523,6 @@ goto :eof
:havemsbuild
set _nrswitch=/nr:false

rem uncomment to use coreclr msbuild not ready yet!!!!
rem set _msbuildexe=%~dp0Tools\CoreRun.exe %~dp0Tools\MSBuild.exe
rem set _nrswitch=

:: See <http://www.appveyor.com/docs/environment-variables>
if defined APPVEYOR (
rem See <http://www.appveyor.com/docs/build-phase>
Expand Down Expand Up @@ -582,7 +578,8 @@ if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
call %~dp0init-tools.cmd
)

set _dotnetexe=%~dp0Tools\dotnetcli\dotnet.exe
set _dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
set NUGET_PACKAGES=%~dp0Packages

set _fsiexe="packages\FSharp.Compiler.Tools.4.1.5\tools\fsi.exe"
Expand All @@ -599,7 +596,6 @@ if NOT EXIST Proto\net40\bin\fsc-proto.exe (
set BUILD_PROTO=1
)

set _dotnetexe=%~dp0Tools\dotnetcli\dotnet.exe
set _architecture=win7-x64

rem Build Proto
Expand All @@ -608,19 +604,9 @@ if "%BUILD_PROTO%" == "1" (

if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (

pushd .\lkg\fsc & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure
pushd .\lkg\fsi & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure
pushd .\lkg\fsc & %_dotnetexe% publish project.json --no-build -o %~dp0Tools\lkg -r !_architecture! & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed & goto :failure
pushd .\lkg\fsi & %_dotnetexe% publish project.json --no-build -o %~dp0Tools\lkg -r !_architecture! & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed & goto :failure

echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
%_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
@if ERRORLEVEL 1 echo Error: compiler proto build failed && goto :failure

echo %_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo
%_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo
@if ERRORLEVEL 1 echo Error: NGen of proto failed && goto :failure

)

if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "0" (
Expand All @@ -631,12 +617,11 @@ if "%BUILD_PROTO%" == "1" (
echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
%_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
@if ERRORLEVEL 1 echo Error: compiler proto build failed && goto :failure

echo %_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo
%_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo
@if ERRORLEVEL 1 echo Error: NGen of proto failed && goto :failure

)

echo %_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo
%_ngenexe% install Proto\net40\bin\fsc-proto.exe /nologo
@if ERRORLEVEL 1 echo Error: NGen of proto failed && goto :failure
)

echo ---------------- Done with proto, starting build ------------------------
Expand Down Expand Up @@ -899,8 +884,8 @@ if "%TEST_CORECLR_COREUNIT_SUITE%" == "1" (
set OUTPUTFILE=!RESULTSDIR!\test-coreclr-coreunit-output.log
set ERRORFILE=!RESULTSDIR!\test-coreclr-coreunit-errors.log

echo "%_dotnetexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
"%_dotnetexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
echo "%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
"%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!

if ERRORLEVEL 1 (
echo -----------------------------------------------------------------
Expand All @@ -922,8 +907,8 @@ if "%TEST_CORECLR_FSHARP_SUITE%" == "1" (
set OUTPUTFILE=
set ERRORFILE=
set XMLFILE=!RESULTSDIR!\test-coreclr-fsharp-results.xml
echo "%_dotnetexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
"%_dotnetexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Tests.FSharpSuite.DrivingCoreCLR\FSharp.Tests.FSharpSuite.DrivingCoreCLR.dll" !WHERE_ARG_NUNIT!
echo "%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
"%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Tests.FSharpSuite.DrivingCoreCLR\FSharp.Tests.FSharpSuite.DrivingCoreCLR.dll" !WHERE_ARG_NUNIT!

if errorlevel 1 (
echo -----------------------------------------------------------------
Expand Down
Loading