Merge pull request #25 from dsyme/forki-i1637

Forki i1637

Author: dsyme

.gitignore

@@ -65,6 +65,8 @@ scripts/*.patch
 /tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.env
 /tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.lst
 /tests/**/FSharp.Core.dll
+/tests/fsharp/optimize/stats/FSharpOptimizationInfo.FSharp.Core
+/tests/fsharp/optimize/stats/FSharpSignatureInfo.FSharp.Core
 lib/debug
 lib/release
 lib/proto

.nuget/NuGet.Config

@@ -7,6 +7,8 @@
   <packageSources>  
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
+    <add key="artifacts" value="../artifacts" />
+    <add key="artifacts" value="../artifacts/4.2" />
     <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
     <add key="myget.org roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
@@ -15,7 +17,6 @@
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="myget.org roslyn tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
     <add key="myget.org roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
-    <add key="artifacts" value="../artifacts" />
   </packageSources>
 
 </configuration>

CHANGELOG.md

@@ -202,7 +202,7 @@ Includes commits up to `3385e58aabc91368c8e1f551650ba48705aaa285`
 * Allow breakpoints to be set inside of quotations
 * Support "Publish" action in project system for web, Azure
 * Bugfix [#126](https://visualfsharp.codeplex.com/workitem/126): F# package installer does not honor custom install paths for express SKUs
-* Bugfix [#75](https://visualfsharp.codeplex.com/workitem/75): Microsoft.FSharp.targets shim not deployed with F# SDK
+* Bugfix [#75](https://visualfsharp.codeplex.com/workitem/75): Microsoft.FSharp.Targets shim not deployed with F# SDK
 * Bugfix: Fix crash in smart indent provider
 * Bugfix [#55](https://visualfsharp.codeplex.com/workitem/55): Cannot add reference to F# PCL project
 * Bugfix: Typos in tutorial project script

DEVGUIDE.md

@@ -158,7 +158,7 @@ This gives a much tighter inner development loop than uninstalling/reinstalling
 
 #### [Optional] Clobber the F# SDK on the machine
 
-**Note:** The step below will try to clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsc.exe`` used by the standard innstall location or ``Microsoft.FSharp.targets``.  **Repairing Visual Studio 15 is currently the only way to revert this step.**
+**Note:** The step below will try to clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsc.exe`` used by the standard install location or ``Microsoft.FSharp.Targets``.  **Repairing Visual Studio 15 is currently the only way to revert this step.**
 
 For **Debug**:
 

DotnetCLIToolsVersion.txt

@@ -0,0 +1 @@
+2.0.0-preview2-006494

README.md

@@ -1,11 +1,18 @@
-# The Combined F# Language, Library, and Tools Repository
+# The F# Language, Library Repository (also Visual F# Tools Repository)
 
-You are invited to help producing future releases of the F# language compiler, library, and tools.
+You are invited to help producing future releases of the F# language compiler, library, and tools. This repository enables development on Linux, macOS and Windows, along with some automated CI testing for these.
 
+* [About F#](http://fsharp.org)
+* [Testimonials](http://fsharp.org/testimonials)
 * [Contributing](#contributing)
 * [Using](#using)
 
-F# is a mature, open source, cross-platform, functional-first programming language which empowers users and organizations to tackle complex computing problems with simple, maintainable, and robust code. F# is used in a wide range of application areas and is supported by industry-leading companies providing professional tools, and by an active open community. You can find out more about F# at http://fsharp.org.
+The F# Compiler and Tools are also mirrored in [the corresponding repository](http://github.com/fsharp/fsharp) of the F# Software Foundation.
+
+Changes contributed here are eventually propagated to this repository and are included in all packagings of F# and open source F# editing tools. The process for doing this is explained in this guide by the [F# Core Engineering Group](https://fsharp.github.io/2014/06/18/fsharp-contributions.html). Currently, the F# community coordinates packaging [other editions of F#](https://github.com/fsharp/fsharp/) for use on Linux, macOS, Android, iOS, and other platforms, and Microsoft coordinates packaging this repository as part of the Visual F# Tools. 
+
+For historical reasons this repository is called "visualfsharp" and currently also contains the Visual F# IDE Tools. The eventual plan is to split these repositories into "fsharp" and "visualfsharp".
+
 
 ## Build Status
 
@@ -38,12 +45,6 @@ To contribute to the F# ecosystem more generally see the F# Software Foundation'
 This project is subject to the Apache Licence, Version 2.0. A copy of the license can be found in [License.txt](License.txt) at the root of this repo.
 
 
-### Code Flow to Packagings of F#
-
-This repository enables development on Linux, macOS and Windows.  It enables automated CI testing for some of these.
-
-Changes contributed here are eventually included in all packagings of F# and open source F# editing tools. Microsoft coordinates packaging this repository as part of the Visual F# Tools, and the F# community coordinates packaging [other editions of F#](https://github.com/fsharp/fsharp/) for use on Linux, macOS, Android, iOS, and other platforms.
-
 ## Using
 
 For typical installs of  F#, see http://fsharp.org.