From 781bb0e827d4161628887f9d912c681632efe27a Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Mon, 7 Nov 2016 01:56:45 -0800
Subject: [PATCH 01/14] Simplify Nugets

---
 build-everything.proj                         |  2 -
 build.cmd                                     |  4 +-
 src/FSharpSource.Settings.targets             |  1 +
 src/FSharpSource.targets                      | 18 +++++++-
 src/buildtools/buildnugets.fsx                | 46 -------------------
 src/fsharp-library-build.proj                 |  1 -
 .../FSharp.Compiler.Host.proj                 | 29 ++++++++----
 .../Microsoft.FSharp.Compiler.netcore.nuspec  |  0
 .../layoutfschostnuget.fsx                    | 33 -------------
 .../FSharp.Compiler.nuget.proj                | 23 ----------
 .../layoutfscnuget.fsx                        | 46 -------------------
 .../FSharp.Core.netcore.nuget.proj            | 23 ----------
 .../layoutfscorenuget.fsx                     | 44 ------------------
 src/fsharp/FSharp.Core/FSharp.Core.fsproj     |  4 ++
 .../FSharp.Core.runtimeconfig.json            |  0
 .../Microsoft.FSharp.Core.netcore.nuspec      |  0
 src/fsharp/Fsc/Fsc.fsproj                     |  4 +-
 .../Source.extension.vsixmanifest             |  3 ++
 .../Source.extension.vsixmanifest             |  3 ++
 .../Source.extension.vsixmanifest             |  3 ++
 .../Source.extension.vsixmanifest             |  3 ++
 21 files changed, 58 insertions(+), 232 deletions(-)
 delete mode 100644 src/buildtools/buildnugets.fsx
 rename src/fsharp/{FSharp.Compiler.netcore.nuget => FSharp.Compiler.Host.netcore.nuget}/Microsoft.FSharp.Compiler.netcore.nuspec (100%)
 delete mode 100644 src/fsharp/FSharp.Compiler.Host.netcore.nuget/layoutfschostnuget.fsx
 delete mode 100644 src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj
 delete mode 100644 src/fsharp/FSharp.Compiler.netcore.nuget/layoutfscnuget.fsx
 delete mode 100644 src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.netcore.nuget.proj
 delete mode 100644 src/fsharp/FSharp.Core.netcore.nuget/layoutfscorenuget.fsx
 rename src/fsharp/{FSharp.Core.netcore.nuget => FSharp.Core}/FSharp.Core.runtimeconfig.json (100%)
 rename src/fsharp/{FSharp.Core.netcore.nuget => FSharp.Core}/Microsoft.FSharp.Core.netcore.nuspec (100%)

diff --git a/build-everything.proj b/build-everything.proj
index 183525d8ebf..d2b47133cd1 100644
--- a/build-everything.proj
+++ b/build-everything.proj
@@ -16,13 +16,11 @@
 
   <ItemGroup Condition="'$(BUILD_CORECLR)'=='1'">
     <ProjectsWithCoreClr Include="src/fsharp/FSharp.Core/FSharp.Core.fsproj" />
-    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.netcore.nuget.proj" />
     <ProjectsWithCoreClr Include="src/fsharp/FSharp.Build/FSharp.Build.fsproj" />
     <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj" />
     <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
     <ProjectsWithCoreClr Include="src/fsharp/Fsc/Fsc.fsproj" />
     <ProjectsWithCoreClr Include="src/fsharp/fsi/Fsi.fsproj" />
-    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj" />
     <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj" />
  </ItemGroup>
 
