rename src/fsharp/vs --> src/fsharp/service (#4119)

* rename src/fsharp/vs --> src/fsharp/service * move unit tests to tests"

rename src/fsharp/vs --> src/fsharp/service (#4119)
* rename src/fsharp/vs --> src/fsharp/service * move unit tests to tests"
3c4417ef · Don Syme · GitHub · c88d3f4d · 3c4417ef · 3c4417ef
162 changed file
--- a/.gitignore
+++ b/.gitignore
@@ -58,8 +58,8 @@ scripts/*.patch
 /tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
 /tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
 /tests/Xnet40-fsharpqa-suite-failures.log.*
-/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
-/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
+/vsintegration/src/service/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
+/vsintegration/src/service/FsPkgs/FSharp.Project/FS/ctofiles/
 /tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
 /tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
 /tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.env
@@ -114,7 +114,7 @@ tests/fsharp/typecheck/sigs/neg94-pre.dll
 times
 /tests/fsharpqa/testenv/bin/System.ValueTuple.dll
 source_link.json
-.vs/
+.service/
 /VSRelease/net40/bin
 System.ValueTuple.dll
 tests/fsharpqa/testenv/bin/System.ValueTuple.dll

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -113,7 +113,7 @@ Feature PRs have the following minimum requirements:

 - For Visual F# Tools features, include a link to the [Visual F# Tools](https://github.com/microsoft/visualfsharp) issue for the feature.

- For F# Library features, if you have made additions to the FSharp.Core library public surface area, update [the SurfaceArea tests](https://github.com/Microsoft/visualfsharp/tree/fsharp4/src/fsharp/FSharp.Core.Unittests).
+- For F# Library features, if you have made additions to the FSharp.Core library public surface area, update [the SurfaceArea tests](https://github.com/Microsoft/visualfsharp/tree/fsharp4/tests/FSharp.Core.UnitTests).

 - For F# Language and Library features, you will be asked to submit a speclet for the feature to the [F# Language Design](https://github.com/fsharp/fslang-design) GitHub repository of speclets.  In some cases you will only need to do this after your feature is accepted, but for more complex features you may be asked to do this during the review of the feature.  


--- a/FSharp.sln
+++ b/FSharp.sln
@@ -29,9 +29,9 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsi", "src\fsharp\fsi\Fsi.f
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Tests.FSharpSuite", "tests\fsharp\FSharp.Tests.FSharpSuite.fsproj", "{C163E892-5BF7-4B59-AA99-B0E8079C67C4}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Unittests", "src\fsharp\FSharp.Compiler.Unittests\FSharp.Compiler.Unittests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.UnitTests", "tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core.Unittests", "src\fsharp\FSharp.Core.Unittests\FSharp.Core.Unittests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core.UnitTests", "tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
 EndProject

--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ build:
 	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
 	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
 	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
 	mkdir -p $(Configuration)/fsharp30/net40/bin
 	mkdir -p $(Configuration)/fsharp31/net40/bin
 	mkdir -p $(Configuration)/fsharp40/net40/bin

--- a/TESTGUIDE.md
+++ b/TESTGUIDE.md
@@ -25,9 +25,9 @@ The F# tests are split as follows:

 * [FSharpQA Suite](tests/fsharpqa/Source) - Broad and deep coverage of a variety of compiler, runtime, and syntax scenarios.

-* [FSharp.Core.Unittests](src/fsharp/FSharp.Core.Unittests) - Validation of the core F# types and the public surface area of `FSharp.Core.dll`.
+* [FSharp.Core.UnitTests](tests/FSharp.Core.UnitTests) - Validation of the core F# types and the public surface area of `FSharp.Core.dll`.

-* [FSharp.Compiler.Unittests](src/fsharp/FSharp.Compiler.Unittests) - Validation of compiler internals.
+* [FSharp.Compiler.UnitTests](tests/FSharp.Compiler.UnitTests) - Validation of compiler internals.

 * [VisualFSharp.UnitTests](vsintegration/tests/unittests) - Visual F# Tools IDE Unit Test Suite
  This suite exercises a wide range of behaviors in the F# Visual Studio project system and language service.
@@ -59,7 +59,7 @@ Tags are in the left column, paths to to corresponding test folders are in the r

 If you want to re-run a particular test area, the easiest way to do so is to set a temporary tag for that area in test.lst (e.g. "RERUN") and then pass that as an argument to `build.cmd`: `build.cmd test-net40-fsharpqa include RERUN`.

-### FSharp.Compiler.Unittests, FSharp.Core.Unittests, VisualFSharp.Unittests
+### FSharp.Compiler.UnitTests, FSharp.Core.UnitTests, VisualFSharp.UnitTests

 These are all NUnit tests. You can execute these tests individually via the Visual Studio NUnit3 runner 
 extension or the command line via `nunit3-console.exe`.

--- a/VisualFSharp.sln
+++ b/VisualFSharp.sln
@@ -32,7 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CFE3259A
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "VisualFSharp.Salsa", "vsintegration\tests\Salsa\VisualFSharp.Salsa.fsproj", "{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "VisualFSharp.Unittests", "vsintegration\tests\unittests\VisualFSharp.Unittests.fsproj", "{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "VisualFSharp.UnitTests", "vsintegration\tests\unittests\VisualFSharp.UnitTests.fsproj", "{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DefinitionLocationAttribute", "vsintegration\tests\unittests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj", "{DA39AD38-4A58-47BF-9215-E49768295169}"
 EndProject
@@ -76,11 +76,11 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsi", "src\fsharp\fsi\Fsi.f
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Tests.FSharpSuite", "tests\fsharp\FSharp.Tests.FSharpSuite.fsproj", "{C163E892-5BF7-4B59-AA99-B0E8079C67C4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualFSharp.Unittests Support", "VisualFSharp.Unittests Support", "{3F044931-FB83-4433-B934-AE66AB27B278}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualFSharp.UnitTests Support", "VisualFSharp.UnitTests Support", "{3F044931-FB83-4433-B934-AE66AB27B278}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Unittests", "src\fsharp\FSharp.Compiler.Unittests\FSharp.Compiler.Unittests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.UnitTests", "tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core.Unittests", "src\fsharp\FSharp.Core.Unittests\FSharp.Core.Unittests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core.UnitTests", "tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualFSharp", "VisualFSharp", "{4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}"
 EndProject
@@ -136,7 +136,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TestTP", "tests\service\dat
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceFile", "vsintegration\ItemTemplates\ResourceFile\ResourceFile.csproj", "{0385564F-07B4-4264-AB8A-17C393E9140C}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Build.UnitTests", "src\fsharp\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj", "{400FAB03-786E-40CC-85A8-04B0C2869B14}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Build.UnitTests", "tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj", "{400FAB03-786E-40CC-85A8-04B0C2869B14}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PEVerify", "tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj", "{B0689A4E-07D8-494D-A0C8-791CB1D74E54}"
 EndProject

--- a/build-everything.proj
+++ b/build-everything.proj
@@ -54,17 +54,17 @@
  <!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++ -->

  <ItemGroup Condition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
-    <ProjectsWithNet40 Include="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
-    <ProjectsWithNet40 Include="src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
+    <ProjectsWithNet40 Include="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
+    <ProjectsWithNet40 Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
  </ItemGroup>

  <ItemGroup Condition="'$(TEST_CORECLR_COREUNIT_SUITE)'=='1'">
-    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
-    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
+    <ProjectsWithCoreClr Include="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
+    <ProjectsWithCoreClr Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
  </ItemGroup>

  <ItemGroup Condition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" >
-    <ProjectsWithNet40 Include="src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj"/>
+    <ProjectsWithNet40 Include="tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj"/>
  </ItemGroup>

  <ItemGroup Condition="'$(TEST_NET40_FSHARP_SUITE)'=='1'" >

--- a/build.cmd
+++ b/build.cmd
@@ -881,8 +881,8 @@ if "%TEST_NET40_COMPILERUNIT_SUITE%" == "1" (
        set OUTPUTARG=--output:"!OUTPUTFILE!" 
    )
    set ERRORFILE=!RESULTSDIR!\test-net40-compilerunit-errors.log
-    echo "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG!  !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\..\..\net40\bin\FSharp.Compiler.Unittests.dll" !WHERE_ARG_NUNIT!
-         "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG!  !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\..\..\net40\bin\FSharp.Compiler.Unittests.dll" !WHERE_ARG_NUNIT!
+    echo "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG!  !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\..\..\net40\bin\FSharp.Compiler.UnitTests.dll" !WHERE_ARG_NUNIT!
+         "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG!  !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\..\..\net40\bin\FSharp.Compiler.UnitTests.dll" !WHERE_ARG_NUNIT!

    if errorlevel 1 (
        echo -----------------------------------------------------------------
@@ -912,11 +912,11 @@ if "%TEST_NET40_COREUNIT_SUITE%" == "1" (
        set OUTPUTARG=--output:"!OUTPUTFILE!" 
    )

-    echo "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Build.Unittests.dll" !WHERE_ARG_NUNIT!
-         "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Build.Unittests.dll" !WHERE_ARG_NUNIT!
+    echo "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Build.UnitTests.dll" !WHERE_ARG_NUNIT!
+         "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Build.UnitTests.dll" !WHERE_ARG_NUNIT!

-    echo "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
-         "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
+    echo "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Core.UnitTests.dll" !WHERE_ARG_NUNIT!
+         "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Core.UnitTests.dll" !WHERE_ARG_NUNIT!

    if errorlevel 1 (
        echo -----------------------------------------------------------------
@@ -938,11 +938,11 @@ if "%TEST_CORECLR_COREUNIT_SUITE%" == "1" (
    set OUTPUTFILE=!RESULTSDIR!\test-coreclr-coreunit-output.log
    set ERRORFILE=!RESULTSDIR!\test-coreclr-coreunit-errors.log

-    echo "%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.Unittests\FSharp.Build.Unittests.dll" !WHERE_ARG_NUNIT!
-         "%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.Unittests\FSharp.Build.Unittests.dll" !WHERE_ARG_NUNIT!
+    echo "%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.UnitTests\FSharp.Build.UnitTests.dll" !WHERE_ARG_NUNIT!
+         "%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.UnitTests\FSharp.Build.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!
+    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 -----------------------------------------------------------------
@@ -992,8 +992,8 @@ if "%TEST_VS_IDEUNIT_SUITE%" == "1" (
    )

    pushd !FSCBINPATH!
-    echo "!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!"  --workers=1 --agents=1 --full "!FSCBINPATH!\VisualFSharp.Unittests.dll" !WHERE_ARG_NUNIT!
-         "!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!"  --workers=1 --agents=1 --full "!FSCBINPATH!\VisualFSharp.Unittests.dll" !WHERE_ARG_NUNIT!
+    echo "!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!"  --workers=1 --agents=1 --full "!FSCBINPATH!\VisualFSharp.UnitTests.dll" !WHERE_ARG_NUNIT!
+         "!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!"  --workers=1 --agents=1 --full "!FSCBINPATH!\VisualFSharp.UnitTests.dll" !WHERE_ARG_NUNIT!
    popd

    if errorlevel 1 (

--- a/build.sh
+++ b/build.sh
@@ -643,7 +643,7 @@ if [ "$TEST_NET40_COMPILERUNIT_SUITE" = '1' ]; then
 	    OUTPUTARG="--output:\"$OUTPUTFILE\""
    fi
    
-    if ! printeval "mono $NUNIT3_CONSOLE --verbose --framework:V4.0 --result:\"$XMLFILE;format=nunit3\" $OUTPUTARG  $ERRORARG --work:\"$FSCBINPATH\" \"$FSCBINPATH/../../net40/bin/FSharp.Compiler.Unittests.dll\" $WHERE_ARG_NUNIT"; then
+    if ! printeval "mono $NUNIT3_CONSOLE --verbose --framework:V4.0 --result:\"$XMLFILE;format=nunit3\" $OUTPUTARG  $ERRORARG --work:\"$FSCBINPATH\" \"$FSCBINPATH/../../net40/bin/FSharp.Compiler.UnitTests.dll\" $WHERE_ARG_NUNIT"; then
        if [ -f "$OUTPUTFILE" ]; then
            echo -----------------------------------------------------------------
            cat "$OUTPUTFILE"
@@ -675,7 +675,7 @@ if [ "$TEST_NET40_COREUNIT_SUITE" = '1' ]; then
 	    OUTPUTARG="--output:\"$OUTPUTFILE\""
    fi

-    if ! printeval "mono $NUNIT3_CONSOLE --verbose --framework:V4.0 --result:\"$XMLFILE;format=nunit3\" $OUTPUTARG $ERRORARG --work:\"$FSCBINPATH\" \"$FSCBINPATH/FSharp.Core.Unittests.dll\" $WHERE_ARG_NUNIT"; then
+    if ! printeval "mono $NUNIT3_CONSOLE --verbose --framework:V4.0 --result:\"$XMLFILE;format=nunit3\" $OUTPUTARG $ERRORARG --work:\"$FSCBINPATH\" \"$FSCBINPATH/FSharp.Core.UnitTests.dll\" $WHERE_ARG_NUNIT"; then
        if [ -f "$OUTPUTFILE" ]; then
            echo -----------------------------------------------------------------
            cat "$OUTPUTFILE"
@@ -708,7 +708,7 @@ if [ "$TEST_PORTABLE_COREUNIT_SUITE" = '1' ]; then
        OUTPUTARG="--output:\"$OUTPUTFILE\""
 	fi

-    if ! printeval "mono $NUNIT3_CONSOLE /framework:V4.0 /result=\"$XMLFILE;format=nunit3\" $OUTPUTARG $ERRORARG /work=\"$FSCBINPATH\" \"$FSCBINPATH/../../portable7/bin/FSharp.Core.Unittests.dll\" \"$FSCBINPATH/../../portable47/bin/FSharp.Core.Unittests.dll\" \"$FSCBINPATH/../../portable78/bin/FSharp.Core.Unittests.dll\" \"$FSCBINPATH/../../portable259/bin/FSharp.Core.Unittests.dll\" $WHERE_ARG_NUNIT"; then
+    if ! printeval "mono $NUNIT3_CONSOLE /framework:V4.0 /result=\"$XMLFILE;format=nunit3\" $OUTPUTARG $ERRORARG /work=\"$FSCBINPATH\" \"$FSCBINPATH/../../portable7/bin/FSharp.Core.UnitTests.dll\" \"$FSCBINPATH/../../portable47/bin/FSharp.Core.UnitTests.dll\" \"$FSCBINPATH/../../portable78/bin/FSharp.Core.UnitTests.dll\" \"$FSCBINPATH/../../portable259/bin/FSharp.Core.UnitTests.dll\" $WHERE_ARG_NUNIT"; then
        if [ -f "$OUTPUTFILE" ]; then
            echo -----------------------------------------------------------------
            cat "$OUTPUTFILE"
@@ -732,7 +732,7 @@ if [ "$TEST_CORECLR_COREUNIT_SUITE" = '1' ]; then
    OUTPUTFILE="$RESULTSDIR/test-coreclr-coreunit-output.log"
    ERRORFILE="$RESULTSDIR/test-coreclr-coreunit-errors.log"

-    if ! printeval "$_dotnetexe \"${_scriptdir}tests/testbin/$BUILD_CONFIG/coreclr/FSharp.Core.Unittests/FSharp.Core.Unittests.dll\" $WHERE_ARG_NUNIT"; then
+    if ! printeval "$_dotnetexe \"${_scriptdir}tests/testbin/$BUILD_CONFIG/coreclr/FSharp.Core.UnitTests/FSharp.Core.UnitTests.dll\" $WHERE_ARG_NUNIT"; then
        echo -----------------------------------------------------------------
        echo Error: Running tests coreclr-coreunit failed, see logs above-- FAILED
        echo -----------------------------------------------------------------

--- a/fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj
+++ b/fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj
@@ -542,46 +542,46 @@
    <Compile Include="$(FSharpSourcesRoot)\fsharp\symbols\SymbolPatterns.fs">
      <Link>Symbols/SymbolPatterns.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\IncrementalBuild.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\IncrementalBuild.fsi">
      <Link>Service/IncrementalBuild.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\IncrementalBuild.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\IncrementalBuild.fs">
      <Link>Service/IncrementalBuild.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\Reactor.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\Reactor.fsi">
      <Link>Service/Reactor.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\Reactor.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\Reactor.fs">
      <Link>Service/Reactor.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceConstants.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceConstants.fs">
      <Link>Service/ServiceConstants.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceLexing.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceLexing.fsi">
      <Link>Service/ServiceLexing.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceLexing.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceLexing.fs">
      <Link>Service/ServiceLexing.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceParseTreeWalk.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceParseTreeWalk.fs">
      <Link>Service/ServiceParseTreeWalk.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceNavigation.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceNavigation.fsi">
      <Link>Service/ServiceNavigation.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceNavigation.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceNavigation.fs">
      <Link>Service/ServiceNavigation.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceParamInfoLocations.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceParamInfoLocations.fsi">
      <Link>Service/ServiceParamInfoLocations.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceParamInfoLocations.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceParamInfoLocations.fs">
      <Link>Service/ServiceParamInfoLocations.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceUntypedParse.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceUntypedParse.fsi">
      <Link>Service/ServiceUntypedParse.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceUntypedParse.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceUntypedParse.fs">
      <Link>Service/ServiceUntypedParse.fs</Link>
    </Compile>
    <Compile Include="$(FSharpSourcesRoot)\utils\reshapedmsbuild.fs">
@@ -590,58 +590,58 @@
    <Compile Include="$(FSharpSourcesRoot)\fsharp\SimulatedMSBuildReferenceResolver.fs">
      <Link>Service/SimulatedMSBuildReferenceResolver.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceDeclarationLists.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceDeclarationLists.fsi">
      <Link>Service/ServiceDeclarationLists.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceDeclarationLists.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceDeclarationLists.fs">
      <Link>Service/ServiceDeclarationLists.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAssemblyContent.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAssemblyContent.fsi">
      <Link>Service/ServiceAssemblyContent.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAssemblyContent.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAssemblyContent.fs">
      <Link>Service/ServiceAssemblyContent.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceXmlDocParser.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceXmlDocParser.fsi">
      <Link>Service/ServiceXmlDocParser.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceXmlDocParser.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceXmlDocParser.fs">
      <Link>Service/ServiceXmlDocParser.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ExternalSymbol.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ExternalSymbol.fsi">
      <Link>Service/ExternalSymbol.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ExternalSymbol.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ExternalSymbol.fs">
      <Link>Service/ExternalSymbol.fs</Link>
    </Compile>
-	<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\QuickParse.fsi">
+	<Compile Include="$(FSharpSourcesRoot)\fsharp\service\QuickParse.fsi">
      <Link>Service/QuickParse.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\QuickParse.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\QuickParse.fs">
      <Link>Service/QuickParse.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\service.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\service.fsi">
      <Link>Service/service.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\service.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\service.fs">
      <Link>Service/service.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceInterfaceStubGenerator.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceInterfaceStubGenerator.fsi">
      <Link>Service/ServiceInterfaceStubGenerator.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceInterfaceStubGenerator.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceInterfaceStubGenerator.fs">
      <Link>Service/ServiceInterfaceStubGenerator.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceStructure.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceStructure.fsi">
      <Link>Service/ServiceStructure.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceStructure.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceStructure.fs">
      <Link>Service/ServiceStructure.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAnalysis.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAnalysis.fsi">
      <Link>Service/ServiceAnalysis.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAnalysis.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAnalysis.fs">
      <Link>Service/ServiceAnalysis.fs</Link>
    </Compile>
    <Compile Include="$(FSharpSourcesRoot)\fsharp\fsi\fsi.fsi">

--- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
+++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -517,46 +517,46 @@
    <Compile Include="$(FSharpSourcesRoot)\fsharp\symbols\SymbolPatterns.fs">
      <Link>Symbols/SymbolPatterns.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\IncrementalBuild.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\IncrementalBuild.fsi">
      <Link>Service/IncrementalBuild.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\IncrementalBuild.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\IncrementalBuild.fs">
      <Link>Service/IncrementalBuild.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\Reactor.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\Reactor.fsi">
      <Link>Service/Reactor.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\Reactor.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\Reactor.fs">
      <Link>Service/Reactor.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceConstants.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceConstants.fs">
      <Link>Service/ServiceConstants.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceLexing.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceLexing.fsi">
      <Link>Service/ServiceLexing.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceLexing.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceLexing.fs">
      <Link>Service/ServiceLexing.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceParseTreeWalk.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceParseTreeWalk.fs">
      <Link>Service/ServiceParseTreeWalk.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceNavigation.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceNavigation.fsi">
      <Link>Service/ServiceNavigation.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceNavigation.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceNavigation.fs">
      <Link>Service/ServiceNavigation.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceParamInfoLocations.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceParamInfoLocations.fsi">
      <Link>Service/ServiceParamInfoLocations.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceParamInfoLocations.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceParamInfoLocations.fs">
      <Link>Service/ServiceParamInfoLocations.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceUntypedParse.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceUntypedParse.fsi">
      <Link>Service/ServiceUntypedParse.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceUntypedParse.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceUntypedParse.fs">
      <Link>Service/ServiceUntypedParse.fs</Link>
    </Compile>
    <Compile Include="$(FSharpSourcesRoot)\utils\reshapedmsbuild.fs">
@@ -565,58 +565,58 @@
    <Compile Include="$(FSharpSourcesRoot)\fsharp\SimulatedMSBuildReferenceResolver.fs">
      <Link>Service/SimulatedMSBuildReferenceResolver.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceDeclarationLists.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceDeclarationLists.fsi">
      <Link>Service/ServiceDeclarationLists.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceDeclarationLists.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceDeclarationLists.fs">
      <Link>Service/ServiceDeclarationLists.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAssemblyContent.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAssemblyContent.fsi">
      <Link>Service/ServiceAssemblyContent.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAssemblyContent.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAssemblyContent.fs">
      <Link>Service/ServiceAssemblyContent.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceXmlDocParser.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceXmlDocParser.fsi">
      <Link>Service/ServiceXmlDocParser.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceXmlDocParser.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceXmlDocParser.fs">
      <Link>Service/ServiceXmlDocParser.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ExternalSymbol.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ExternalSymbol.fsi">
      <Link>Service/ExternalSymbol.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ExternalSymbol.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ExternalSymbol.fs">
      <Link>Service/ExternalSymbol.fs</Link>
    </Compile>
-	<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\QuickParse.fsi">
+	<Compile Include="$(FSharpSourcesRoot)\fsharp\service\QuickParse.fsi">
      <Link>Service/QuickParse.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\QuickParse.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\QuickParse.fs">
      <Link>Service/QuickParse.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\service.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\service.fsi">
      <Link>Service/service.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\service.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\service.fs">
      <Link>Service/service.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceInterfaceStubGenerator.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceInterfaceStubGenerator.fsi">
      <Link>Service/ServiceInterfaceStubGenerator.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceInterfaceStubGenerator.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceInterfaceStubGenerator.fs">
      <Link>Service/ServiceInterfaceStubGenerator.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceStructure.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceStructure.fsi">
      <Link>Service/ServiceStructure.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceStructure.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceStructure.fs">
      <Link>Service/ServiceStructure.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAnalysis.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAnalysis.fsi">
      <Link>Service/ServiceAnalysis.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAnalysis.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAnalysis.fs">
      <Link>Service/ServiceAnalysis.fs</Link>
    </Compile>
    <Compile Include="$(FSharpSourcesRoot)\fsharp\fsi\fsi.fsi">

--- a/fcs/docsrc/content/ja/untypedtree.fsx
+++ b/fcs/docsrc/content/ja/untypedtree.fsx
@@ -88,7 +88,7 @@ let getUntypedTree (file, input) =
 `FSharpChecker` の詳細については
 [ APIドキュメント](../reference/microsoft-fsharp-compiler-sourcecodeservices-FSharpChecker.html)
 の他に、F# ソースコードのインラインコメントも参考になるでしょう
-( [`service.fsi` のソースコードを参照](https://github.com/fsharp/fsharp/blob/fsharp_31/src/fsharp/vs/service.fsi) )。
+( [`service.fsi` のソースコードを参照](https://github.com/fsharp/fsharp/blob/fsharp_31/src/fsharp/service/service.fsi) )。

 ASTの走査
 ---------

--- a/fcs/docsrc/content/queue.fsx
+++ b/fcs/docsrc/content/queue.fsx
@@ -19,7 +19,7 @@ To disable implicit background checking completely, set ``checker.ImplicitlyStar
 To change the time before background work starts, set ``checker.PauseBeforeBackgroundWork`` to the required number of milliseconds.

 Most calls to the FSharpChecker API enqueue an operation in the FSharpChecker compiler queue. These correspond to the 
-calls to EnqueueAndAwaitOpAsync in [service.fs](https://github.com/fsharp/FSharp.Compiler.Service/blob/master/src/fsharp/vs/service.fs).
+calls to EnqueueAndAwaitOpAsync in [service.fs](https://github.com/fsharp/FSharp.Compiler.Service/blob/master/src/fsharp/service/service.fs).

 * For example, calling `ParseAndCheckProject` enqueues a `ParseAndCheckProjectImpl` operation. The time taken for the 
  operation will depend on how much work is required to bring the project analysis up-to-date.

--- a/mono/test-mono.sh
+++ b/mono/test-mono.sh
 # Run some project building tests
 # Run some a variation of the tests/fsharp suite
-# Run the FSharp.Core.Unittests suite
+# Run the FSharp.Core.UnitTests suite

 (cd tests/projects; ./build.sh) &&
 (cd tests/fsharp/core; ./run-opt.sh) 
 # This currently takes too long in travis
-#&& mono packages/NUnit.Console.3.0.0/tools/nunit3-console.exe --agents=1 Release/net40/bin/FSharp.Core.Unittests.dll
+#&& mono packages/NUnit.Console.3.0.0/tools/nunit3-console.exe --agents=1 Release/net40/bin/FSharp.Core.UnitTests.dll

--- a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs
+++ b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs
@@ -31,9 +31,9 @@ open System.Runtime.InteropServices

 // Note: internals visible to unit test DLLs in Retail (and all) builds.
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Test")>]
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Unittests")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.UnitTests")>]
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Salsa")>]
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.UnitTests")>]
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc-proto")>]
 #endif

@@ -48,9 +48,9 @@ open System.Runtime.InteropServices
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Interactive.Settings, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Server.Shared, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Salsa, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]

 // Until dotnet sdk can version assemblies, use this
 #if BUILD_FROM_SOURCE

--- a/src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -496,64 +496,64 @@
    </Compile>

    <!-- the incremental builder and service . -->
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\IncrementalBuild.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\IncrementalBuild.fsi">
      <Link>Service/IncrementalBuild.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\IncrementalBuild.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\IncrementalBuild.fs">
      <Link>Service/IncrementalBuild.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\Reactor.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\Reactor.fsi">
      <Link>Service/Reactor.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\Reactor.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\Reactor.fs">
      <Link>Service/Reactor.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceConstants.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceConstants.fs">
      <Link>Service/ServiceConstants.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceDeclarationLists.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceDeclarationLists.fsi">
      <Link>Service/ServiceDeclarationLists.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceDeclarationLists.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceDeclarationLists.fs">
      <Link>Service/ServiceDeclarationLists.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceLexing.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceLexing.fsi">
      <Link>Service/ServiceLexing.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceLexing.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceLexing.fs">
      <Link>Service/ServiceLexing.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceParseTreeWalk.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceParseTreeWalk.fs">
      <Link>Service/ServiceParseTreeWalk.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceNavigation.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceNavigation.fsi">
      <Link>Service/ServiceNavigation.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceNavigation.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceNavigation.fs">
      <Link>Service/ServiceNavigation.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceParamInfoLocations.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceParamInfoLocations.fsi">
      <Link>Service/ServiceParamInfoLocations.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceParamInfoLocations.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceParamInfoLocations.fs">
      <Link>Service/ServiceParamInfoLocations.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceUntypedParse.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceUntypedParse.fsi">
      <Link>Service/ServiceUntypedParse.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceUntypedParse.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceUntypedParse.fs">
      <Link>Service/ServiceUntypedParse.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAssemblyContent.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAssemblyContent.fsi">
      <Link>Service/ServiceAssemblyContent.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAssemblyContent.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAssemblyContent.fs">
      <Link>Service/ServiceAssemblyContent.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceXmlDocParser.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceXmlDocParser.fsi">
      <Link>Service/ServiceXmlDocParser.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceXmlDocParser.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceXmlDocParser.fs">
      <Link>Service/ServiceXmlDocParser.fs</Link>
    </Compile>
    <Compile Include="..\..\utils\reshapedmsbuild.fs">
@@ -562,40 +562,40 @@
    <Compile Include="$(FSharpSourcesRoot)\fsharp\SimulatedMSBuildReferenceResolver.fs">
      <Link>Service/SimulatedMSBuildReferenceResolver.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ExternalSymbol.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ExternalSymbol.fsi">
      <Link>Service/ExternalSymbol.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ExternalSymbol.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ExternalSymbol.fs">
      <Link>Service/ExternalSymbol.fs</Link>
    </Compile>
-	<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\QuickParse.fsi">
+	<Compile Include="$(FSharpSourcesRoot)\fsharp\service\QuickParse.fsi">
      <Link>Service/QuickParse.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\QuickParse.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\QuickParse.fs">
      <Link>Service/QuickParse.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\service.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\service.fsi">
      <Link>Service/service.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\service.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\service.fs">
      <Link>Service/service.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceInterfaceStubGenerator.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceInterfaceStubGenerator.fsi">
      <Link>Service/ServiceInterfaceStubGenerator.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceInterfaceStubGenerator.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceInterfaceStubGenerator.fs">
      <Link>Service/ServiceInterfaceStubGenerator.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceStructure.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceStructure.fsi">
      <Link>Service/ServiceStructure.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceStructure.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceStructure.fs">
      <Link>Service/ServiceStructure.fs</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAnalysis.fsi">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAnalysis.fsi">
      <Link>Service/ServiceAnalysis.fsi</Link>
    </Compile>
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ServiceAnalysis.fs">
+    <Compile Include="$(FSharpSourcesRoot)\fsharp\service\ServiceAnalysis.fs">
      <Link>Service/ServiceAnalysis.fs</Link>
    </Compile>


--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -21,7 +21,7 @@
      <HasLceComments>false</HasLceComments>
      <InProject>false</InProject>
    </FilesToLocalize>
-    <InternalsVisibleTo Include="VisualFSharp.Unittests" />
+    <InternalsVisibleTo Include="VisualFSharp.UnitTests" />
    <EmbeddedText Include="FSBuild.txt" />
    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs" />
    <Compile Include="..\..\utils\CompilerLocationUtils.fs" />

--- a/src/fsharp/FSharp.Build/InternalsVisibleTo.fs
+++ b/src/fsharp/FSharp.Build/InternalsVisibleTo.fs
@@ -2,5 +2,5 @@

 namespace Microsoft.FSharp

-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
 do()
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -50,8 +50,8 @@
    <InternalsVisibleTo Include="FSharp.Compiler.Interactive.Settings" />
    <InternalsVisibleTo Include="FSharp.Compiler.Server.Shared" />
    <InternalsVisibleTo Include="VisualFSharp.Salsa" />
-    <InternalsVisibleTo Include="VisualFSharp.Unittests" />
-    <InternalsVisibleTo Include="FSharp.Compiler.Unittests" />
+    <InternalsVisibleTo Include="VisualFSharp.UnitTests" />
+    <InternalsVisibleTo Include="FSharp.Compiler.UnitTests" />
    <InternalsVisibleTo Include="FSharp.Editor" />
    <InternalsVisibleTo Include="HostedCompilerServer" />
    <InternalsVisibleTo Include="FSharp.Tests.FSharpSuite" />
@@ -537,64 +537,64 @@
    </Compile>

    <!-- the incremental builder and service . -->
-    <Compile Include="..\vs\IncrementalBuild.fsi">
+    <Compile Include="..\service\IncrementalBuild.fsi">
      <Link>Service/IncrementalBuild.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\IncrementalBuild.fs">
+    <Compile Include="..\service\IncrementalBuild.fs">
      <Link>Service/IncrementalBuild.fs</Link>
    </Compile>
-    <Compile Include="..\vs\Reactor.fsi">
+    <Compile Include="..\service\Reactor.fsi">
      <Link>Service/Reactor.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\Reactor.fs">
+    <Compile Include="..\service\Reactor.fs">
      <Link>Service/Reactor.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceConstants.fs">
+    <Compile Include="..\service\ServiceConstants.fs">
      <Link>Service/ServiceConstants.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceDeclarationLists.fsi">
+    <Compile Include="..\service\ServiceDeclarationLists.fsi">
      <Link>Service/ServiceDeclarationLists.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceDeclarationLists.fs">
+    <Compile Include="..\service\ServiceDeclarationLists.fs">
      <Link>Service/ServiceDeclarationLists.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceLexing.fsi">
+    <Compile Include="..\service\ServiceLexing.fsi">
      <Link>Service/ServiceLexing.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceLexing.fs">
+    <Compile Include="..\service\ServiceLexing.fs">
      <Link>Service/ServiceLexing.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceParseTreeWalk.fs">
+    <Compile Include="..\service\ServiceParseTreeWalk.fs">
      <Link>Service/ServiceParseTreeWalk.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceNavigation.fsi">
+    <Compile Include="..\service\ServiceNavigation.fsi">
      <Link>Service/ServiceNavigation.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceNavigation.fs">
+    <Compile Include="..\service\ServiceNavigation.fs">
      <Link>Service/ServiceNavigation.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceParamInfoLocations.fsi">
+    <Compile Include="..\service\ServiceParamInfoLocations.fsi">
      <Link>Service/ServiceParamInfoLocations.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceParamInfoLocations.fs">
+    <Compile Include="..\service\ServiceParamInfoLocations.fs">
      <Link>Service/ServiceParamInfoLocations.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceUntypedParse.fsi">
+    <Compile Include="..\service\ServiceUntypedParse.fsi">
      <Link>Service/ServiceUntypedParse.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceUntypedParse.fs">
+    <Compile Include="..\service\ServiceUntypedParse.fs">
      <Link>Service/ServiceUntypedParse.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceAssemblyContent.fsi">
+    <Compile Include="..\service\ServiceAssemblyContent.fsi">
      <Link>Service/ServiceAssemblyContent.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceAssemblyContent.fs">
+    <Compile Include="..\service\ServiceAssemblyContent.fs">
      <Link>Service/ServiceAssemblyContent.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceXmlDocParser.fsi">
+    <Compile Include="..\service\ServiceXmlDocParser.fsi">
      <Link>Service/ServiceXmlDocParser.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceXmlDocParser.fs">
+    <Compile Include="..\service\ServiceXmlDocParser.fs">
      <Link>Service/ServiceXmlDocParser.fs</Link>
    </Compile>
    <Compile Include="..\..\utils\reshapedmsbuild.fs">
@@ -603,40 +603,40 @@
    <Compile Include="..\SimulatedMSBuildReferenceResolver.fs">
      <Link>Service/SimulatedMSBuildReferenceResolver.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ExternalSymbol.fsi">
+    <Compile Include="..\service\ExternalSymbol.fsi">
      <Link>Service/ExternalSymbol.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ExternalSymbol.fs">
+    <Compile Include="..\service\ExternalSymbol.fs">
      <Link>Service/ExternalSymbol.fs</Link>
    </Compile>
-    <Compile Include="..\vs\QuickParse.fsi">
+    <Compile Include="..\service\QuickParse.fsi">
      <Link>Service/QuickParse.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\QuickParse.fs">
+    <Compile Include="..\service\QuickParse.fs">
      <Link>Service/QuickParse.fs</Link>
    </Compile>
-    <Compile Include="..\vs\service.fsi">
+    <Compile Include="..\service\service.fsi">
      <Link>Service/service.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\service.fs">
+    <Compile Include="..\service\service.fs">
      <Link>Service/service.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceInterfaceStubGenerator.fsi">
+    <Compile Include="..\service\ServiceInterfaceStubGenerator.fsi">
      <Link>Service/ServiceInterfaceStubGenerator.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceInterfaceStubGenerator.fs">
+    <Compile Include="..\service\ServiceInterfaceStubGenerator.fs">
      <Link>Service/ServiceInterfaceStubGenerator.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceStructure.fsi">
+    <Compile Include="..\service\ServiceStructure.fsi">
      <Link>Service/ServiceStructure.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceStructure.fs">
+    <Compile Include="..\service\ServiceStructure.fs">
      <Link>Service/ServiceStructure.fs</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceAnalysis.fsi">
+    <Compile Include="..\service\ServiceAnalysis.fsi">
      <Link>Service/ServiceAnalysis.fsi</Link>
    </Compile>
-    <Compile Include="..\vs\ServiceAnalysis.fs">
+    <Compile Include="..\service\ServiceAnalysis.fs">
      <Link>Service/ServiceAnalysis.fs</Link>
    </Compile>
    

--- a/src/fsharp/Fsc/Fsc.fsproj
+++ b/src/fsharp/Fsc/Fsc.fsproj
@@ -24,7 +24,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <InternalsVisibleTo Include="VisualFSharp.Unittests" />
+    <InternalsVisibleTo Include="VisualFSharp.UnitTests" />
  </ItemGroup>

  <ItemGroup>

--- a/src/fsharp/Fsc/InternalsVisibleTo.fs
+++ b/src/fsharp/Fsc/InternalsVisibleTo.fs
@@ -2,7 +2,7 @@

 namespace Microsoft.FSharp
 open System.Reflection
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]

 do()

--- a/src/fsharp/fsi/fsi.fs
+++ b/src/fsharp/fsi/fsi.fs
@@ -866,7 +866,7 @@ type internal FsiConsolePrompt(fsiOptions: FsiCommandLineOptions, fsiConsoleOutp
    // A prompt can be skipped by "silent directives", e.g. ones sent to FSI by VS.
    let mutable dropPrompt = 0
    // NOTE: SERVER-PROMPT is not user displayed, rather it's a prefix that code elsewhere 
-    // uses to identify the prompt, see vs\FsPkgs\FSharp.VS.FSI\fsiSessionToolWindow.fs
+    // uses to identify the prompt, see service\FsPkgs\FSharp.VS.FSI\fsiSessionToolWindow.fs
    let prompt = if fsiOptions.IsInteractiveServer then "SERVER-PROMPT>\n" else "> "  

    member __.Print()      = if dropPrompt = 0 then fsiConsoleOutput.uprintf "%s" prompt else dropPrompt <- dropPrompt - 1

--- a/src/fsharp/vs/ExternalSymbol.fs
+++ b/src/fsharp/vs/ExternalSymbol.fs
--- a/src/fsharp/vs/ExternalSymbol.fsi
+++ b/src/fsharp/vs/ExternalSymbol.fsi
--- a/src/fsharp/vs/IncrementalBuild.fs
+++ b/src/fsharp/vs/IncrementalBuild.fs
--- a/src/fsharp/vs/IncrementalBuild.fsi
+++ b/src/fsharp/vs/IncrementalBuild.fsi
--- a/src/fsharp/vs/QuickParse.fs
+++ b/src/fsharp/vs/QuickParse.fs
--- a/src/fsharp/vs/QuickParse.fsi
+++ b/src/fsharp/vs/QuickParse.fsi
--- a/src/fsharp/vs/Reactor.fs
+++ b/src/fsharp/vs/Reactor.fs
--- a/src/fsharp/vs/Reactor.fsi
+++ b/src/fsharp/vs/Reactor.fsi
--- a/src/fsharp/vs/ServiceAnalysis.fs
+++ b/src/fsharp/vs/ServiceAnalysis.fs
--- a/src/fsharp/vs/ServiceAnalysis.fsi
+++ b/src/fsharp/vs/ServiceAnalysis.fsi
--- a/src/fsharp/vs/ServiceAssemblyContent.fs
+++ b/src/fsharp/vs/ServiceAssemblyContent.fs
--- a/src/fsharp/vs/ServiceAssemblyContent.fsi
+++ b/src/fsharp/vs/ServiceAssemblyContent.fsi
--- a/src/fsharp/vs/ServiceConstants.fs
+++ b/src/fsharp/vs/ServiceConstants.fs
--- a/src/fsharp/vs/ServiceDeclarationLists.fs
+++ b/src/fsharp/vs/ServiceDeclarationLists.fs
--- a/src/fsharp/vs/ServiceDeclarationLists.fsi
+++ b/src/fsharp/vs/ServiceDeclarationLists.fsi
--- a/src/fsharp/vs/ServiceInterfaceStubGenerator.fs
+++ b/src/fsharp/vs/ServiceInterfaceStubGenerator.fs
--- a/src/fsharp/vs/ServiceInterfaceStubGenerator.fsi
+++ b/src/fsharp/vs/ServiceInterfaceStubGenerator.fsi
--- a/src/fsharp/vs/ServiceLexing.fs
+++ b/src/fsharp/vs/ServiceLexing.fs
--- a/src/fsharp/vs/ServiceLexing.fsi
+++ b/src/fsharp/vs/ServiceLexing.fsi
--- a/src/fsharp/vs/ServiceNavigation.fs
+++ b/src/fsharp/vs/ServiceNavigation.fs
--- a/src/fsharp/vs/ServiceNavigation.fsi
+++ b/src/fsharp/vs/ServiceNavigation.fsi
--- a/src/fsharp/vs/ServiceParamInfoLocations.fs
+++ b/src/fsharp/vs/ServiceParamInfoLocations.fs
--- a/src/fsharp/vs/ServiceParamInfoLocations.fsi
+++ b/src/fsharp/vs/ServiceParamInfoLocations.fsi
--- a/src/fsharp/vs/ServiceParseTreeWalk.fs
+++ b/src/fsharp/vs/ServiceParseTreeWalk.fs
--- a/src/fsharp/vs/ServiceStructure.fs
+++ b/src/fsharp/vs/ServiceStructure.fs
--- a/src/fsharp/vs/ServiceStructure.fsi
+++ b/src/fsharp/vs/ServiceStructure.fsi
--- a/src/fsharp/vs/ServiceUntypedParse.fs
+++ b/src/fsharp/vs/ServiceUntypedParse.fs
--- a/src/fsharp/vs/ServiceUntypedParse.fsi
+++ b/src/fsharp/vs/ServiceUntypedParse.fsi
--- a/src/fsharp/vs/ServiceXmlDocParser.fs
+++ b/src/fsharp/vs/ServiceXmlDocParser.fs
--- a/src/fsharp/vs/ServiceXmlDocParser.fsi
+++ b/src/fsharp/vs/ServiceXmlDocParser.fsi
--- a/src/fsharp/vs/service.fs
+++ b/src/fsharp/vs/service.fs
--- a/src/fsharp/vs/service.fsi
+++ b/src/fsharp/vs/service.fsi
--- a/src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
+++ b/src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
@@ -2,7 +2,7 @@
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
+    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\src</FSharpSourcesRoot>
    <ProjectGuid>{400FAB03-786E-40CC-85A8-04B0C2869B14}</ProjectGuid>
    <DOTNET_PUBLISH_TEST>true</DOTNET_PUBLISH_TEST>
    <DOTNET_PUBLISH_COMPILERS>false</DOTNET_PUBLISH_COMPILERS>

--- a/src/fsharp/FSharp.Build.UnitTests/Program.fs
+++ b/src/fsharp/FSharp.Build.UnitTests/Program.fs
--- a/src/fsharp/FSharp.Build.UnitTests/WriteCodeFragmentTests.fs
+++ b/src/fsharp/FSharp.Build.UnitTests/WriteCodeFragmentTests.fs
--- a/src/fsharp/FSharp.Build.UnitTests/project.json
+++ b/src/fsharp/FSharp.Build.UnitTests/project.json
--- a/src/fsharp/FSharp.Compiler.Unittests/CompilerTestHelpers.fs
+++ b/src/fsharp/FSharp.Compiler.Unittests/CompilerTestHelpers.fs
-namespace FSharp.Compiler.Unittests
+namespace FSharp.Compiler.UnitTests

 [<AutoOpen>]
 module CompilerTestHelpers =

--- a/src/fsharp/FSharp.Compiler.Unittests/EditDistance.fs
+++ b/src/fsharp/FSharp.Compiler.Unittests/EditDistance.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-namespace FSharp.Compiler.Unittests
+namespace FSharp.Compiler.UnitTests

 open System
 open System.Globalization

--- a/src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj
+++ b/src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj
@@ -2,7 +2,7 @@
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
+    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\src</FSharpSourcesRoot>
    <ProjectGuid>{a8d9641a-9170-4cf4-8fe0-6db8c134e1b5}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
@@ -12,7 +12,7 @@
    <AllowCrossTargeting>true</AllowCrossTargeting>
    <ReferenceVsAssemblies>true</ReferenceVsAssemblies>
    <OutputType>Library</OutputType>
-    <AssemblyName>FSharp.Compiler.Unittests</AssemblyName>
+    <AssemblyName>FSharp.Compiler.UnitTests</AssemblyName>
    <!-- Prevent compiler from inlining calls to FSharp.Core to improve code coverage accuracy -->
    <Optimize>false</Optimize>
    <Tailcalls>false</Tailcalls>

--- a/src/fsharp/FSharp.Compiler.Unittests/HashIfExpression.fs
+++ b/src/fsharp/FSharp.Compiler.Unittests/HashIfExpression.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.

-namespace FSharp.Compiler.Unittests
+namespace FSharp.Compiler.UnitTests

 open System
 open System.Text

--- a/src/fsharp/FSharp.Compiler.Unittests/ManglingNameOfProvidedTypes.fs
+++ b/src/fsharp/FSharp.Compiler.Unittests/ManglingNameOfProvidedTypes.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-namespace FSharp.Compiler.Unittests
+namespace FSharp.Compiler.UnitTests

 open System
 open System.Text

--- a/src/fsharp/FSharp.Compiler.Unittests/NunitHelpers.fs
+++ b/src/fsharp/FSharp.Compiler.Unittests/NunitHelpers.fs
--- a/src/fsharp/FSharp.Compiler.Unittests/ProductVersion.fs
+++ b/src/fsharp/FSharp.Compiler.Unittests/ProductVersion.fs
-namespace FSharp.Compiler.Unittests
+namespace FSharp.Compiler.UnitTests

 open System
 open System.Text

--- a/src/fsharp/FSharp.Core.Unittests/App.xaml
+++ b/src/fsharp/FSharp.Core.Unittests/App.xaml
--- a/src/fsharp/FSharp.Core.Unittests/App.xaml.cs
+++ b/src/fsharp/FSharp.Core.Unittests/App.xaml.cs
@@ -33,7 +33,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
            NUnit.Framework.Assert.IsTrue(true); // force NUnitFarmework.dll to load
            UnitTestSystem.RegisterUnitTestProvider(new NUnitProvider());
            UnitTestSettings settings = UnitTestSystem.CreateDefaultSettings();
-            settings.TestAssemblies.Add(typeof(global::FSharp.Core.Unittests.LibraryTestFx).Assembly);
+            settings.TestAssemblies.Add(typeof(global::FSharp.Core.UnitTests.LibraryTestFx).Assembly);
            RootVisual = UnitTestSystem.CreateTestPage(settings);

        }

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.UnitTests.TestApp.csproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.UnitTests.TestApp.csproj
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
+    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\src</FSharpSourcesRoot>
  </PropertyGroup>
  <PropertyGroup>
    <NUnit>$(FSharpSourcesRoot)\..\tools\nUnit.Silverlight</NUnit>
@@ -59,9 +59,9 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>$(OutputPath)\..\bin\FSharp.Core.dll</HintPath>
    </Reference>
-    <Reference Include="FSharp.Core.Unittests, Version=1.9.6.16, Culture=neutral, PublicKeyToken=99cf57b64b44bf93, processorArchitecture=MSIL">
+    <Reference Include="FSharp.Core.UnitTests, Version=1.9.6.16, Culture=neutral, PublicKeyToken=99cf57b64b44bf93, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(OutputPath)\..\bin\FSharp.Core.Unittests.dll</HintPath>
+      <HintPath>$(OutputPath)\..\bin\FSharp.Core.UnitTests.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Silverlight.Testing, Version=2.0.21103.1925, Culture=neutral, PublicKeyToken=2c5c654d367bf4a7, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.dll.config
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.dll.config
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -2,7 +2,7 @@
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
+    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\src</FSharpSourcesRoot>
    <ProjectGuid>{88e2d422-6852-46e3-a740-83e391dc7973}</ProjectGuid>
    <DOTNET_PUBLISH_TEST>true</DOTNET_PUBLISH_TEST>
    <DOTNET_PUBLISH_COMPILERS>false</DOTNET_PUBLISH_COMPILERS>
@@ -16,7 +16,7 @@
    <ReferenceVsAssemblies>true</ReferenceVsAssemblies>
    <OutputType>Library</OutputType>
    <StrongNames>false</StrongNames>
-    <AssemblyName>FSharp.Core.Unittests</AssemblyName>
+    <AssemblyName>FSharp.Core.UnitTests</AssemblyName>
    <!-- Prevent compiler from inlining calls to FSharp.Core to improve code coverage accuracy -->
    <Optimize>false</Optimize>
    <Tailcalls>false</Tailcalls>
@@ -118,8 +118,8 @@
    <Compile Include="StructTuples.fs" />
    <Compile Include="SurfaceArea.$(TargetDotnetProfile).fs" />
    <Compile Include="Program.fs" Condition="'$(TargetDotnetProfile)' == 'coreclr'" />
-    <CopyAndSubstituteText Include="FSharp.Core.Unittests.dll.config">
-      <TargetFilename>FSharp.Core.Unittests.dll.config</TargetFilename>
+    <CopyAndSubstituteText Include="FSharp.Core.UnitTests.dll.config">
+      <TargetFilename>FSharp.Core.UnitTests.dll.config</TargetFilename>
      <Pattern1>FSCoreVersion</Pattern1>
      <Replacement1>$(FSCoreVersion)</Replacement1>
    </CopyAndSubstituteText>

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/ComparersRegression.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/ComparersRegression.fs
 // A set of regression tests for equality/relational operators and the IComparer<> and IEqualityComparer<>
 // implementation provided by ComparisonIdentity.Structural and HashIdentity.Structural

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Core
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Core

 open System
 open System.Numerics 
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 module ComparersRegression =
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/CreateComparersRegression.fsx
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/CreateComparersRegression.fsx
 // run as "fsi --exec CreateComparersRegression.fsx > tmp.txt"
 // and then copy text in tmp.txt into the bottom of ComparersRegression.fs

-#r @"..\..\..\..\Release\net40\bin\FSharp.Core.Unittests.dll"
+#r @"..\..\..\..\Release\net40\bin\FSharp.Core.UnitTests.dll"

-FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Core.ComparersRegression.createData ()
\ No newline at end of file
+FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Core.ComparersRegression.createData ()
\ No newline at end of file
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/DiscrimantedUnionType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/DiscrimantedUnionType.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-module FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Core.DiscriminatedUnionTypes
+module FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Core.DiscriminatedUnionTypes

 open System
 open System.Numerics
 open System.Reflection
 open System.Runtime.InteropServices
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework
 open FsCheck
 open FsCheck.PropOperators

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/Array2Module.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/Array2Module.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.Array2D module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/Array3Module.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/Array3Module.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.Array3D module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/Array4Module.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/Array4Module.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.Array4D module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.Array module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule2.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule2.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.Array module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ArrayProperties.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ArrayProperties.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 [<NUnit.Framework.Category "Collections.Array">][<NUnit.Framework.Category "FSharp.Core.Collections">]
-module FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections.ArrayProperties
+module FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections.ArrayProperties

 open System
 open System.Collections.Generic

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/CollectionModulesConsistency.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/CollectionModulesConsistency.fs
@@ -3,7 +3,7 @@
 [<NUnit.Framework.Category "Collections.Seq">]
 [<NUnit.Framework.Category "Collections.List">]
 [<NUnit.Framework.Category "Collections.Array">]
-module FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections.CollectionModulesConsistency
+module FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections.CollectionModulesConsistency

 open System
 open System.Collections.Generic

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ComparisonIdentityModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ComparisonIdentityModule.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.ComparisonIdentity module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/HashIdentityModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/HashIdentityModule.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.HashIdentity module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 open System.Collections.Generic

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ListModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ListModule.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.List module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ListModule2.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ListModule2.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.List module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ListProperties.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ListProperties.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 [<NUnit.Framework.Category "Collections.List">][<NUnit.Framework.Category "FSharp.Core.Collections">]
-module FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections.ListProperties
+module FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections.ListProperties

 open System
 open System.Collections.Generic

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ListType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ListType.fs
@@ -3,12 +3,12 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.List type

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
 open System.Collections
 open System.Collections.Generic
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/MapModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/MapModule.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.Map module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/MapType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/MapType.fs
@@ -3,12 +3,12 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.Map type

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
 open System.Collections
 open System.Collections.Generic
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ObsoleteListFunctions.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ObsoleteListFunctions.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.

 #nowarn "44" // This construct is deprecated. please use List.item
-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 [<TestFixture>][<Category "Collections.List">][<Category "FSharp.Core.Collections">]

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ObsoleteSeqFunctions.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ObsoleteSeqFunctions.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.

 #nowarn "44" // This construct is deprecated. please use Seq.item
-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
 open NUnit.Framework

-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx

 [<TestFixture>][<Category "Collections.Seq">][<Category "FSharp.Core.Collections">]
 type ObsoleteSeqFunctions() =

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
 open NUnit.Framework

-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx

 // Various tests for the:
 // Microsoft.FSharp.Collections.seq type

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule2.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule2.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
 open NUnit.Framework

-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx

 type SeqWindowedTestInput<'t> =
    {

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SeqProperties.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SeqProperties.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
 [<NUnit.Framework.Category "Collections.Seq">][<NUnit.Framework.Category "FSharp.Core.Collections">]
-module FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections.SeqProperties
+module FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections.SeqProperties

 open System
 open System.Collections.Generic

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SetModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SetModule.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.Set module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SetType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/SetType.fs
@@ -3,12 +3,12 @@
 // Various tests for the:
 // Microsoft.FSharp.Collections.Set type

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
 open System.Collections
 open System.Collections.Generic
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework

 (*

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/StringModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/StringModule.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections

 open System
 open NUnit.Framework

-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx

 // Various tests for the:
 // Microsoft.FSharp.Collections.seq type

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/Utils.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/Utils.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.

-module FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Collections.Utils
+module FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Collections.Utils

 type Result<'a> = 
 | Success of 'a

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/App.config
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/App.config
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs
@@ -3,11 +3,11 @@
 // Various tests for the:
 // Microsoft.FSharp.Control.Async module

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Control
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Control

 open System
 open System.Threading
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework
 #if !(FSCORE_PORTABLE_OLD || FSCORE_PORTABLE_NEW)
 open FsCheck

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs
@@ -3,10 +3,10 @@
 // Various tests for the:
 // Microsoft.FSharp.Control.Async type

-namespace FSharp.Core.Unittests.FSharp_Core.Microsoft_FSharp_Control
+namespace FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Control

 open System
-open FSharp.Core.Unittests.LibraryTestFx
+open FSharp.Core.UnitTests.LibraryTestFx
 open NUnit.Framework
 open System.Threading


--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/Cancellation.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/Cancellation.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/ContinuationsThreadingDetailsStandaloneExe.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/ContinuationsThreadingDetailsStandaloneExe.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/EventModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/EventModule.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/LazyType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/LazyType.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/MailboxProcessorType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/MailboxProcessorType.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/ObservableModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/ObservableModule.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/IntConversions.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/IntConversions.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/IntConversionsGenerated.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/IntConversionsGenerated.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/IntConversionsTestGenerator.fsx
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/IntConversionsTestGenerator.fsx
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/PrintfTests.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/PrintfTests.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/ResultTests.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/ResultTests.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Quotations/FSharpQuotations.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Quotations/FSharpQuotations.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Reflection/FSharpReflection.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Reflection/FSharpReflection.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/OperatorsModule1.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/OperatorsModule1.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/OperatorsModule2.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/OperatorsModule2.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/PrimTypes.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/PrimTypes.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/RecordTypes.fs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/RecordTypes.fs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/Microsoft.FSharp.TupleSample.nuspec
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/Microsoft.FSharp.TupleSample.nuspec
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/Properties/AssemblyInfo.cs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/Properties/AssemblyInfo.cs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.cs
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.cs
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.csproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.csproj
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.sln
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/TupleSample.sln
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/readme
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/readme
--- a/src/fsharp/FSharp.Core.Unittests/LibraryTestFx.fs
+++ b/src/fsharp/FSharp.Core.Unittests/LibraryTestFx.fs
--- a/src/fsharp/FSharp.Core.Unittests/NUnitFrameworkShims.fs
+++ b/src/fsharp/FSharp.Core.Unittests/NUnitFrameworkShims.fs
--- a/src/fsharp/FSharp.Core.Unittests/Program.fs
+++ b/src/fsharp/FSharp.Core.Unittests/Program.fs
--- a/src/fsharp/FSharp.Core.Unittests/Properties/AppManifest.xml
+++ b/src/fsharp/FSharp.Core.Unittests/Properties/AppManifest.xml
--- a/src/fsharp/FSharp.Core.Unittests/Properties/AssemblyInfo.cs
+++ b/src/fsharp/FSharp.Core.Unittests/Properties/AssemblyInfo.cs
--- a/src/fsharp/FSharp.Core.Unittests/StructTuples.fs
+++ b/src/fsharp/FSharp.Core.Unittests/StructTuples.fs
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.coreclr.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.coreclr.fs
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.net40.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.net40.fs
--- a/src/fsharp/FSharp.Core.Unittests/TypeForwarding.fs
+++ b/src/fsharp/FSharp.Core.Unittests/TypeForwarding.fs
--- a/src/fsharp/FSharp.Core.Unittests/project.json
+++ b/src/fsharp/FSharp.Core.Unittests/project.json
--- a/tests/fsharp/FSharp.Tests.FSharpSuite.DrivingCoreCLR/FSharp.Tests.FSharpSuite.DrivingCoreCLR.fsproj
+++ b/tests/fsharp/FSharp.Tests.FSharpSuite.DrivingCoreCLR/FSharp.Tests.FSharpSuite.DrivingCoreCLR.fsproj
--- a/tests/fsharp/FSharp.Tests.FSharpSuite.fsproj
+++ b/tests/fsharp/FSharp.Tests.FSharpSuite.fsproj
--- a/tests/fsharpqa/Source/KnownFail.txt
+++ b/tests/fsharpqa/Source/KnownFail.txt
--- a/tests/fsharpqa/Source/Misc/LongSourceFile01.fs
+++ b/tests/fsharpqa/Source/Misc/LongSourceFile01.fs
--- a/tests/scripts/fscc.fsx
+++ b/tests/scripts/fscc.fsx
--- a/tests/scripts/fsci.fsx
+++ b/tests/scripts/fsci.fsx
--- a/tests/service/EditorTests.fs
+++ b/tests/service/EditorTests.fs
--- a/vsintegration/Utils/LanguageServiceProfiling/Options.fs
+++ b/vsintegration/Utils/LanguageServiceProfiling/Options.fs
--- a/vsintegration/fsharp-vsintegration-unittests-build.proj
+++ b/vsintegration/fsharp-vsintegration-unittests-build.proj
--- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
+++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
--- a/vsintegration/src/FSharp.LanguageService.Base/InternalsVisibleTo.cs
+++ b/vsintegration/src/FSharp.LanguageService.Base/InternalsVisibleTo.cs
--- a/vsintegration/src/FSharp.LanguageService.Base/Source.cs
+++ b/vsintegration/src/FSharp.LanguageService.Base/Source.cs
--- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
+++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/AssemblyInfo.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/AssemblyInfo.cs
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/InternalsVisibleTo.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/InternalsVisibleTo.cs
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
--- a/vsintegration/src/FSharp.UIResources/InternalsVisibleTo.cs
+++ b/vsintegration/src/FSharp.UIResources/InternalsVisibleTo.cs
--- a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj
+++ b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj
--- a/vsintegration/tests/unittests/CompletionProviderTests.fs
+++ b/vsintegration/tests/unittests/CompletionProviderTests.fs
--- a/vsintegration/tests/unittests/DocumentHighlightsServiceTests.fs
+++ b/vsintegration/tests/unittests/DocumentHighlightsServiceTests.fs
--- a/vsintegration/tests/unittests/GoToDefinitionServiceTests.fs
+++ b/vsintegration/tests/unittests/GoToDefinitionServiceTests.fs
--- a/vsintegration/tests/unittests/QuickInfoProviderTests.fs
+++ b/vsintegration/tests/unittests/QuickInfoProviderTests.fs
--- a/vsintegration/tests/unittests/SignatureHelpProviderTests.fs
+++ b/vsintegration/tests/unittests/SignatureHelpProviderTests.fs
--- a/vsintegration/tests/unittests/Tests.ProjectSystem.MultiTargeting.fs
+++ b/vsintegration/tests/unittests/Tests.ProjectSystem.MultiTargeting.fs
--- a/vsintegration/tests/unittests/VisualFSharp.Unittests.dll.config
+++ b/vsintegration/tests/unittests/VisualFSharp.Unittests.dll.config
--- a/vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj
+++ b/vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj
--- a/vsintegration/update-vsintegration.cmd
+++ b/vsintegration/update-vsintegration.cmd