Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 0 additions & 14 deletions DEVGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,19 +161,6 @@ For the brave, you can rapidly deploy incrementally updated versions of Visual F

This gives a much tighter inner development loop than uninstalling/reinstalling the VSIX, as you do not have to restart VIsual Studio. Caveat emptor.

#### [Optional] Clobber the F# SDK on the machine

**Note:** The step below will try to clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsc.exe`` used by the standard install location or ``Microsoft.FSharp.Targets``. **Repairing Visual Studio 15 is currently the only way to revert this step.**

For **Debug**:

vsintegration\update-vsintegration.cmd debug

For **Release**:

vsintegration\update-vsintegration.cmd release


# Notes

#### Windows: Links to Additional frameworks
Expand All @@ -192,7 +179,6 @@ For **Release**:

#### Notes on the Windows .NET Framework build

1. The `update.cmd` script NGens the compiler and libraries. This requires admin privileges.
1. The compiler binaries produced are "private" and strong-named signed with a test key.
1. Some additional tools are required to build the compiler, notably `fslex.exe`, `fsyacc.exe`, `FSharp.PowerPack.Build.Tasks.dll`, `FsSrGen.exe`, `FSharp.SRGen.Build.Tasks.dll`, and the other tools found in the `lkg` directory.
1. The overall bootstrapping process executes as follows
Expand Down
1 change: 0 additions & 1 deletion TESTGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,5 @@ All test execution logs and result files will be dropped into the `tests\TestRes
* Run as Administrator, or a handful of tests will fail

* Making the tests run faster
* NGen-ing the F# bits (fsc, fsi, FSharp.Core, etc) will result in tests executing much faster. Make sure you run `src\update.cmd` with the `-ngen` flag before running tests.
* The FSharp and FSharpQA suites will run test cases in parallel by default. You can comment out the relevant line (look for `PARALLEL_ARG`) to disable this.
* By default, tests from the FSharpQA suite are run using a persistent, hosted version of the compiler. This speeds up test execution, as there is no need for the `fsc.exe` process to spin up repeatedly. To disable this, uncomment the relevant line (look for `HOSTED_COMPILER`).
17 changes: 0 additions & 17 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,6 @@ if defined TF_BUILD (

set msbuildflags=%_nrswitch% /nologo
REM set msbuildflags=%_nrswitch% /nologo
set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure

echo ---------------- Done with prepare, starting package restore ----------------

Expand All @@ -567,7 +565,6 @@ if "%RestorePackages%" == "true" (
cd..
@if ERRORLEVEL 1 echo Error: Paket restore failed && goto :failure

%_ngenexe% install %_nugetexe% /nologo
set _nugetoptions=-PackagesDirectory packages -ConfigFile %_nugetconfig%
if not "%PB_RESTORESOURCE%" == "" (
set _nugetoptions=!_nugetoptions! -Source %PB_RESTORESOURCE%
Expand Down Expand Up @@ -601,10 +598,8 @@ set path=%~dp0Tools\dotnet20\;%path%

set _fsiexe="packages\FSharp.Compiler.Tools.4.1.27\tools\fsi.exe"
if not exist %_fsiexe% echo Error: Could not find %_fsiexe% && goto :failure
%_ngenexe% install %_fsiexe% /nologo

if not exist %_nugetexe% echo Error: Could not find %_nugetexe% && goto :failure
%_ngenexe% install %_nugetexe% /nologo

echo ---------------- Done with package restore, verify buildfrom source ---------------
if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
Expand Down Expand Up @@ -637,17 +632,10 @@ if "%BUILD_PROTO%" == "1" (

if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "0" (

echo %_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo

echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
%_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
@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 ---------------- Done with proto, starting build ------------------------
Expand All @@ -661,11 +649,6 @@ if "%BUILD_PHASE%" == "1" (

echo ---------------- Done with build, starting pack/update/prepare ---------------

if "%BUILD_NET40_FSHARP_CORE%" == "1" (
echo ---------------- start update.cmd ---------------
call src\update.cmd %BUILD_CONFIG% -ngen
)

@echo set NUNITPATH=packages\NUnit.Console.3.0.0\tools\
set NUNITPATH=packages\NUnit.Console.3.0.0\tools\
if not exist %NUNITPATH% echo Error: Could not find %NUNITPATH% && goto :failure
Expand Down
2 changes: 0 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,6 @@ if [ "$BUILD_PROTO" = '1' ]; then
{ pushd ./lkg/fsi && eval "$_dotnetexe publish project.json --no-build -o ${_scriptdir}Tools/lkg -r $_architecture" && popd; } || failwith "dotnet publish failed"

{ printeval "$_msbuildexe $msbuildflags src/fsharp-proto-build.proj /p:Configuration=Proto"; } || failwith "compiler proto build failed"

# { printeval "$_ngenexe install Proto/net40/bin/fsc-proto.exe /nologo"; } || failwith "NGen of proto failed"
else
# Build proto-compiler and libs
{ printeval "$_msbuildexe $msbuildflags src/fsharp-proto-build.proj /p:UseMonoPackaging=true /p:Configuration=Proto"; } || failwith "compiler proto build failed"
Expand Down
59 changes: 0 additions & 59 deletions src/update.cmd

This file was deleted.

4 changes: 0 additions & 4 deletions tests/fsharp/test-framework.fs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ type TestConfig =
FSI_FOR_SCRIPTS : string
fsi_flags : string
ILDASM : string
NGEN : string
PEVERIFY : string
Directory: string
DotNetExe: string
Expand Down Expand Up @@ -176,7 +175,6 @@ let config configurationName envVars =
let CORDIR, CORSDK = WindowsPlatform.clrPaths envVars
let Is64BitOperatingSystem = WindowsPlatform.Is64BitOperatingSystem envVars
let CSC = requireFile (CORDIR ++ "csc.exe")
let NGEN = requireFile (CORDIR ++ "ngen.exe")
let ILDASM = requireFile (CORSDK ++ "ildasm.exe")
let PEVERIFY = requireFile (CORSDK ++ "peverify.exe")
let FSI_FOR_SCRIPTS =
Expand Down Expand Up @@ -215,7 +213,6 @@ let config configurationName envVars =
FSCBinPath = FSCBinPath |> Commands.pathAddBackslash
FSCOREDLLPATH = FSCOREDLLPATH
ILDASM = ILDASM
NGEN = NGEN
PEVERIFY = PEVERIFY
CSC = CSC
BUILD_CONFIG = configurationName
Expand Down Expand Up @@ -245,7 +242,6 @@ let logConfig (cfg: TestConfig) =
log "FSI =%s" cfg.FSI
log "fsi_flags =%s" cfg.fsi_flags
log "ILDASM =%s" cfg.ILDASM
log "NGEN =%s" cfg.NGEN
log "PEVERIFY =%s" cfg.PEVERIFY
log "---------------------------------------------------------------"

Expand Down
Loading