diff --git a/build.cmd b/build.cmd
index b1054cb3fff..0ce813b9385 100644
--- a/build.cmd
+++ b/build.cmd
@@ -481,8 +481,8 @@ if '%BUILD_PROTO%' == '1' (
 echo on
     pushd .\lkg\fsc & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure
     pushd .\lkg\fsi & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure
-    pushd .\lkg\fsc & %_dotnetexe% publish project.json --no-build -o %~dp0\Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed  & goto :failure
-    pushd .\lkg\fsi & %_dotnetexe% publish project.json --no-build -o %~dp0\Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed  & goto :failure
+    pushd .\lkg\fsc & %_dotnetexe% publish project.json --no-build -o %~dp0Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed  & goto :failure
+    pushd .\lkg\fsi & %_dotnetexe% publish project.json --no-build -o %~dp0Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed  & goto :failure
 
     echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
          %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets
index f43eaf92ecd..5d172a708b8 100644
--- a/src/FSharpSource.Settings.targets
+++ b/src/FSharpSource.Settings.targets
@@ -18,6 +18,7 @@
     <ConfigurationGroup Condition="'$(ConfigurationGroup)'==''">Debug</ConfigurationGroup>
   </PropertyGroup>
 
+  <!-- Nuget Package properties -->
   <PropertyGroup>
     <!-- Tail calls on, even in debug -->
     <Tailcalls>true</Tailcalls>
diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index 2d8455c5dae..85b82f69bbf 100644
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -502,6 +502,14 @@
     <EnsureThereAreNoUnusedFsSrGenResources>false</EnsureThereAreNoUnusedFsSrGenResources>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <PackageLicenceUrl Condition="'$(PackageLicenceUrl)' == ''">https://github.com/Microsoft/visualfsharp/blob/master/License.txt</PackageLicenceUrl>
+    <PackageProjectUrl Condition="'$(PackageProjectUrl)' == ''">https://github.com/Microsoft/visualfsharp</PackageProjectUrl>
+    <PackageVersion    Condition="'$(PackageVersion)' == ''"   >$(NuGetPerBuildPreReleaseVersion)</PackageVersion>
+    <PackageAuthors    Condition="'$(PackageAuthors)' == ''"   >Microsoft</PackageAuthors>
+    <PackageTags       Condition="'$(PackageTags)' == ''"      >Visual F# Compiler FSharp coreclr functional programming</PackageTags>
+  </PropertyGroup>
+
   <Target Name="ValidateConfiguration">
     <Error
             Text="Configuration '$(Configuration)' is not one of the supported configurations: Debug, Release, Proto"
@@ -549,7 +557,15 @@
   </Target>
 
   <Target Name="dotnetrestore" BeforeTargets="Build" Condition=" '$(TargetFramework)' == 'coreclr' ">
-    <Exec Command="$(MSBuildThisFileDirectory)..\.nuget\nuget.exe restore -PackagesDirectory $(MSBuildThisFileDirectory)..\packages -Config $(MSBuildThisFileDirectory)..\.nuget\NuGet.Config project.json"/>
+    <Exec Command="$(MSBuildThisFileDirectory)..\.nuget\nuget.exe restore -PackagesDirectory $(MSBuildThisFileDirectory)..\packages -Config $(MSBuildThisFileDirectory)..\.nuget\NuGet.Config project.json" />
+  </Target>
+
+  <Target Name="nugetpack" AfterTargets="Build" Condition="'$(TargetFramework)' == 'coreclr' "
+          Inputs="@(PackageNuspec)" Outputs='$(OutputPath.TrimEnd("\"))\nuget\"%(PackageNuspec.Filename)).nupkg'>
+    <PropertyGroup>
+      <PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
+    </PropertyGroup>
+    <Exec Command='$(MSBuildThisFileDirectory)..\.nuget\nuget.exe pack %(PackageNuspec.Filename)%(PackageNuspec.Extension) -BasePath "$(OutputPath.TrimEnd("\"))" -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory "$(OutputPath.TrimEnd("\"))"' />
   </Target>
 
   <Target Name="GenerateSourceLink" BeforeTargets="CoreCompile">
diff --git a/src/buildtools/buildnugets.fsx b/src/buildtools/buildnugets.fsx
deleted file mode 100644
index 7725988b935..00000000000
--- a/src/buildtools/buildnugets.fsx
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information,
-//
-// Build nuget package for the fsharp compiler
-//=========================================================================================
-
-#load "scriptlib.fsx"
-
-try
-
-    //=========================================================================================
-    // Command line arguments
-
-    let usage = "usage: BuildNuGets.fsx --version:<build-version> -nuspec:<nuspec-path> --binaries:<binaries-dir>"
-
-    let verbose     = getCmdLineArg    "--verbosity:"  "normal"
-    let version     = getCmdLineArg    "--version:"    ""
-    let nuspec      = getCmdLineArg    "--nuspec:"     ""
-    let bindir      = getCmdLineArg    "--bindir:"     ""
-    let nuspecTitle = getBasename nuspec
-    let layouts     = getFullPath bindir ++ "layouts" ++ nuspecTitle
-    let output      = getFullPath bindir ++ "nuget"
-    let isVerbose   = verbose = "verbose"
-
-    //=========================================================================================
-    // Invoke nuget.exe to build nuget package
-
-    let author =     "Microsoft"
-    let licenseUrl = "https://github.com/Microsoft/visualfsharp/blob/master/License.txt"
-    let projectUrl = "https://github.com/Microsoft/visualfsharp"
-    let tags =       "Visual F# Compiler FSharp coreclr functional programming"
-
-    let nugetArgs = sprintf "pack %s -BasePath \"%s\" -OutputDirectory \"%s\" -ExcludeEmptyDirectories -prop licenseUrl=\"%s\" -prop version=\"%s\" -prop authors=\"%s\" -prop projectURL=\"%s\" -prop tags=\"%s\" -Verbosity detailed"
-                            nuspec
-                            layouts
-                            output
-                            licenseUrl
-                            version
-                            author
-                            projectUrl
-                            tags
-
-    let nugetExePath = getFullPath (__SOURCE_DIRECTORY__ ++ "../../.nuget/nuget.exe")
-    makeDirectory output
-    exit (executeProcess nugetExePath nugetArgs) 
-with _ -> 
-    exit 1
diff --git a/src/fsharp-library-build.proj b/src/fsharp-library-build.proj
index a8bbca5d542..3eec2679762 100644
--- a/src/fsharp-library-build.proj
+++ b/src/fsharp-library-build.proj
@@ -9,7 +9,6 @@
   <!-- Core library: all frameworks -->
   <ItemGroup>
     <ProjectFiles Include="fsharp\FSharp.Core\FSharp.Core.fsproj" />
-    <ProjectFiles Include="fsharp\FSharp.Core.netcore.nuget\FSharp.Core.netcore.nuget.proj" Condition="'$(TargetFramework)' == 'coreclr'" />
   </ItemGroup>
 
   <Import Project="root.traversal.targets"/>
diff --git a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj
index b8ef39d90ec..b55576371be 100644
--- a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj
+++ b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj
@@ -7,17 +7,28 @@
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
 
   <PropertyGroup>
-    <pkgversion  Condition=" '$(PKGVersion)' == '' ">$(NuGetPerBuildPreReleaseVersion)</pkgversion>
-    <OutDir>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin</OutDir>
+    <PackageLicenceUrl Condition="'$(PackageLicenceUrl)' == ''">https://github.com/Microsoft/visualfsharp/blob/master/License.txt</PackageLicenceUrl>
+    <PackageProjectUrl Condition="'$(PackageProjectUrl)' == ''">https://github.com/Microsoft/visualfsharp</PackageProjectUrl>
+    <PackageVersion    Condition="'$(PackageVersion)' == ''"   >$(NuGetPerBuildPreReleaseVersion)</PackageVersion>
+    <PackageAuthors    Condition="'$(PackageAuthors)' == ''"   >Microsoft</PackageAuthors>
+    <PackageTags       Condition="'$(PackageTags)' == ''"      >Visual F# Compiler FSharp coreclr functional programming</PackageTags>
+    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\coreclr\bin</OutputPath>
   </PropertyGroup>
 
-  <!-- TODO: Switch to using lkg coreclr fsi and remove dependency on running FSharp.Compiler.Tools fsi -->
-  
-  <Target Name="Build" Outputs="$(TargetPath)"  DependsOnTargets="$(BuildDependsOn)">
-    <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec layoutfschostnuget.fsx --nuspec:.\Microsoft.FSharp.Compiler.Host.netcore.nuspec --bindir:$(OutDir)"/>
-    <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec ..\..\buildtools\buildnugets.fsx --version:$(pkgversion) --nuspec:.\Microsoft.FSharp.Compiler.Host.netcore.nuspec --bindir:$(OutDir)"/>
-  </Target>
+  <ItemGroup Condition="'$(TargetFramework)' == 'coreclr'">
+    <PackageNuspec Include="Microsoft.FSharp.Compiler.netcore.nuspec" />
+    <PackageNuspec Include="Microsoft.FSharp.Compiler.Host.netcore.nuspec" />
+  </ItemGroup>
+
+  <Target Name="Build" Outputs="$(TargetPath)"  DependsOnTargets="$(nugetpack)" />
+  <Target Name="Rebuild"  DependsOnTargets="$(nugetpack)" />
 
-  <Target Name="Rebuild"  DependsOnTargets="Build" />
+  <Target Name="nugetpack" AfterTargets="Build" Condition="'$(TargetFramework)' == 'coreclr' "
+          Inputs="@(PackageNuspec)" Outputs='$(OutputPath.TrimEnd("\"))\nuget\"%(PackageNuspec.Filename)).nupkg'>
+    <PropertyGroup>
+      <PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
+    </PropertyGroup>
+    <Exec Command='$(MSBuildThisFileDirectory)..\..\..\.nuget\nuget.exe pack %(PackageNuspec.Filename)%(PackageNuspec.Extension) -BasePath "$(OutputPath.TrimEnd("\"))" -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory "$(OutputPath.TrimEnd("\"))"' />
+  </Target>
 
 </Project>
diff --git a/src/fsharp/FSharp.Compiler.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec
similarity index 100%
rename from src/fsharp/FSharp.Compiler.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec
rename to src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec
diff --git a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/layoutfschostnuget.fsx b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/layoutfschostnuget.fsx
deleted file mode 100644
index 642b39dcc5e..00000000000
--- a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/layoutfschostnuget.fsx
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information,
-//
-// Layout the nuget host package for the fsharp compiler
-//=========================================================================================
-open System.IO
-
-#load "../../buildtools/scriptlib.fsx"
-
-try
-    //=========================================================================================
-    // Command line arguments
-
-    let usage = "usage: layoutfcsnhostnuget.fsx -nuspec:<nuspec-path> --binaries:<binaries-dir>"
-
-    let verbose     = getCmdLineArg    "--verbosity:"  "normal"
-    let nuspec      = getCmdLineArg    "--nuspec:"     ""
-    let bindir      = getCmdLineArg    "--bindir:"     ""
-    let nuspecTitle = getBasename nuspec
-    let layouts     = getFullPath bindir ++ "layouts" ++ nuspecTitle
-    let isVerbose   = verbose = "verbose"
-
-    //=========================================================================================
-    // Layout nuget package
-
-    //Clean intermediate directory
-    deleteDirectory layouts
-    makeDirectory layouts
-    exit 0
-
-with e -> 
-    printfn "Exception:  %s" e.Message
-    printfn "Stacktrace: %s" e.StackTrace
-    exit 1
diff --git a/src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj b/src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj
deleted file mode 100644
index eb960b66dc1..00000000000
--- a/src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <FSharpSourcesRoot>..\..</FSharpSourcesRoot>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-  </PropertyGroup>
-
-  <Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
-
-  <PropertyGroup>
-    <PkgVersion>$(NuGetPerBuildPreReleaseVersion)</PkgVersion>
-    <OutDir>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin</OutDir>
-  </PropertyGroup>
-
-  <!-- TODO: Switch to using lkg coreclr fsi and remove dependency on building net40 fsi after fixing #1168 -->
-
-  <Target Name="Build" Outputs="$(TargetPath)"  DependsOnTargets="$(BuildDependsOn)">
-    <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec layoutfscnuget.fsx --nuspec:.\Microsoft.FSharp.Compiler.netcore.nuspec --bindir:$(OutDir)"/>
-    <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec ..\..\buildtools\buildnugets.fsx --version:$(PkgVersion) --nuspec:.\Microsoft.FSharp.Compiler.netcore.nuspec --bindir:$(OutDir)"/>
-  </Target>
-
-  <Target Name="Rebuild"  DependsOnTargets="Build" />
-
-</Project>
diff --git a/src/fsharp/FSharp.Compiler.netcore.nuget/layoutfscnuget.fsx b/src/fsharp/FSharp.Compiler.netcore.nuget/layoutfscnuget.fsx
deleted file mode 100644
index 071027ff96d..00000000000
--- a/src/fsharp/FSharp.Compiler.netcore.nuget/layoutfscnuget.fsx
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information,
-//
-// Layout the nuget package for the fsharp compiler
-//=========================================================================================
-
-#load "../../buildtools/scriptlib.fsx"
-
-try
-    //=========================================================================================
-    // Command line arguments
-
-    let usage = "usage: layoutfcsnuget.fsx -nuspec:<nuspec-path> --binaries:<binaries-dir>"
-
-    let verbose     = getCmdLineArg    "--verbosity:"  "normal"
-    let nuspec      = getCmdLineArg    "--nuspec:"     ""
-    let bindir      = getCmdLineArg    "--bindir:"     ""
-    let nuspecTitle = getBasename nuspec
-    printfn ">>%s<<" bindir
-    printfn ">>%s<<" nuspecTitle
-    let layouts     = getFullPath bindir ++ "layouts" ++ nuspecTitle
-    let isVerbose   = verbose = "verbose"
-
-    //=========================================================================================
-    // Layout nuget package
-
-    let fsharpCompilerFiles =
-        [  bindir ++ "fsc.exe"
-           bindir ++ "FSharp.Compiler.dll"
-           bindir ++ "default.win32manifest"
-           bindir ++ "fsi.exe"
-           bindir ++ "FSharp.Compiler.Interactive.Settings.dll"
-           bindir ++ "FSharp.Build.dll"
-           bindir ++ "Microsoft.FSharp.targets"
-           bindir ++ "Microsoft.Portable.FSharp.targets" ]
-    
-    //Clean intermediate directoriy
-    deleteDirectory layouts
-    makeDirectory layouts
-    for source in fsharpCompilerFiles do 
-        copyFile source layouts
-    exit 0
-
-with e -> 
-    printfn "Exception:  %s" e.Message
-    printfn "Stacktrace: %s" e.StackTrace
-    exit 1
diff --git a/src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.netcore.nuget.proj b/src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.netcore.nuget.proj
deleted file mode 100644
index 55d2754ce09..00000000000
--- a/src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.netcore.nuget.proj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <FSharpSourcesRoot>..\..</FSharpSourcesRoot>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-  </PropertyGroup>
-
-  <Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
-
-  <PropertyGroup>
-    <PkgVersion>$(NuGetPerBuildPreReleaseVersion)</PkgVersion>
-    <OutDir>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin</OutDir>
-  </PropertyGroup>
-
-  <!-- TODO: Switch to using lkg coreclr fsi and remove dependency on building net40 fsi after fixing #1168 -->
-
-  <Target Name="Build" Outputs="$(TargetPath)"  DependsOnTargets="$(BuildDependsOn)">
-    <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec layoutfscorenuget.fsx --nuspec:.\Microsoft.FSharp.Core.netcore.nuspec --bindir:$(OutDir)"/>
-    <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec ..\..\buildtools\buildnugets.fsx --version:$(PkgVersion) --nuspec:.\Microsoft.FSharp.Core.netcore.nuspec --bindir:$(OutDir)"/>
-  </Target>
-
-  <Target Name="Rebuild"  DependsOnTargets="Build" />
-
-</Project>
diff --git a/src/fsharp/FSharp.Core.netcore.nuget/layoutfscorenuget.fsx b/src/fsharp/FSharp.Core.netcore.nuget/layoutfscorenuget.fsx
deleted file mode 100644
index fb4293ef4ab..00000000000
--- a/src/fsharp/FSharp.Core.netcore.nuget/layoutfscorenuget.fsx
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information,
-//
-// Layout the nuget package for the fsharp compiler
-//=========================================================================================
-
-#load "../../buildtools/scriptlib.fsx"
-
-try
-
-    //=========================================================================================
-    // Command line arguments
-
-    let usage = "usage: layoutfscorenuget.fsx -nuspec:<nuspec-path> --binaries:<binaries-dir>"
-
-    let verbose     = getCmdLineArg    "--verbosity:"  "normal"
-    let nuspec      = getCmdLineArg    "--nuspec:"     ""
-    let bindir      = getCmdLineArg    "--bindir:"     ""
-    let nuspecTitle = getBasename nuspec
-    let layouts     = getFullPath bindir ++ "layouts" ++ nuspecTitle
-    let isVerbose   = verbose = "verbose"
-
-    //=========================================================================================
-    // Layout nuget package
-
-    let fsharpCoreFiles =
-        [ bindir ++ "FSharp.Core.xml"
-          bindir ++ "FSharp.Core.dll"
-          bindir ++ "FSharp.Core.sigdata"
-          bindir ++ "FSharp.Core.optdata"
-          __SOURCE_DIRECTORY__ ++ "FSharp.Core.runtimeconfig.json" ]
-
-    //Clean intermediate directory
-    deleteDirectory layouts
-    makeDirectory layouts
-
-    for source in fsharpCoreFiles do 
-        copyFile source layouts
-
-    exit 0
-
-with e -> 
-    printfn "Exception:  %s" e.Message
-    printfn "Stacktrace: %s" e.StackTrace
-    exit 1
diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
index 4ab65e83f4f..fe6e463e4af 100644
--- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj
+++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -23,6 +23,10 @@
     <OtherFlags Condition=" '$(TargetFramework)'=='portable78'">$(OtherFlags)  --compiling-fslib-40 --compiling-fslib-nobigint</OtherFlags>
     <OtherFlags Condition=" '$(TargetFramework)'=='portable259'">$(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint</OtherFlags>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageNuspec Include="Microsoft.FSharp.Core.netcore.nuspec" />
+    <None Include="FSharp.Core.runtimeconfig.json"><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory></None>
+  </ItemGroup>
   <ItemGroup>
     <FilesToLocalize Include="$(OutDir)$(AssemblyName).dll">
       <TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
diff --git a/src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.runtimeconfig.json b/src/fsharp/FSharp.Core/FSharp.Core.runtimeconfig.json
similarity index 100%
rename from src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.runtimeconfig.json
rename to src/fsharp/FSharp.Core/FSharp.Core.runtimeconfig.json
diff --git a/src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec b/src/fsharp/FSharp.Core/Microsoft.FSharp.Core.netcore.nuspec
similarity index 100%
rename from src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec
rename to src/fsharp/FSharp.Core/Microsoft.FSharp.Core.netcore.nuspec
diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj
index c51cfd3d5ac..aa61cc41ec7 100644
--- a/src/fsharp/Fsc/Fsc.fsproj
+++ b/src/fsharp/Fsc/Fsc.fsproj
@@ -26,7 +26,7 @@
       <TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).exe.lcl</TranslationFile>
       <LciCommentFile>$(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).exe.lci</LciCommentFile>
       <HasLceComments>false</HasLceComments>
-	  <InProject>false</InProject>
+      <InProject>false</InProject>
     </FilesToLocalize>
   </ItemGroup>
   <ItemGroup>
@@ -66,7 +66,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
-  
+
   <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
     <ItemGroup>
       <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).exe" />
