From 46f81bb22bb74970c0d44c7d539e772390d98074 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 13 Oct 2016 17:28:18 +0100 Subject: [PATCH] Always use FSharp.Core not fsharp.core --- DEVGUIDE.md | 7 +++++-- src/fsharp-library-build.proj | 2 +- src/fsharp/CompileOps.fs | 4 ++-- .../FSharp.Core.Unittests.fsproj | 2 +- .../FSharp.Core.Unittests/LibraryTestFx.fs | 2 +- .../Microsoft.FSharp.Core.netcore.nuspec | 2 +- src/fsharp/fsc.fs | 2 +- tests/BuildTestTools.cmd | 16 ++++++++-------- tests/fsharp/single-test-build.bat | 2 +- tests/fsharp/single-test-build.fs | 2 +- tests/fsharp/single-test-run.bat | 1 + .../testenv/src/deployProj/CompileProj.fsx | 7 ++++--- .../testenv/src/deployProj/DeployProj.fsx | 6 +++--- 13 files changed, 30 insertions(+), 25 deletions(-) rename src/fsharp/{fsharp.core.netcore.nuget => FSharp.Core.netcore.nuget}/Microsoft.FSharp.Core.netcore.nuspec (99%) diff --git a/DEVGUIDE.md b/DEVGUIDE.md index d5b58b32757..cce9f1b8958 100644 --- a/DEVGUIDE.md +++ b/DEVGUIDE.md @@ -78,7 +78,7 @@ and Visual F# Tools then building the solution will be enough. The compiler is compiled as a set of .NET 4.0 components using a bootstrap process. This uses a Last Known Good (LKG) compiler checked into this repository to build. - msbuild src\fsharp-proto-build.proj + msbuild src/fsharp-proto-build.proj ### 2. Building an F# (Debug) library and compiler @@ -184,7 +184,7 @@ For **Release**: 1. Run ``vsintegration\update-vsintegration.cmd release`` (clobbers the installed F# SDK) -### Notes on the build +### Notes on the .NET Framework build 1. The `update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges. 1. The compiler binaries produced are "private" and strong-named signed with a test key. @@ -195,6 +195,9 @@ For **Release**: - We use the proto compiler to compile the source for `FSharp.Core.dll` in this distribution. - We use the proto compiler to compile the source for `FSharp.Compiler.dll`, `fsc.exe`, `fsi.exe`, and other binaries found in this distribution. + + + ## Resources The primary technical guide to the core compiler code is [The F# Compiler Technical Guide](http://fsharp.github.io/2015/09/29/fsharp-compiler-guide.html). Please read and contribute to that guide. diff --git a/src/fsharp-library-build.proj b/src/fsharp-library-build.proj index 83c7957f5be..a8bbca5d542 100644 --- a/src/fsharp-library-build.proj +++ b/src/fsharp-library-build.proj @@ -9,7 +9,7 @@ - + diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 84ba70bb3f7..f0b628ca6bb 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -1605,7 +1605,7 @@ let GetFSharpCoreReferenceUsedByCompiler(useSimpleResolution) = let fsCoreName = GetFSharpCoreLibraryName() #if FX_RESHAPED_REFLECTION // RESHAPED_REFLECTION does not have Assembly.GetReferencedAssemblies() - // So use the fsharp.core.dll from alongside the fsc compiler. + // So use the FSharp.Core.dll from alongside the fsc compiler. // This can also be used for the out of gac work on DEV15 let fscCoreLocation = let fscLocation = typeof.Assembly.Location @@ -2553,7 +2553,7 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) = | _ -> res let primaryAssemblyCcuInitializer = getSystemRuntimeInitializer data.primaryAssembly (computeKnownDllReference >> fst) - // If either mscorlib.dll/System.Runtime.dll or fsharp.core.dll are explicitly specified then we require the --noframework flag. + // If either mscorlib.dll/System.Runtime.dll or FSharp.Core.dll are explicitly specified then we require the --noframework flag. // The reason is that some non-default frameworks may not have the default dlls. For example, Client profile does // not have System.Web.dll. do if ((primaryAssemblyExplicitFilenameOpt.IsSome || fslibExplicitFilenameOpt.IsSome) && data.framework) then diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj index ce345f5da96..60d23f046ba 100644 --- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj +++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj @@ -21,7 +21,7 @@ false netcore $(NoWarn);217 - $(FSharpSourcesRoot)\..\tests\testbin\$(Configuration)\coreclr\fsharp.core.unittests + $(FSharpSourcesRoot)\..\tests\testbin\$(Configuration)\coreclr\FSharp.Core.unittests true diff --git a/src/fsharp/FSharp.Core.Unittests/LibraryTestFx.fs b/src/fsharp/FSharp.Core.Unittests/LibraryTestFx.fs index 548cd02f04c..3da75fef82c 100644 --- a/src/fsharp/FSharp.Core.Unittests/LibraryTestFx.fs +++ b/src/fsharp/FSharp.Core.Unittests/LibraryTestFx.fs @@ -77,7 +77,7 @@ module SurfaceArea = // gets string form of public surface area for the currently-loaded FSharp.Core let private getActual () = - // get current fsharp.core + // get current FSharp.Core let asm = #if portable7 || portable78 || portable259 || coreclr typeof.GetTypeInfo().Assembly diff --git a/src/fsharp/fsharp.core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec b/src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec similarity index 99% rename from src/fsharp/fsharp.core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec rename to src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec index 2cf75164d6b..a9ccdbb3215 100644 --- a/src/fsharp/fsharp.core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec +++ b/src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec @@ -3,7 +3,7 @@ Microsoft.FSharp.Core.netcore - .NET Core compatible version of the fsharp core library fsharp.core.dll + .NET Core compatible version of the fsharp core library FSharp.Core.dll Supported Platforms: - .NET Core (netstandard1.6) en-US diff --git a/src/fsharp/fsc.fs b/src/fsharp/fsc.fs index e7ac600f92d..a6f1dfd9a5e 100644 --- a/src/fsharp/fsc.fs +++ b/src/fsharp/fsc.fs @@ -2045,7 +2045,7 @@ let main4 (Args (tcConfig, errorLogger: ErrorLogger, ilGlobals, ilxMainModule, o AbortOnError(errorLogger, tcConfig, exiter) - // Don't copy referenced fharp.core.dll if we are building fsharp.core.dll + // Don't copy referenced FSharp.core.dll if we are building FSharp.Core.dll if tcConfig.copyFSharpCore && not tcConfig.compilingFslib && not tcConfig.standalone then copyFSharpCore(outfile, tcConfig.referencedDLLs) diff --git a/tests/BuildTestTools.cmd b/tests/BuildTestTools.cmd index deb4062d969..be7bb1efeef 100644 --- a/tests/BuildTestTools.cmd +++ b/tests/BuildTestTools.cmd @@ -81,20 +81,20 @@ if '%BUILD_CORECLR%' == '1' ( ) rem deploy x86 version of compiler and dependencies - %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x86 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\fsharp.core.dll --output:%~dp0testbin\%1\coreclr\fsc\win7-x86 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:yes --v:quiet - %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x86 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\fsharp.core.dll --output:%~dp0testbin\%1\coreclr\win7-x86 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:no --v:quiet + %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x86 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\FSharp.Core.dll --output:%~dp0testbin\%1\coreclr\fsc\win7-x86 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:yes --v:quiet + %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x86 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\FSharp.Core.dll --output:%~dp0testbin\%1\coreclr\win7-x86 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:no --v:quiet rem deploy x64 version of compiler - %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\fsharp.core.dll --output:%~dp0testbin\%1\coreclr\fsc\win7-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:yes --v:quiet - %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\fsharp.core.dll --output:%~dp0testbin\%1\coreclr\win7-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:no --v:quiet + %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\FSharp.Core.dll --output:%~dp0testbin\%1\coreclr\fsc\win7-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:yes --v:quiet + %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/win7-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\FSharp.Core.dll --output:%~dp0testbin\%1\coreclr\win7-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:no --v:quiet rem deploy linux version of built compiler - %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/ubuntu.14.04-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\fsharp.core.dll --output:%~dp0testbin\%1\coreclr\fsc\ubuntu.14.04-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:yes --v:quiet - %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/ubuntu.14.04-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\fsharp.core.dll --output:%~dp0testbin\%1\coreclr\ubuntu.14.04-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:no --v:quiet + %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/ubuntu.14.04-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\FSharp.Core.dll --output:%~dp0testbin\%1\coreclr\fsc\ubuntu.14.04-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:yes --v:quiet + %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/ubuntu.14.04-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\FSharp.Core.dll --output:%~dp0testbin\%1\coreclr\ubuntu.14.04-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:no --v:quiet rem deploy osx version of built compiler - %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/osx.10.10-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\fsharp.core.dll --output:%~dp0testbin\%1\coreclr\fsc\osx.10.10-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:yes --v:quiet - %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/osx.10.10-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\fsharp.core.dll --output:%~dp0testbin\%1\coreclr\osx.10.10-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:no --v:quiet + %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/osx.10.10-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\FSharp.Core.dll --output:%~dp0testbin\%1\coreclr\fsc\osx.10.10-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:yes --v:quiet + %_fsiexe% --exec %~dp0fsharpqa\testenv\src\DeployProj\DeployProj.fsx --targetPlatformName:.NETStandard,Version=v1.6/osx.10.10-x64 --projectJson:%~dp0fsharp\project.json --projectJsonLock:%~dp0fsharp\project.lock.json --packagesDir:%~dp0..\packages --fsharpCore:%~dp0..\%1\coreclr\bin\FSharp.Core.dll --output:%~dp0testbin\%1\coreclr\osx.10.10-x64 --nugetPath:%~dp0..\.nuget\nuget.exe --nugetConfig:%~dp0..\.nuget\nuget.config --copyCompiler:no --v:quiet echo "%NUNITPATH%*.*" "%~dp0fsharpqa\testenv\bin\nunit\*.*" /S /Q /Y xcopy "%NUNITPATH%*.*" "%~dp0fsharpqa\testenv\bin\nunit\*.*" /S /Q /Y diff --git a/tests/fsharp/single-test-build.bat b/tests/fsharp/single-test-build.bat index 59e076879b7..76ac3de1e61 100644 --- a/tests/fsharp/single-test-build.bat +++ b/tests/fsharp/single-test-build.bat @@ -131,7 +131,7 @@ set command_line_args=%command_line_args% --targetPlatformName:.NETStandard,Vers set command_line_args=%command_line_args% --source:"%~d0%~p0coreclr_utilities.fs" --source:"%sources%" set command_line_args=%command_line_args% --packagesDir:%~d0%~p0..\..\packages set command_line_args=%command_line_args% --projectJsonLock:%~d0%~p0project.lock.json -set command_line_args=%command_line_args% --fsharpCore:%~d0%~p0..\testbin\%flavor%\coreclr\fsc\%platform%\fsharp.core.dll +set command_line_args=%command_line_args% --fsharpCore:%~d0%~p0..\testbin\%flavor%\coreclr\fsc\%platform%\FSharp.Core.dll set command_line_args=%command_line_args% --define:CoreClr --define:NetCore set command_line_args=%command_line_args% --compilerPath:%~d0%~p0..\testbin\%flavor%\coreclr\fsc\%platform% set command_line_args=%command_line_args% --copyCompiler:yes diff --git a/tests/fsharp/single-test-build.fs b/tests/fsharp/single-test-build.fs index 9c51e645a57..08d421dd29f 100644 --- a/tests/fsharp/single-test-build.fs +++ b/tests/fsharp/single-test-build.fs @@ -19,7 +19,7 @@ let singleTestBuild cfg testDir = let buildOkPath = testDir / "build.ok" do if fileExists "build.ok" then del "build.ok" - //remove FSharp.Core.dll from the target directory to ensure that compiler uses the correct fsharp.core.dll + //remove FSharp.Core.dll from the target directory to ensure that compiler uses the correct FSharp.Core.dll do if fileExists "FSharp.Core.dll" then del "FSharp.Core.dll" diff --git a/tests/fsharp/single-test-run.bat b/tests/fsharp/single-test-run.bat index f365c7b1be0..2fec6db6268 100644 --- a/tests/fsharp/single-test-run.bat +++ b/tests/fsharp/single-test-run.bat @@ -178,6 +178,7 @@ goto :EOF set platform=win7-x64 set packagesDir=%~d0%~p0..\..\packages For %%A in ("%cd%") do ( Set TestCaseName=%%~nxA) + echo %~d0%~p0..\testbin\%flavor%\coreclr\%platform%\corerun.exe %~d0%~p0..\testbin\%flavor%\coreclr\fsharp\core\%TestCaseName%\output\test.exe > coreclr.run.cmd %CLIX% %~d0%~p0..\testbin\%flavor%\coreclr\%platform%\corerun.exe %~d0%~p0..\testbin\%flavor%\coreclr\fsharp\core\%TestCaseName%\output\test.exe dir test.ok > NUL 2>&1 ) || ( @echo :FSC_CORECLR failed diff --git a/tests/fsharpqa/testenv/src/deployProj/CompileProj.fsx b/tests/fsharpqa/testenv/src/deployProj/CompileProj.fsx index c54912fd9e6..5362274270d 100644 --- a/tests/fsharpqa/testenv/src/deployProj/CompileProj.fsx +++ b/tests/fsharpqa/testenv/src/deployProj/CompileProj.fsx @@ -30,7 +30,7 @@ let GetArgumentFromCommandLine switchName defaultValue = let ProjectJsonLock = GetArgumentFromCommandLine "--projectJsonLock:" @"tests\fsharp\project.lock.json" let PackagesDir = GetArgumentFromCommandLine "--packagesDir:" @"packages" let TargetPlatformName = GetArgumentFromCommandLine "--targetPlatformName:" @"DNXCore,Version=v5.0/win7-x64" -let FSharpCore = GetArgumentFromCommandLine "--fsharpCore:" @"Release\coreclr\bin\fsharp.core.dll" +let FSharpCore = GetArgumentFromCommandLine "--fsharpCore:" @"Release\coreclr\bin\FSharp.Core.dll" let Output = GetArgumentFromCommandLine "--output:" @"." let Verbosity = GetArgumentFromCommandLine "--v:" @"quiet" let CompilerPath = GetArgumentFromCommandLine "--compilerPath:" @"." @@ -49,8 +49,8 @@ let FSharpCompilerFiles = seq { yield Path.Combine(FSharpCoreDir, "fsc.exe") yield Path.Combine(FSharpCoreDir, "FSharp.Compiler.dll") - yield Path.Combine(FSharpCoreDir, "fsharp.core.sigdata") - yield Path.Combine(FSharpCoreDir, "fsharp.core.optdata") + yield Path.Combine(FSharpCoreDir, "FSharp.Core.sigdata") + yield Path.Combine(FSharpCoreDir, "FSharp.Core.optdata") yield Win32Manifest yield Path.Combine(FSharpCoreDir, "fsi.exe") yield Path.Combine(FSharpCoreDir, "FSharp.Compiler.Interactive.Settings.dll") @@ -106,6 +106,7 @@ let executeCompiler sources references = (GetPublicSignOption) (ExtraDefines) (listToSpaceSeperatedString sources) + File.WriteAllText(@"coreclr.fsc.cmd",(CompilerPath + @"\CoreRun.exe" + arguments)) executeProcess (CompilerPath + @"\CoreRun.exe") arguments let setPathSeperators (path:string) = path.Replace('/', '\\') diff --git a/tests/fsharpqa/testenv/src/deployProj/DeployProj.fsx b/tests/fsharpqa/testenv/src/deployProj/DeployProj.fsx index 44c58f08639..cb63359f7fd 100644 --- a/tests/fsharpqa/testenv/src/deployProj/DeployProj.fsx +++ b/tests/fsharpqa/testenv/src/deployProj/DeployProj.fsx @@ -30,7 +30,7 @@ let configFile = GetArgumentFromCommandLine "--nugetConfig:" @".n let ProjectJsonLock = GetArgumentFromCommandLine "--projectJsonLock:" @"tests\fsharp\project.lock.json" let PackagesDir = GetArgumentFromCommandLine "--packagesDir:" @"packages" let TargetPlatformName = GetArgumentFromCommandLine "--targetPlatformName:" @"DNXCore,Version=v5.0/win7-x64" -let FSharpCore = GetArgumentFromCommandLine "--fsharpCore:" @"Release\coreclr\bin\fsharp.core.dll" +let FSharpCore = GetArgumentFromCommandLine "--fsharpCore:" @"Release\coreclr\bin\FSharp.Core.dll" let Output = GetArgumentFromCommandLine "--output:" @"." let NugetPath = GetArgumentFromCommandLine "--nugetPath:" @".nuget\nuget.exe" let Verbosity = GetArgumentFromCommandLine "--v:" @"quiet" @@ -41,8 +41,8 @@ let FSharpCompilerFiles = seq { yield Path.Combine(FSharpCoreDir, "fsc.exe") yield Path.Combine(FSharpCoreDir, "FSharp.Compiler.dll") - yield Path.Combine(FSharpCoreDir, "fsharp.core.sigdata") - yield Path.Combine(FSharpCoreDir, "fsharp.core.optdata") + yield Path.Combine(FSharpCoreDir, "FSharp.Core.sigdata") + yield Path.Combine(FSharpCoreDir, "FSharp.Core.optdata") yield Path.Combine(FSharpCoreDir, "default.win32manifest") yield Path.Combine(FSharpCoreDir, "fsi.exe") yield Path.Combine(FSharpCoreDir, "FSharp.Compiler.Interactive.Settings.dll")