Merge branch 'master' of https://github.com/fsharp/FSharp.Compiler.Service into i60

Author: dsyme

README.md

@@ -17,17 +17,13 @@ For more information about the project, see:
 Build and Test
 -----
 
-.NET Framework:
+On Windows:
 
-    fcs\build.cmd Test.NetFx
+    .\fcs\build.cmd Test
 
-    fcs/build.sh Test.NetFx
+On Linux:
 
-.NET Core / .NET Standard
-
-    fcs\build.cmd Test.NetStd
-
-    fcs/build.sh Test.NetStd  
+    ./fcs/build.sh Test
 
 Packages:
 

docs/devnotes.html

@@ -76,7 +76,7 @@ <h2><a name="Building-and-NuGet" class="anchor" href="#Building-and-NuGet">Build
 <td class="snippet"><pre class="fssnip"><code lang="text">git clone https://github.com/fsharp/FSharp.Compiler.Service
 cd FSharp.Compiler.Service
 </code></pre></td></tr></table>
-<p>Now follow build everything by running <code>build.cmd</code> (Windows) or <code>build.sh</code> (Linux + Mac OS).
+<p>Now follow build everything by running <code>.\fcs\build.cmd</code> (Windows) or <code>./fcs/build.sh</code> (Linux + Mac OS).
 The output will be located in the <code>bin</code> directory. If you also wish to build the documentation
 and NuGet package, run <code>build Release</code> (this also attempts to publish the documentation to
 GitHub, which only works if you have access to the GitHub repository).</p>

fcs/build.sh

@@ -4,7 +4,9 @@ then
   # use .Net
   cmd fcs/build.cmd $@ 
 else
-  cd fcs
+  if [[ "$PWD" != *fcs ]]; then
+    cd fcs
+  fi
 
   # use mono
   if [[ ! -e ~/.config/.mono/certs ]]; then