diff --git a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
index 27d9936e0ae..841de06ff52 100644
--- a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
@@ -59,4 +59,7 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" /> 
+  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
index 6a934ab3b9b..a8b43fe0247 100644
--- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
@@ -62,4 +62,7 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" /> 
+  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
index cb130c38b25..241909992aa 100644
--- a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
@@ -63,4 +63,7 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" /> 
+  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
index d19598c864e..f41ce096f36 100644
--- a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
@@ -57,4 +57,7 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" /> 
+  </Prerequisites>
 </PackageManifest>
\ No newline at end of file

From e88482ef30a834b13f4de7f8cfa89c678d7c0205 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Mon, 7 Nov 2016 12:27:54 -0800
Subject: [PATCH 02/14] Re-remove ValidateConfiguration

---
 src/FSharpSource.targets | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index 51a21a19a7a..ecdc40b8701 100644
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -462,27 +462,9 @@
     <PackageTags       Condition="'$(PackageTags)' == ''"      >Visual F# Compiler FSharp coreclr functional programming</PackageTags>
   </PropertyGroup>
 
-  <Target Name="ValidateConfiguration">
-    <Error
-            Text="Configuration '$(Configuration)' is not one of the supported configurations: Debug, Release, Proto"
-            Condition="'$(Configuration)'!='Release' and '$(Configuration)'!='Debug' and '$(Configuration)'!='VSRelease' and '$(Configuration)'!='VSDebug' and '$(Configuration)'!='Proto'"/>
-    <Error
-            Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, coreclr, sl3-wp, sl5, sl5-compiler, portable47, portable7, portable78, portable259"
-            Condition="! ('$(TargetFramework)' == 'net40' or 
-                          '$(TargetFramework)' == 'coreclr' or 
-                          '$(TargetFramework)' == 'portable47' or
-                          '$(TargetFramework)' == 'portable7' or
-                          '$(TargetFramework)' == 'portable78' or 
-                          '$(TargetFramework)' == 'portable259')"/>
-    <Error
-        Text="TargetFramework '$(TargetFramework)' is only supported when building FSharp.Core.dll and FSharp.Core.Unittests.dll. All other components must be built with TargetFramework=net40"
-        Condition="'$(AssemblyName)' != 'FSharp.Core' and '$(AssemblyName)' != 'FSharp.Core.Unittests' and '$(TargetFramework)' != 'net40' and '$(TargetFramework)' != 'coreclr'"/>
-
-  </Target>
-
   <!-- This build step copies files to the output folder while replacing build variables in the text of
              those file. -->
