diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/.noautobuild b/TestAssets/TestProjects/FSharpTestProjects/TestApp/.noautobuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/FSharpTestApp.xproj b/TestAssets/TestProjects/FSharpTestProjects/TestApp/FSharpTestApp.xproj
deleted file mode 100644
index 4b792e869..000000000
--- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/FSharpTestApp.xproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>a666217d-2aca-4866-b109-ea476e51c7aa</ProjectGuid>
-    <RootNamespace>FSharpTestApp</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/Program.fs b/TestAssets/TestProjects/FSharpTestProjects/TestApp/Program.fs
deleted file mode 100644
index 7375d5c55..000000000
--- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/Program.fs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace TestApp
-
-open System
-open System.Diagnostics
-
-module Program =
-
-    open TestLibrary
-
-    [<EntryPoint>]
-    let Main (args: string array) =
-        printfn "%s" (TestLibrary.Helper.GetMessage())
-        0
diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
deleted file mode 100644
index 46c065472..000000000
--- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "emitEntryPoint": true,
-    "compilerName": "fsc",
-    "compile": {
-      "includeFiles": [
-        "Program.fs"
-      ]
-    }
-  },
-  "dependencies": {
-    "TestLibrary": {
-      "version": "1.0.0-*",
-      "target": "project"
-    },
-    "Microsoft.NETCore.App": "1.1.0",
-    "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509"
-  },
-  "tools": {
-    "dotnet-compile-fsc": {
-      "version": "1.0.0-preview2-*",
-      "imports": [
-        "dnxcore50",
-        "portable-net45+win81",
-        "netstandard1.3"
-      ]
-    }
-  },
-  "frameworks": {
-    "netcoreapp1.1": {
-      "imports": "dnxcore50"
-    }
-  },
-  "runtimes": {
-    "win7-x64": {},
-    "win7-x86": {},
-    "osx.10.10-x64": {},
-    "osx.10.11-x64": {},
-    "ubuntu.14.04-x64": {},
-    "ubuntu.16.04-x64": {},
-    "centos.7-x64": {},
-    "rhel.7.2-x64": {},
-    "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {}
-  }
-}
diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/.noautobuild b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/.noautobuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/FSharpTestLibrary.xproj b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/FSharpTestLibrary.xproj
deleted file mode 100644
index ae10bbff6..000000000
--- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/FSharpTestLibrary.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>ec801982-096b-4af3-a42b-7881b1a7380e</ProjectGuid>
-    <RootNamespace>FSharpTestLibrary</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/Helper.fs b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/Helper.fs
deleted file mode 100644
index a29f6ac9a..000000000
--- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/Helper.fs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace TestLibrary
-
-open Lib
-
-type Helper() =
-
-    static member GetMessage () = Lib.message ()
-
-    static member SayHi () = Lib.sayHi ()
diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/Helper2.fs b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/Helper2.fs
deleted file mode 100644
index 6d374f769..000000000
--- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/Helper2.fs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-module Lib
-
-open System
-
-let message () =
-    "This string came from the test library!"
-
-let sayHi () =
-    Console.WriteLine("Hello there!")
diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json
deleted file mode 100644
index fff7c8bfb..000000000
--- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "dependencies": {
-    "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509",
-    "NETStandard.Library": "1.6.0"
-  },
-  "tools": {
-    "dotnet-compile-fsc": {
-      "version": "1.0.0-preview2-*",
-      "imports": [
-        "dnxcore50",
-        "portable-net45+win81",
-        "netstandard1.3"
-      ]
-    }
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": "dnxcore50"
-    }
-  },
-  "buildOptions": {
-    "compilerName": "fsc",
-    "compile": {
-      "includeFiles": [
-        "Helper2.fs",
-        "Helper.fs"
-      ]
-    }
-  }
-}
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 36ec3cc62..1049750ed 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,34 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.0.0-preview2-25319-02</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.3.0-preview-000234-01</CLI_MSBuild_Version>
-    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
-    <CLI_NETSDK_Version>2.0.0-preview2-20170506-1</CLI_NETSDK_Version>
-    <CLI_NuGet_Version>4.3.0-preview1-2500</CLI_NuGet_Version>
-    <CLI_WEBSDK_Version>1.0.0-rel-20170501-473</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.3.0-preview-20170502-03</CLI_TestPlatform_Version>
-    <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
-    <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
-    <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
-    <TemplateEngineVersion>1.0.0-beta2-20170503-217</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta2-20170505-222</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170505-222</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.0.0-preview2-25319-02</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.0.0-preview2-25319-02</DependencyModelVersion>
-    <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
-    <CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
-    <AspNetCoreRuntimeVersion>2.0.0-preview1-92</AspNetCoreRuntimeVersion>
-    <MicroBuildVersion>0.2.0</MicroBuildVersion>
-  
-    <!-- This should either be timestamped or notimestamp as appropriate -->
-    <AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
-
-  </PropertyGroup>
-
-  <!-- infrastructure and test only dependencies -->
-  <PropertyGroup>
-    <VersionToolsVersion>1.0.27-prerelease-01611-04</VersionToolsVersion>
-    <DotnetDebToolVersion>2.0.0-preview1-001877</DotnetDebToolVersion>
-  </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CLI_SharedFrameworkVersion>2.0.0-preview2-25319-02</CLI_SharedFrameworkVersion>
+    <CLI_MSBuild_Version>15.3.0-preview-000234-01</CLI_MSBuild_Version>
+    <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
+    <CLI_FSharp_Version>1.0.0-rc-170511-0</CLI_FSharp_Version>
+    <CLI_NETSDK_Version>2.0.0-preview2-20170506-1</CLI_NETSDK_Version>
+    <CLI_NuGet_Version>4.3.0-preview1-2500</CLI_NuGet_Version>
+    <CLI_WEBSDK_Version>1.0.0-rel-20170501-473</CLI_WEBSDK_Version>
+    <CLI_TestPlatform_Version>15.3.0-preview-20170502-03</CLI_TestPlatform_Version>
+    <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
+    <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
+    <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
+    <TemplateEngineVersion>1.0.0-beta2-20170503-217</TemplateEngineVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta2-20170505-222</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170505-222</TemplateEngineTemplate2_0Version>
+    <PlatformAbstractionsVersion>2.0.0-preview2-25319-02</PlatformAbstractionsVersion>
+    <DependencyModelVersion>2.0.0-preview2-25319-02</DependencyModelVersion>
+    <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
+    <CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
+    <AspNetCoreRuntimeVersion>2.0.0-preview1-92</AspNetCoreRuntimeVersion>
+    <MicroBuildVersion>0.2.0</MicroBuildVersion>
+  
+    <!-- This should either be timestamped or notimestamp as appropriate -->
+    <AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
+
+  </PropertyGroup>
+
+  <!-- infrastructure and test only dependencies -->
+  <PropertyGroup>
+    <VersionToolsVersion>1.0.27-prerelease-01611-04</VersionToolsVersion>
+    <DotnetDebToolVersion>2.0.0-preview1-001877</DotnetDebToolVersion>
+  </PropertyGroup>
+</Project>
diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index f780e3656..ac291e14b 100644
--- a/build/OutputDirectories.props
+++ b/build/OutputDirectories.props
@@ -6,6 +6,7 @@
       <SdkOutputDirectory>$(OutputDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
       <SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</SymbolsDirectory>
       <RoslynDirectory>$(SdkOutputDirectory)/Roslyn</RoslynDirectory>
+      <FSharpDirectory>$(SdkOutputDirectory)/FSharp</FSharpDirectory>
       <CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</CompilationDirectory>
       <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
       <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index f9fdbf181..d0ffe6ddd 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -70,6 +70,14 @@
                    ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
   </Target>
 
+  <Target Name="PublishFSharp"
+          BeforeTargets="Publish">
+          
+    <DotNetPublish ToolPath="$(Stage0Directory)"
+                   Configuration="$(Configuration)"
+                   ProjectPath="$(SrcDirectory)/tool_fsharp/tool_fsc.csproj" />
+  </Target>
+
   <Target Name="GenerateCliRuntimeConfigurationFiles"
           AfterTargets="Publish">
     <RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"
diff --git a/src/tool_fsharp/RunFsc.cmd b/src/tool_fsharp/RunFsc.cmd
new file mode 100644
index 000000000..3be9b946f
--- /dev/null
+++ b/src/tool_fsharp/RunFsc.cmd
@@ -0,0 +1,6 @@
+@echo off
+
+REM Copyright (c) .NET Foundation and contributors. All rights reserved.
+REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+"%~dp0..\..\..\dotnet" "%~dp0fsc.exe" %*
diff --git a/src/tool_fsharp/RunFsc.sh b/src/tool_fsharp/RunFsc.sh
new file mode 100644
index 000000000..5ead81286
--- /dev/null
+++ b/src/tool_fsharp/RunFsc.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+set -e
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
+"$DIR/../../../dotnet" "$DIR/fsc.exe" "$@"
diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj
new file mode 100644
index 000000000..ba8924741
--- /dev/null
+++ b/src/tool_fsharp/tool_fsc.csproj
@@ -0,0 +1,67 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" />
+
+  <PropertyGroup>
+    <VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <PublishDir>$(FSharpDirectory)</PublishDir>
+    <VersionSuffix>$(CommitCount)</VersionSuffix>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
+    <PackageReference Include="Microsoft.FSharp.Core.netcore" Version="$(CLI_FSharp_Version)" />
+    <PackageReference Include="Microsoft.FSharp.Compiler.netcore" Version="$(CLI_FSharp_Version)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="RunFsc.sh;RunFsc.cmd">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+  <Target Name="MakeFscRunnableAndMoveToPublishDir"
+          AfterTargets="Publish"
+          BeforeTargets="RemoveFilesAfterPublish">
+
+    <ItemGroup>
+      <AssetsToRemoveFromDeps Include="tool_fsc.dll" 
+                              SectionName="runtime"/>
+    </ItemGroup>
+
+    <RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"
+                                 SectionName="%(AssetsToRemoveFromDeps.SectionName)"
+                                 AssetPath="%(AssetsToRemoveFromDeps.Identity)" />
+
+    <Copy SourceFiles="$(PublishDir)/runtimes/any/native/default.win32manifest;
+                       $(PublishDir)/runtimes/any/native/Microsoft.FSharp.Targets;
+                       $(PublishDir)/runtimes/any/native/Microsoft.Portable.FSharp.Targets;
+                       $(PublishDir)/runtimes/any/native/Microsoft.FSharp.NetSdk.props;
+                       $(PublishDir)/runtimes/any/native/Microsoft.FSharp.NetSdk.targets;
+                       $(PublishDir)/runtimes/any/native/FSharp.Core.optdata;
+                       $(PublishDir)/runtimes/any/native/FSharp.Core.sigdata;
+                       $(PublishDir)/runtimes/any/native/FSharp.Core.xml;
+                       $(PublishDir)/$(TargetName).runtimeconfig.json;
+                       $(PublishDir)/$(TargetName).deps.json;"
+          DestinationFiles="$(PublishDir)/default.win32manifest;
+                            $(PublishDir)/Microsoft.FSharp.Targets;
+                            $(PublishDir)/Microsoft.Portable.FSharp.Targets;
+                            $(PublishDir)/Microsoft.FSharp.NetSdk.props;
+                            $(PublishDir)/Microsoft.FSharp.NetSdk.targets;
+                            $(PublishDir)/FSharp.Core.optdata;
+                            $(PublishDir)/FSharp.Core.sigdata;
+                            $(PublishDir)/FSharp.Core.xml;
+                            $(PublishDir)/fsc.runtimeconfig.json;
+                            $(PublishDir)/fsc.deps.json;"/>
+  </Target>
+
+  <Target Name="RemoveFilesAfterPublish"
+          AfterTargets="Publish">
+    <Delete Files="$(PublishDir)/$(TargetName).dll" />
+    <Delete Files="$(PublishDir)/$(TargetName).pdb" />
+    <Delete Files="$(PublishDir)/$(TargetName).runtimeconfig.json" />
+    <Delete Files="$(PublishDir)/$(TargetName).deps.json" />
+  </Target>
+</Project>