-	
+
   <PropertyGroup>
     <CompileDependsOn>$(CompileDependsOn);CopyAndSubstituteTextFiles</CompileDependsOn>
   </PropertyGroup>
@@ -491,7 +473,7 @@
           Name="CopyAndSubstituteTextFiles"
           Inputs="@(CopyAndSubstituteText)"
           Outputs="@(CopyAndSubstituteText->'$(OutDir)%(TargetFilename)')"  >
-	<Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec $(MSBuildThisFileDirectory)scripts/subst.fsx --in:&quot;%(CopyAndSubstituteText.FullPath)&quot; --out:&quot;$(OutDir)%(CopyAndSubstituteText.TargetFilename)&quot; --pattern1:&quot;%(CopyAndSubstituteText.Pattern1)&quot; --replacement1:&quot;%(CopyAndSubstituteText.Replacement1)&quot; --pattern2:&quot;%(CopyAndSubstituteText.Pattern2)&quot; --replacement2:&quot;%(CopyAndSubstituteText.Replacement2)&quot; " />
+    <Exec Command="$(FsiToolPath)\$(FsiToolExe) --exec $(MSBuildThisFileDirectory)scripts/subst.fsx --in:&quot;%(CopyAndSubstituteText.FullPath)&quot; --out:&quot;$(OutDir)%(CopyAndSubstituteText.TargetFilename)&quot; --pattern1:&quot;%(CopyAndSubstituteText.Pattern1)&quot; --replacement1:&quot;%(CopyAndSubstituteText.Replacement1)&quot; --pattern2:&quot;%(CopyAndSubstituteText.Pattern2)&quot; --replacement2:&quot;%(CopyAndSubstituteText.Replacement2)&quot; " />
     <!-- Make sure it will get cleaned  -->
     <CreateItem Include="$(OutDir)%(CopyAndSubstituteText.TargetFilename)">
       <Output TaskParameter="Include" ItemName="FileWrites"/>

From 2dc6cdb20e87383a18afda056fa3d3a5902df210 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Mon, 7 Nov 2016 12:29:17 -0800
Subject: [PATCH 03/14] Re-remove ValidateConfiguration

---
 src/FSharpSource.targets | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index ecdc40b8701..19e8bcf4d17 100644
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -462,9 +462,7 @@
     <PackageTags       Condition="'$(PackageTags)' == ''"      >Visual F# Compiler FSharp coreclr functional programming</PackageTags>
   </PropertyGroup>
 
-  <!-- This build step copies files to the output folder while replacing build variables in the text of
-             those file. -->
-
+  <!-- This build step copies files to the output folder while replacing build variables in the text of those file. -->
   <PropertyGroup>
     <CompileDependsOn>$(CompileDependsOn);CopyAndSubstituteTextFiles</CompileDependsOn>
   </PropertyGroup>

From 11772ef71cb7be222b4845683b49cf967005b23c Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Mon, 7 Nov 2016 14:43:05 -0800
Subject: [PATCH 04/14] fsianycpu.config was inadvertently deleted

---
 src/fsharp/fsi/fsiAnyCpu.exe.config | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/fsharp/fsi/fsiAnyCpu.exe.config

diff --git a/src/fsharp/fsi/fsiAnyCpu.exe.config b/src/fsharp/fsi/fsiAnyCpu.exe.config
new file mode 100644
index 00000000000..e04b0a7caec
--- /dev/null
+++ b/src/fsharp/fsi/fsiAnyCpu.exe.config
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <legacyUnhandledExceptionPolicy enabled="true" />
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity
+          name="FSharp.Core"
+          publicKeyToken="b03f5f7f11d50a3a"
+          culture="neutral"/>
+        <bindingRedirect
+          oldVersion="2.0.0.0-4.4.1.0"
+          newVersion="4.4.1.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

From 520503a932255a34accb61f8e5aceb75a1a1c08b Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Mon, 7 Nov 2016 14:50:03 -0800
Subject: [PATCH 05/14] FSC.proj merge issue

---
 src/fsharp/Fsc/Fsc.fsproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj
index f6e66c9583b..29cc98ac26d 100644
--- a/src/fsharp/Fsc/Fsc.fsproj
+++ b/src/fsharp/Fsc/Fsc.fsproj
@@ -67,8 +67,7 @@
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
 
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
-  
+
   <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
     <ItemGroup>
       <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).exe" />

From 53dabfb44f3c49338d29a50aa17bcd1245fc1ccb Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Mon, 7 Nov 2016 15:35:07 -0800
Subject: [PATCH 06/14] fsharp.core.proj

---
 src/fsharp/FSharp.Core/FSharp.Core.fsproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
index a3ac3c2715a..1909f2ddfb6 100644
--- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj
+++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -24,8 +24,8 @@
     <OtherFlags Condition=" '$(TargetFramework)'=='portable259'">$(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint</OtherFlags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageNuspec Include="Microsoft.FSharp.Core.netcore.nuspec" />
-    <None Include="FSharp.Core.runtimeconfig.json"><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory></None>
+    <PackageNuspec Include="Microsoft.FSharp.Core.netcore.nuspec" Condition="'$(TargetFramework)' == 'coreclr'" />
+    <None Include="FSharp.Core.runtimeconfig.json"                Condition="'$(TargetFramework)' == 'coreclr'" ><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory></None>
   </ItemGroup>
   <ItemGroup>
     <FilesToLocalize Include="$(OutDir)$(AssemblyName).dll">

From 35053b97565dbb2ec1090b0e9e7704bc1f320bc5 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Mon, 7 Nov 2016 16:38:00 -0800
Subject: [PATCH 07/14] Remove prerequisited from vsixmanifest

---
 .../VisualFSharpDesktop/Source.extension.vsixmanifest     | 7 +------
 .../Vsix/VisualFSharpFull/Source.extension.vsixmanifest   | 3 ---
 .../VisualFSharpOpenSource/Source.extension.vsixmanifest  | 8 ++------
 .../Vsix/VisualFSharpWeb/Source.extension.vsixmanifest    | 3 ---
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
index 841de06ff52..e9626701dd2 100644
--- a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
@@ -33,7 +33,6 @@
   </Dependencies>
   <Assets>
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="RegisterFsharpPackage.pkgdef" />
-
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="FSharp.ProjectSystem.FSharp.pkgdef" />
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="FSharp.ProjectSystem.Base.pkgdef" />
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="FSharp.VS.FSI.pkgdef" />
@@ -47,8 +46,7 @@
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" Path="ProjectTemplates" d:TargetPath="|TutorialProject;TemplateProjectOutputGroup|" d:ProjectName="TutorialProject" d:VsixSubPath="ProjectTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" Path="ProjectTemplates" d:TargetPath="|ConsoleProject;TemplateProjectOutputGroup|" d:ProjectName="ConsoleProject" d:VsixSubPath="ProjectTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" Path="ProjectTemplates" d:TargetPath="|LibraryProject;TemplateProjectOutputGroup|" d:ProjectName="LibraryProject" d:VsixSubPath="ProjectTemplates" />
-    
-    
+
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|AppConfig;TemplateProjectOutputGroup|" d:ProjectName="AppConfig" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|CodeFile;TemplateProjectOutputGroup|" d:ProjectName="CodeFile" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|ScriptFile;TemplateProjectOutputGroup|" d:ProjectName="ScriptFile" d:VsixSubPath="ItemTemplates" />
@@ -59,7 +57,4 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" /> 
-  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
index a8b43fe0247..6a934ab3b9b 100644
--- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
@@ -62,7 +62,4 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" /> 
-  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
index 241909992aa..f66fb851750 100644
--- a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
@@ -51,19 +51,15 @@
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" Path="ProjectTemplates" d:TargetPath="|TutorialProject;TemplateProjectOutputGroup|" d:ProjectName="TutorialProject" d:VsixSubPath="ProjectTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" Path="ProjectTemplates" d:TargetPath="|ConsoleProject;TemplateProjectOutputGroup|" d:ProjectName="ConsoleProject" d:VsixSubPath="ProjectTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" Path="ProjectTemplates" d:TargetPath="|LibraryProject;TemplateProjectOutputGroup|" d:ProjectName="LibraryProject" d:VsixSubPath="ProjectTemplates" />
-    
-    
+
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|AppConfig;TemplateProjectOutputGroup|" d:ProjectName="AppConfig" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|CodeFile;TemplateProjectOutputGroup|" d:ProjectName="CodeFile" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|ScriptFile;TemplateProjectOutputGroup|" d:ProjectName="ScriptFile" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|SignatureFile;TemplateProjectOutputGroup|" d:ProjectName="SignatureFile" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|TextFile;TemplateProjectOutputGroup|" d:ProjectName="TextFile" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|XMLFile;TemplateProjectOutputGroup|" d:ProjectName="XMLFile" d:VsixSubPath="ItemTemplates" />
-    
+
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" /> 
-  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
index f41ce096f36..d19598c864e 100644
--- a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
@@ -57,7 +57,4 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" /> 
-  </Prerequisites>
 </PackageManifest>
\ No newline at end of file

From 50d2a286917983b0e97a1bd9784286f2261acb54 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Fri, 11 Nov 2016 21:35:18 -0800
Subject: [PATCH 08/14] Use publish for fsharp.core.unittests

---
 .nuget/NuGet.Config                           |  9 ++++----
 lkg/fsc/NuGet.Config                          | 13 -----------
 lkg/fsi/NuGet.Config                          | 13 -----------
 packages.config                               |  1 +
 src/FSharpSource.Settings.targets             | 16 ++++++-------
 src/FSharpSource.targets                      |  3 ++-
 .../FSharp.Compiler.Host.proj                 | 18 +++++++++++++++
 .../FSharp.Core.Unittests.fsproj              | 16 ++++++-------
 .../Microsoft.FSharp.TupleSample.nuspec       | 23 +++++++++++++++++++
 src/fsharp/FSharp.Core.Unittests/project.json |  9 ++++++--
 src/fsharp/fsi/Fsi.fsproj                     |  2 +-
 .../Source.extension.vsixmanifest             |  3 +++
 .../VisualFSharpDesktop.csproj                |  4 ++--
 .../Source.extension.vsixmanifest             |  3 +++
 .../VisualFSharpFull/VisualFSharpFull.csproj  |  4 ++--
 .../Source.extension.vsixmanifest             |  3 +++
 .../VisualFSharpOpenSource.csproj             |  4 ++--
 .../Source.extension.vsixmanifest             |  3 +++
 .../VisualFSharpWeb/VisualFSharpWeb.csproj    |  4 ++--
 19 files changed, 93 insertions(+), 58 deletions(-)
 delete mode 100644 lkg/fsc/NuGet.Config
 delete mode 100644 lkg/fsi/NuGet.Config
 create mode 100644 src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/Microsoft.FSharp.TupleSample.nuspec

diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
index 16b3affadcf..d054d983ba1 100644
--- a/.nuget/NuGet.Config
+++ b/.nuget/NuGet.Config
@@ -7,12 +7,13 @@
 
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
-    <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />  
+    <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" />
-    <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/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 dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
+    <add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="vctools" value="https://vcppdogfooding.azurewebsites.net/nuget/" />
-  </packageSources>  
+    <add key="artifacts" value="../artifacts" />
+  </packageSources>
 </configuration>
diff --git a/lkg/fsc/NuGet.Config b/lkg/fsc/NuGet.Config
deleted file mode 100644
index 5f26bdd4195..00000000000
--- a/lkg/fsc/NuGet.Config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />  
-    <add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/api/v3/index.json" />  
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-
-  </packageSources>  
-</configuration>
diff --git a/lkg/fsi/NuGet.Config b/lkg/fsi/NuGet.Config
deleted file mode 100644
index 5f26bdd4195..00000000000
--- a/lkg/fsi/NuGet.Config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />  
-    <add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/api/v3/index.json" />  
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-
-  </packageSources>  
-</configuration>
diff --git a/packages.config b/packages.config
index 7ccc4ea2244..61f2431bde5 100644
--- a/packages.config
+++ b/packages.config
@@ -29,6 +29,7 @@
   <package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.8"/>
   <package id="VisualCppTools" version="14.0.24519-Pre"/>
   <package id="Newtonsoft.Json" version="6.0.8"/>
+  <package id="Microsoft.FSharp.TupleSample" version="1.0.0-alpha-161112"/>
 
   <!-- Annoyingly the build of FSharp.Compiler.Server.Shared references a Visual Studio-specific attribute -->
   <!-- That DLL is logically part of the F# Compiler and F# Interactive but is shipped as part of the Visual F# IDE Tools -->
diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets
index 2e0a73856cc..233d685eb62 100644
--- a/src/FSharpSource.Settings.targets
+++ b/src/FSharpSource.Settings.targets
@@ -39,16 +39,16 @@
 
   <PropertyGroup Condition="'$(OS)' != 'Unix'">
     <!-- Things we do only on Windows right now -->
-	<UseMicroBuild>true</UseMicroBuild>
-	<UseSourceLink>true</UseSourceLink>
-	<UseGatherBinaries>true</UseGatherBinaries>
-	<AddVsSdkAttributesToSomeCoreComponents>true</AddVsSdkAttributesToSomeCoreComponents>
+    <UseMicroBuild>true</UseMicroBuild>
+    <UseSourceLink>true</UseSourceLink>
+    <UseGatherBinaries>true</UseGatherBinaries>
+    <AddVsSdkAttributesToSomeCoreComponents>true</AddVsSdkAttributesToSomeCoreComponents>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(OS)' == 'Unix'">
-	<DefineConstants>CROSS_PLATFORM_COMPILER;$(DefineConstants)</DefineConstants>
+    <DefineConstants>CROSS_PLATFORM_COMPILER;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-	
+
   <PropertyGroup Condition=" '$(ProjectLanguage)' == 'FSharp' ">
     <!-- Things we do only for F# projects -->
     <OtherFlags>$(OtherFlags) --times</OtherFlags>
@@ -77,7 +77,7 @@
     <ErrorReport Condition=" '$(ErrorReport)' == '' ">prompt</ErrorReport>
     <DefineConstants Condition=" '$(ProjectLanguage)' != 'VisualBasic' ">TRACE;$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(ProjectLanguage)' == 'VisualBasic' ">TRACE=True,$(DefineConstants)</DefineConstants>
-	  <SIGN_WITH_MSFT_KEY Condition=" '$(SIGN_WITH_MSFT_KEY)' == '' ">false</SIGN_WITH_MSFT_KEY>
+    <SIGN_WITH_MSFT_KEY Condition=" '$(SIGN_WITH_MSFT_KEY)' == '' ">false</SIGN_WITH_MSFT_KEY>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Proto'">
@@ -99,7 +99,7 @@
     <DefineConstants Condition="'$(VisualStudioVersion)'=='14.0' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV14</DefineConstants>
     <DefineConstants Condition="'$(VisualStudioVersion)'=='15.0' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV15=True</DefineConstants>
     <DefineConstants Condition="'$(VisualStudioVersion)'=='15.0' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV15</DefineConstants>
-	<!-- VisualStudioVersion is not defined when using xbuild on Mono. Assume 14.0, the last shipped in-the-box with Mono -->
+    <!-- VisualStudioVersion is not defined when using xbuild on Mono. Assume 14.0, the last shipped in-the-box with Mono -->
     <DefineConstants Condition="'$(VisualStudioVersion)'=='' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV14=True</DefineConstants>
     <DefineConstants Condition="'$(VisualStudioVersion)'=='' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV14</DefineConstants>
   </PropertyGroup>
diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index 19e8bcf4d17..ca0da3b7333 100644
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -499,7 +499,8 @@
     <PropertyGroup>
       <PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
     </PropertyGroup>
-    <Exec Command='$(MSBuildThisFileDirectory)..\.nuget\nuget.exe pack %(PackageNuspec.Filename)%(PackageNuspec.Extension) -BasePath "$(OutputPath.TrimEnd("\"))" -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory "$(OutputPath.TrimEnd("\"))"' />
+
+    <Exec Command='$(MSBuildThisFileDirectory)..\.nuget\nuget.exe pack %(PackageNuspec.Filename)%(PackageNuspec.Extension) -BasePath "$(OutputPath.TrimEnd("\"))" -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory "$(MSBuildThisFileDirectory)..\artifacts' />
   </Target>
 
   <Target Name="dotnetrestore" BeforeTargets="Build" Condition=" '$(TargetFramework)' == 'coreclr' and '$(DOTNET_PUBLISH)' == 'true' ">
diff --git a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj
index 1168fe02094..62d40e739d4 100644
--- a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj
+++ b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj
@@ -20,6 +20,24 @@
     <PackageNuspec Include="Microsoft.FSharp.Compiler.Host.netcore.nuspec" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\fsi\Fsi.fsproj">
+      <Name>fsi</Name>
+      <Project>{d0e98c0d-490b-4c61-9329-0862f6e87645}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Fsc\Fsc.fsproj">
+      <Name>Fsc</Name>
+      <Project>{C94C257C-3C0A-4858-B5D8-D746498D1F08}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\fsiAnyCpu\FsiAnyCPU.fsproj">
+      <Name>FsiAnyCPU.fsproj</Name>
+      <Project>{8b3e283d-b5fe-4055-9d80-7e3a32f3967b}</Project>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+
   <Target Name="Build" Outputs="$(TargetPath)"  DependsOnTargets="$(nugetpack)" />
   <Target Name="Rebuild"  DependsOnTargets="$(nugetpack)" />
 
diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
index c929cf8b7b5..3e1b572407a 100644
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -53,30 +53,29 @@
       <Private>True</Private>
       <HintPath>$(NUnitLibDir)\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="FsCheck, Version=$(FsCheckFullVersion)" Condition="'$(TargetFramework)' != 'portable47'">
+    <Reference Include="FsCheck, Version=$(FsCheckFullVersion)" Condition="'$(TargetFramework)' != 'portable47' and '$(TargetFramework)' != 'coreclr'">
       <SpecificVersion>true</SpecificVersion>
       <Private>True</Private>
       <HintPath Condition="'$(TargetFramework)' == 'net40'">$(FsCheckLibDir)\net45\FsCheck.dll</HintPath>
       <HintPath Condition="'$(TargetFramework)' == 'portable7'">$(FsCheckLibDir)\portable-net45+netcore45\FsCheck.dll</HintPath>
       <HintPath Condition="'$(TargetFramework)' == 'portable78'">$(FsCheckLibDir)\portable-net45+netcore45+wp8\FsCheck.dll</HintPath>
-      <HintPath Condition="'$(TargetFramework)' == 'portable259' OR '$(TargetFramework)' == 'coreclr'">$(FsCheckLibDir)\portable-net45+netcore45+wpa81+wp8\FsCheck.dll</HintPath>
+      <HintPath Condition="'$(TargetFramework)' == 'portable259'">$(FsCheckLibDir)\portable-net45+netcore45+wpa81+wp8\FsCheck.dll</HintPath>
     </Reference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj"  Condition="'$(TargetFramework)' != 'coreclr'">
       <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
       <Name>FSharp.Core</Name>
     </ProjectReference>
-    <Reference Include="System.ValueTuple">
-        <HintPath Condition=" '$(TargetFramework)' == 'coreclr' ">..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple" Condition=" '$(TargetFramework)' != 'coreclr' ">
         <HintPath Condition=" '$(TargetFramework)' == 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-        <HintPath Condition=" '$(TargetFramework)' != 'coreclr'  and  '$(TargetFramework)' != 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
+        <HintPath Condition="'$(TargetFramework)' != 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
         <Private>True</Private>
     </Reference>
     <Reference Include="TupleSample">
-        <HintPath Condition=" '$(TargetFramework)' == 'coreclr' ">FSharp.Core\SampleTuples\4.0.0-rc3-24212-01\TupleSample.dll</HintPath>
-        <HintPath Condition=" '$(TargetFramework)' != 'coreclr' ">FSharp.Core\SampleTuples\4.4.0-beta-24631-01\TupleSample.dll</HintPath>
+        <HintPath Condition=" '$(TargetFramework)' != 'coreclr' ">..\..\..\packages\Microsoft.FSharp.TupleSample.1.0.0-alpha-161111/lib/netstandard1.1/TupleSample.dll</HintPath>
         <Private>True</Private>
     </Reference>
   </ItemGroup>
+<!--
   <ItemGroup Condition="'$(TargetFramework)' == 'coreclr'">
     <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
         <SpecificVersion>true</SpecificVersion>
@@ -90,6 +89,7 @@
     </Reference>
     <None Include="project.json" />
   </ItemGroup>
+-->
   <ItemGroup Condition="(!$(TargetFramework.Contains('portable'))) and '$(TargetFramework)' != 'coreclr'">
     <Reference Include="mscorlib" />
     <Reference Include="System" />
diff --git 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
new file mode 100644
index 00000000000..da635bc0fb1
--- /dev/null
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/Microsoft.FSharp.TupleSample.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+    <metadata>
+        <id>Microsoft.FSharp.TupleSample</id>
+        <description>Sample CSharpTuple code for tuple interop testing</description>
+        <language>en-US</language>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <version>$version$</version>
+        <authors>$authors$</authors>
+        <licenseUrl>$licenseUrl$</licenseUrl>
+        <projectUrl>$projectUrl$</projectUrl>
+        <tags>$tags$</tags>
+        <dependencies>
+            <group>
+                <dependency id="System.ValueTuple" version="4.0.0-rc3-24212-01" />
+            </group>
+        </dependencies>
+    </metadata>
+    <files>
+        <file src="4.0.0-rc3-24212-01\TupleSample.dll"     target="lib/netstandard1.1" />
+        <file src="4.4.0-beta-24631-01\TupleSample.dll"     target="lib/portable-net40+sl4+win8+wp8" />
+    </files>
+</package>
diff --git a/src/fsharp/FSharp.Core.Unittests/project.json b/src/fsharp/FSharp.Core.Unittests/project.json
index b7bed0f4f73..7e4017d5b86 100644
--- a/src/fsharp/FSharp.Core.Unittests/project.json
+++ b/src/fsharp/FSharp.Core.Unittests/project.json
@@ -6,7 +6,12 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "System.ValueTuple": "4.0.0-rc3-24212-01"
+    "nunit": "3.5.0",
+    "nunitlite": "3.5.0",
+    "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
+    "System.ValueTuple": "4.0.0-rc3-24212-01",
+    "FsCheck": "2.6.2",
+    "Microsoft.FSharp.TupleSample": "1.0.0-alpha-161112",
   },
   "runtimes": {
     "win7-x86": { },
@@ -22,7 +27,7 @@
           "version": "1.0.1"
         }
       },
-      "imports": "dnxcore50"
+      "imports": [ "netstandard1.1", "netstandard1.6", "portable-net45+win8+wp8+wpa81" ]
     }
   },
 }
diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/Fsi.fsproj
index 16c76b92aad..5a874125fb1 100644
--- a/src/fsharp/fsi/Fsi.fsproj
+++ b/src/fsharp/fsi/Fsi.fsproj
@@ -29,7 +29,7 @@
       <TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).exe.lcl</TranslationFile>
       <LciCommentFile>$(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).exe.lci</LciCommentFile>
       <HasLceComments>false</HasLceComments>
-	  <InProject>false</InProject>
+      <InProject>false</InProject>
     </FilesToLocalize>
   </ItemGroup>
   <ItemGroup>
diff --git a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
index e9626701dd2..af97a7735ca 100644
--- a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
@@ -57,4 +57,7 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpDesktop/VisualFSharpDesktop.csproj b/vsintegration/Vsix/VisualFSharpDesktop/VisualFSharpDesktop.csproj
index 6fcec3b4974..e67e96a4b9e 100644
--- a/vsintegration/Vsix/VisualFSharpDesktop/VisualFSharpDesktop.csproj
+++ b/vsintegration/Vsix/VisualFSharpDesktop/VisualFSharpDesktop.csproj
@@ -43,8 +43,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <VSRootSuffix>FSharpDev</VSRootSuffix>
     <UseCodebase>true</UseCodebase>
-    <DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
-    <DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '') ">False</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == '' ">True</DeployExtension>
     <ProjectGuid>{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}</ProjectGuid>
     <IsPackage>true</IsPackage>
     <RootNamespace>VisualFSharpDesktop</RootNamespace>
diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
index 6a934ab3b9b..a8b43fe0247 100644
--- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
@@ -62,4 +62,7 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" /> 
+  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
index 2fe949d0092..5a2c841376e 100644
--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
@@ -43,8 +43,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <VSRootSuffix>FSharpDev</VSRootSuffix>
     <UseCodebase>true</UseCodebase>
-    <DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
-    <DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '') ">False</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == '' ">True</DeployExtension>
     <ProjectGuid>{59ADCE46-9740-4079-834D-9A03A3494EBC}</ProjectGuid>
     <IsPackage>true</IsPackage>
     <RootNamespace>VisualFSharpFull</RootNamespace>
diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
index f66fb851750..a4e21312db7 100644
--- a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
@@ -62,4 +62,7 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
index c029b607b13..b6875ae0448 100644
--- a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
+++ b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
@@ -43,8 +43,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <VSRootSuffix>FSharpDev</VSRootSuffix>
     <UseCodebase>true</UseCodebase>
-    <DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
-    <DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '') ">False</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == '' ">True</DeployExtension>
     <ProjectGuid>{E6A45CDF-B408-420F-B475-74611BEFC52B}</ProjectGuid>
     <IsPackage>true</IsPackage>
     <RootNamespace>VisualFSharpOpenSource</RootNamespace>
diff --git a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
index d19598c864e..5375c1faa0e 100644
--- a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
@@ -57,4 +57,7 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpWeb/VisualFSharpWeb.csproj b/vsintegration/Vsix/VisualFSharpWeb/VisualFSharpWeb.csproj
index 8f7508b45ee..e0964695397 100644
--- a/vsintegration/Vsix/VisualFSharpWeb/VisualFSharpWeb.csproj
+++ b/vsintegration/Vsix/VisualFSharpWeb/VisualFSharpWeb.csproj
@@ -43,8 +43,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <VSRootSuffix>FSharpDev</VSRootSuffix>
     <UseCodebase>true</UseCodebase>
-    <DeployExtension Condition="'$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != ''">False</DeployExtension>
-    <DeployExtension Condition="'$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '') ">False</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == '' ">True</DeployExtension>
     <ProjectGuid>{58730C8B-16F5-4956-9291-BB68E17C9142}</ProjectGuid>
     <IsPackage>true</IsPackage>
     <RootNamespace>VisualFSharpWeb</RootNamespace>

From 13a9dc4c265bccd877ff10c3936ca83d344612e5 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Fri, 11 Nov 2016 22:10:08 -0800
Subject: [PATCH 09/14] remove tuplesample.dlls

---
 .../4.0.0-rc3-24212-01/TupleSample.dll           | Bin 8192 -> 0 bytes
 .../4.4.0-beta-24631-01/TupleSample.dll          | Bin 8192 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.0.0-rc3-24212-01/TupleSample.dll
 delete mode 100644 src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.4.0-beta-24631-01/TupleSample.dll

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.0.0-rc3-24212-01/TupleSample.dll b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.0.0-rc3-24212-01/TupleSample.dll
deleted file mode 100644
index f1afad418cceeccc994a20146239229c71fdf764..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
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

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.4.0-beta-24631-01/TupleSample.dll b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/4.4.0-beta-24631-01/TupleSample.dll
deleted file mode 100644
index 17e6c1678f61dff4b86effa64c6ab57f74648f84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
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


From 047f0ac6f817251040af015c967e9f76e6eb340c Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Fri, 11 Nov 2016 22:43:51 -0800
Subject: [PATCH 10/14] Fix tuplesample reference

---
 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
index 3e1b572407a..ad839be42ac 100644
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -71,7 +71,7 @@
         <Private>True</Private>
     </Reference>
     <Reference Include="TupleSample">
-        <HintPath Condition=" '$(TargetFramework)' != 'coreclr' ">..\..\..\packages\Microsoft.FSharp.TupleSample.1.0.0-alpha-161111/lib/netstandard1.1/TupleSample.dll</HintPath>
+        <HintPath Condition=" '$(TargetFramework)' != 'coreclr' ">..\..\..\packages\Microsoft.FSharp.TupleSample.1.0.0-alpha-161112/lib/netstandard1.1/TupleSample.dll</HintPath>
         <Private>True</Private>
     </Reference>
   </ItemGroup>

From 0b0d64b61e9958a292a1a80974f8048c5f1cf532 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Fri, 11 Nov 2016 23:36:17 -0800
Subject: [PATCH 11/14] correct profile for fsharp.core.unittests

---
 .../FSharp.Core.Unittests.fsproj                     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
index ad839be42ac..348728baf43 100644
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -46,14 +46,14 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>3</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup  Condition=" '$(TargetFramework)' != 'coreclr' ">
     <!-- need full name and SpecificVersion = true in order to convince msbuild to allow this reference when targeting portable47 -->
-    <Reference Include="nunit.framework, Version=$(NUnitFullVersion), Culture=neutral, PublicKeyToken=2638cd05610744eb" Condition="'$(TargetFramework)' != 'coreclr'">
+    <Reference Include="nunit.framework, Version=$(NUnitFullVersion), Culture=neutral, PublicKeyToken=2638cd05610744eb">
       <SpecificVersion>true</SpecificVersion>
       <Private>True</Private>
       <HintPath>$(NUnitLibDir)\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="FsCheck, Version=$(FsCheckFullVersion)" Condition="'$(TargetFramework)' != 'portable47' and '$(TargetFramework)' != 'coreclr'">
+    <Reference Include="FsCheck, Version=$(FsCheckFullVersion)" Condition=" '$(TargetFramework)' != 'portable47' ">
       <SpecificVersion>true</SpecificVersion>
       <Private>True</Private>
       <HintPath Condition="'$(TargetFramework)' == 'net40'">$(FsCheckLibDir)\net45\FsCheck.dll</HintPath>
@@ -61,17 +61,17 @@
       <HintPath Condition="'$(TargetFramework)' == 'portable78'">$(FsCheckLibDir)\portable-net45+netcore45+wp8\FsCheck.dll</HintPath>
       <HintPath Condition="'$(TargetFramework)' == 'portable259'">$(FsCheckLibDir)\portable-net45+netcore45+wpa81+wp8\FsCheck.dll</HintPath>
     </Reference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj"  Condition="'$(TargetFramework)' != 'coreclr'">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" ">
       <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
       <Name>FSharp.Core</Name>
     </ProjectReference>
-    <Reference Include="System.ValueTuple" Condition=" '$(TargetFramework)' != 'coreclr' ">
+    <Reference Include="System.ValueTuple">
         <HintPath Condition=" '$(TargetFramework)' == 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
         <HintPath Condition="'$(TargetFramework)' != 'profile47' ">..\..\..\packages\System.ValueTuple.4.4.0-beta-24631-01\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
         <Private>True</Private>
     </Reference>
     <Reference Include="TupleSample">
-        <HintPath Condition=" '$(TargetFramework)' != 'coreclr' ">..\..\..\packages\Microsoft.FSharp.TupleSample.1.0.0-alpha-161112/lib/netstandard1.1/TupleSample.dll</HintPath>
+        <HintPath>..\..\..\packages\Microsoft.FSharp.TupleSample.1.0.0-alpha-161112/lib/portable-net40+sl4+win8+wp8/TupleSample.dll</HintPath>
         <Private>True</Private>
     </Reference>
   </ItemGroup>

From 2d62d2c361da363bdb06542bc5e153b52247e819 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Sat, 12 Nov 2016 00:39:31 -0800
Subject: [PATCH 12/14] typo

---
 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
index 348728baf43..b51ee0c2785 100644
--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -61,7 +61,7 @@
       <HintPath Condition="'$(TargetFramework)' == 'portable78'">$(FsCheckLibDir)\portable-net45+netcore45+wp8\FsCheck.dll</HintPath>
       <HintPath Condition="'$(TargetFramework)' == 'portable259'">$(FsCheckLibDir)\portable-net45+netcore45+wpa81+wp8\FsCheck.dll</HintPath>
     </Reference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" ">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
       <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
       <Name>FSharp.Core</Name>
     </ProjectReference>

From afd0ec68d4c0eacaff379002327c7b5d8b2fe3d2 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Sat, 12 Nov 2016 01:27:34 -0800
Subject: [PATCH 13/14] Remove pre-requisites again

---
 readme                                                         | 1 +
 .../Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest     | 3 ---
 .../Vsix/VisualFSharpFull/Source.extension.vsixmanifest        | 3 ---
 .../Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest  | 3 ---
 .../Vsix/VisualFSharpWeb/Source.extension.vsixmanifest         | 3 ---
 5 files changed, 1 insertion(+), 12 deletions(-)
 create mode 100644 readme

diff --git a/readme b/readme
new file mode 100644
index 00000000000..198f7633d8e
--- /dev/null
+++ b/readme
@@ -0,0 +1 @@
+Ensure there is an artifacts directory
diff --git a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
index af97a7735ca..e9626701dd2 100644
--- a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
@@ -57,7 +57,4 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
-  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
index a8b43fe0247..6a934ab3b9b 100644
--- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
@@ -62,7 +62,4 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" /> 
-  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
index a4e21312db7..f66fb851750 100644
--- a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
@@ -62,7 +62,4 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
-  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
index 5375c1faa0e..d19598c864e 100644
--- a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
@@ -57,7 +57,4 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
   </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
-  </Prerequisites>
 </PackageManifest>
\ No newline at end of file

From 6bd79182396755df55501dbab807f5a4f24506d6 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Sat, 12 Nov 2016 01:57:30 -0800
Subject: [PATCH 14/14] Put readme in artifacts directory to ensure it exists

---
 readme => artifacts/readme | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename readme => artifacts/readme (100%)

diff --git a/readme b/artifacts/readme
similarity index 100%
rename from readme
rename to artifacts/readme