From 0910ba472bfd146b38f95a40b386eadf37683ccc Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Thu, 20 Oct 2016 13:44:49 -0700
Subject: [PATCH 1/5] Remove prequesities from vsix manifests

---
 .../Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest     | 3 ---
 .../Vsix/VisualFSharpFull/Source.extension.vsixmanifest        | 3 ---
 .../Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest  | 3 ---
 .../Vsix/VisualFSharpWeb/Source.extension.vsixmanifest         | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
index 76483db7fa1..ed704d87a0f 100644
--- a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
@@ -59,7 +59,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 adcdc42044a..a28d5d01c59 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 e20c8224715..24a4f84aadf 100644
--- a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
@@ -63,7 +63,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 74417f509ce..25e4f423a7b 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 bb437677698de6037f9a3fa2b349f6f5f59c90e0 Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Mon, 24 Oct 2016 11:51:44 -0700
Subject: [PATCH 2/5] Fix #1655 - Upgrade to SwixBuild plugin version 1.0.71

---
 setup/packages.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/packages.config b/setup/packages.config
index 46a7701a755..b1cc4920343 100644
--- a/setup/packages.config
+++ b/setup/packages.config
@@ -7,7 +7,7 @@
   <package id="FsSrGen" version="2.0.0" targetFramework="net46" />
   <package id="MicroBuild.Core" version="0.2.0" />
   <package id="MicroBuild.Core.Sentinel" version="1.0.0" />
-  <package id="MicroBuild.Plugins.SwixBuild" version="1.0.60" />
+  <package id="MicroBuild.Plugins.SwixBuild" version="1.0.71" />
   <package id="WiX.Toolset.2015" version="3.10.0.1503" />
   <package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
   <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net46" />

From 3b7644d2e8afde4a8a296bca5f9cb258ad537a8e Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Mon, 24 Oct 2016 12:54:26 -0700
Subject: [PATCH 3/5] Fix #1654 - FSharp Binaries installed reference wrong
 versions

---
 .../component-groups/Compiler_Redist.wxs       | 18 +++++++++---------
 setup/packages.config                          |  1 +
 src/fsharp/Fsc/fsc.exe.config                  |  9 +++++++++
 src/fsharp/fsi/fsi.exe.config                  |  9 +++++++++
 src/fsharp/fsi/fsiAnyCPU.exe.config            |  9 +++++++++
 vsintegration/packages.config                  |  5 -----
 6 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
index 7e924240ef9..88d4c263b54 100644
--- a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
+++ b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
@@ -41,7 +41,7 @@
 
       <Component Id="Compiler_Redist_FSharp.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Core.dll, $(var.LocaleCode)))">
         <File Id="Compiler_Redist_FSharp.Core.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll" KeyPath="yes">
-          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Core.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Core.Native.dll" Priority="0" Dependencies="no" Platform="all" AssemblyApplication="Compiler_Redist_fsc.exe" />
         </File>
         <File Id="FSharp_Core_Sigdata_File" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.sigdata" />
         <File Id="FSharp_Core_Optdata_File" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.optdata" />
@@ -49,52 +49,52 @@
 
       <Component Id="Compiler_Redist_FSharp.Build.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Build.dll, $(var.LocaleCode)))">
         <File Id="Compiler_Redist_FSharp.Build.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Build.dll" KeyPath="yes">
-          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Build.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Build.Native.dll" Priority="0" Dependencies="no" Platform="all" AssemblyApplication="Compiler_Redist_fsc.exe" />
         </File>
       </Component>
 
       <Component Id="Compiler_Redist_FSharp.Compiler.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.dll, $(var.LocaleCode)))">
         <File Id="Compiler_Redist_FSharp.Compiler.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.dll" KeyPath="yes">
-          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Native.dll" Priority="0" Dependencies="no" Platform="all" AssemblyApplication="Compiler_Redist_fsc.exe" />
         </File>
       </Component>
 
       <Component Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll, $(var.LocaleCode)))">
         <File Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Interactive.Settings.dll" KeyPath="yes">
-           <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+           <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.Native.dll" Priority="0" Dependencies="no" Platform="all" AssemblyApplication="Compiler_Redist_fsc.exe" />
         </File>
       </Component>
 
       <Component Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Data.TypeProviders.dll, $(var.LocaleCode)))">
         <File Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Type.Providers.Redist.1.0.0\content\4.3.0.0\FSharp.Data.TypeProviders.dll" KeyPath="yes">
-          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Data.TypeProviders.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Data.TypeProviders.Native.dll" Priority="0" Dependencies="no" Platform="all" AssemblyApplication="Compiler_Redist_fsc.exe" />
         </File>
       </Component>
 
       <Component Id="Compiler_Redist_fsc.exe" Guid="$(fsharp.guid(Compiler_Redist_fsc.exe, $(var.LocaleCode)))">
         <File Id="Compiler_Redist_fsc.exe" Source="$(var.BinariesDir)\net40\bin\fsc.exe" KeyPath="yes">
-          <NetFx:NativeImage Id="Compiler_Redist_fsc.Native.exe" Priority="0" Dependencies="no" Platform="all" />
+          <NetFx:NativeImage Id="Compiler_Redist_fsc.Native.exe" Priority="0" Dependencies="no" Platform="32bit" AssemblyApplication="Compiler_Redist_fsc.exe" />
         </File>
         <File Id="Compiler_Redist_fsc.exe.config" Source="$(var.BinariesDir)\net40\bin\fsc.exe.config" />
       </Component>
 
       <Component Id="Compiler_Redist_fsi.exe" Guid="$(fsharp.guid(Compiler_Redist_fsi.exe, $(var.LocaleCode)))">
         <File Id="Compiler_Redist_fsi.exe" Source="$(var.BinariesDir)\net40\bin\fsi.exe" KeyPath="yes">
-          <NetFx:NativeImage Id="Compiler_Redist_fsi.Native.exe" Priority="0" Dependencies="no" Platform="all" />
+          <NetFx:NativeImage Id="Compiler_Redist_fsi.Native.exe" Priority="0" Dependencies="no" Platform="32bit" AssemblyApplication="Compiler_Redist_fsc.exe" />
         </File>
         <File Id="Compiler_Redist_fsi.exe.config" Source="$(var.BinariesDir)\net40\bin\fsi.exe.config" />
       </Component>
 
       <Component Id="Compiler_Redist_fsiAnyCPU.exe" Guid="$(fsharp.guid(Compiler_Redist_fsiAnyCPU.exe, $(var.LocaleCode)))">
         <File Id="Compiler_Redist_fsiAnyCPU.exe" Source="$(var.BinariesDir)\net40\bin\fsiAnyCPU.exe" KeyPath="yes">
-          <NetFx:NativeImage Id="Compiler_Redist_fsiAnyCPU.Native.exe" Priority="0" Dependencies="no" Platform="all" />
+          <NetFx:NativeImage Id="Compiler_Redist_fsiAnyCPU.Native.exe" Priority="0" Dependencies="no" Platform="32bit" AssemblyApplication="Compiler_Redist_fsc.exe" />
         </File>
         <File Id="Compiler_Redist_fsianycpu.exe.config" Source="$(var.BinariesDir)\net40\bin\fsiAnyCPU.exe.config" />
       </Component>
 
       <Component Id="Compiler_Redist_FSharp.Compiler.Server.Shared.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Server.Shared.dll, $(var.LocaleCode)))">
         <File Id="Compiler_Redist_FSharp.Compiler.Server.Shared.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Server.Shared.dll" KeyPath="yes">
-          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Server.Shared.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Server.Shared.Native.dll" Priority="0" Dependencies="no" Platform="all" AssemblyApplication="Compiler_Redist_fsc.exe" />
         </File>
       </Component>      
 
diff --git a/setup/packages.config b/setup/packages.config
index b1cc4920343..54ba037776d 100644
--- a/setup/packages.config
+++ b/setup/packages.config
@@ -13,4 +13,5 @@
   <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net46" />
   <package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
   <package id="System.ValueTuple" version="4.0.0-rc3-24212-01" />
+  <package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
 </packages>
diff --git a/src/fsharp/Fsc/fsc.exe.config b/src/fsharp/Fsc/fsc.exe.config
index eeda9de56cc..31a72322ed2 100644
--- a/src/fsharp/Fsc/fsc.exe.config
+++ b/src/fsharp/Fsc/fsc.exe.config
@@ -13,6 +13,15 @@
           oldVersion="2.0.0.0-4.4.1.0"
           newVersion="4.4.1.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity
+          name="System.ValueTuple"
+          publicKeyToken="b03f5f7f11d50a3a"
+          culture="neutral"/>
+        <bindingRedirect
+          oldVersion="2.0.0.0-4.4.1.0"
+          newVersion="4.0.0.0"/>
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/fsharp/fsi/fsi.exe.config b/src/fsharp/fsi/fsi.exe.config
index e04b0a7caec..ac5d1435a25 100644
--- a/src/fsharp/fsi/fsi.exe.config
+++ b/src/fsharp/fsi/fsi.exe.config
@@ -12,6 +12,15 @@
           oldVersion="2.0.0.0-4.4.1.0"
           newVersion="4.4.1.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity
+          name="System.ValueTuple"
+          publicKeyToken="b03f5f7f11d50a3a"
+          culture="neutral"/>
+        <bindingRedirect
+          oldVersion="2.0.0.0-4.4.1.0"
+          newVersion="4.0.0.0"/>
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/fsharp/fsi/fsiAnyCPU.exe.config b/src/fsharp/fsi/fsiAnyCPU.exe.config
index e04b0a7caec..ac5d1435a25 100644
--- a/src/fsharp/fsi/fsiAnyCPU.exe.config
+++ b/src/fsharp/fsi/fsiAnyCPU.exe.config
@@ -12,6 +12,15 @@
           oldVersion="2.0.0.0-4.4.1.0"
           newVersion="4.4.1.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity
+          name="System.ValueTuple"
+          publicKeyToken="b03f5f7f11d50a3a"
+          culture="neutral"/>
+        <bindingRedirect
+          oldVersion="2.0.0.0-4.4.1.0"
+          newVersion="4.0.0.0"/>
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/vsintegration/packages.config b/vsintegration/packages.config
index e87dd65f176..0b8a5dd5fc7 100644
--- a/vsintegration/packages.config
+++ b/vsintegration/packages.config
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
-  <package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
   <package id="Microsoft.CodeAnalysis.Common" version="2.0.0-beta6-61005-05" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.EditorFeatures" version="2.0.0-beta6-61005-05" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.EditorFeatures.Text" version="2.0.0-beta6-61005-05" targetFramework="net46" />
@@ -25,7 +23,4 @@
   <package id="Microsoft.VisualFSharp.Microsoft.VisualStudio.Shell.UI.Internal" version="14.0.25420" targetFramework="net46" />
   <package id="RoslynDependencies.Microsoft.VisualStudio.Text.Internal" version="14.3.25407" targetFramework="net45" />  
   <package id="RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor" version="14.3.25407" targetFramework="net46" />  
-  <package id="WiX.Toolset.2015" version="3.10.0.1503" />
-  <package id="MicroBuild.Plugins.SwixBuild" version="1.0.60" />
-
 </packages>

From c1cb52383231c59b312d2e24c3b3edca076d36d7 Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Tue, 25 Oct 2016 13:39:47 -0700
Subject: [PATCH 4/5] Bring back language service registration

---
 .../src/FSharp.Editor/LanguageService.fs      | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/vsintegration/src/FSharp.Editor/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService.fs
index 1aeda6a46a0..ce73f66b85e 100644
--- a/vsintegration/src/FSharp.Editor/LanguageService.fs
+++ b/vsintegration/src/FSharp.Editor/LanguageService.fs
@@ -39,6 +39,12 @@ type internal SVsSettingsPersistenceManager = class end
 [<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".fsscript")>]
 [<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".ml")>]
 [<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".mli")>]
+[<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fs", 97)>]
+[<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fsi", 97)>]
+[<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fsx", 97)>]
+[<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fsscript", 97)>]
+[<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".ml", 97)>]
+[<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".mli", 97)>]
 type internal FSharpLanguageService(package : FSharpPackage) = 
     inherit AbstractLanguageService<FSharpPackage, FSharpLanguageService>(package)
 
@@ -132,13 +138,22 @@ type internal FSharpLanguageService(package : FSharpPackage) =
 
 
 and [<Guid(FSharpCommonConstants.packageGuidString)>]
-    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fs", 97)>]
-    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fsi", 97)>]
-    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fsx", 97)>]
-    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fsscript", 97)>]
-    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".ml", 97)>]
-    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".mli", 97)>]
-    internal FSharpPackage() = 
+    [<ProvideLanguageService(languageService = typeof<FSharpLanguageService>,
+                             strLanguageName = FSharpCommonConstants.FSharpLanguageName,
+                             languageResourceID = 100,
+                             MatchBraces = true,
+                             MatchBracesAtCaret = true,
+                             ShowCompletion = true,
+                             ShowMatchingBrace = true,
+                             ShowSmartIndent = true,
+                             EnableAsyncCompletion = true,
+                             QuickInfo = true,
+                             DefaultToInsertSpaces  = true,
+                             CodeSense = true,
+                             DefaultToNonHotURLs = true,
+                             EnableCommenting = true,
+                             CodeSenseDelay = 100)>]
+        internal FSharpPackage() =
     inherit AbstractPackage<FSharpPackage, FSharpLanguageService>()
     
     override this.RoslynLanguageName = FSharpCommonConstants.FSharpLanguageName

From 72deaba17c13cfdfeb8842c4dc2bc2362583f7b3 Mon Sep 17 00:00:00 2001
From: Omar Tawfik <otawfik@microsoft.com>
Date: Tue, 25 Oct 2016 14:59:31 -0700
Subject: [PATCH 5/5] Remove System.ValueTuple binding redirection

---
 src/fsharp/Fsc/fsc.exe.config       | 9 ---------
 src/fsharp/fsi/fsi.exe.config       | 9 ---------
 src/fsharp/fsi/fsiAnyCPU.exe.config | 9 ---------
 3 files changed, 27 deletions(-)

diff --git a/src/fsharp/Fsc/fsc.exe.config b/src/fsharp/Fsc/fsc.exe.config
index 31a72322ed2..eeda9de56cc 100644
--- a/src/fsharp/Fsc/fsc.exe.config
+++ b/src/fsharp/Fsc/fsc.exe.config
@@ -13,15 +13,6 @@
           oldVersion="2.0.0.0-4.4.1.0"
           newVersion="4.4.1.0"/>
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity
-          name="System.ValueTuple"
-          publicKeyToken="b03f5f7f11d50a3a"
-          culture="neutral"/>
-        <bindingRedirect
-          oldVersion="2.0.0.0-4.4.1.0"
-          newVersion="4.0.0.0"/>
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/fsharp/fsi/fsi.exe.config b/src/fsharp/fsi/fsi.exe.config
index ac5d1435a25..e04b0a7caec 100644
--- a/src/fsharp/fsi/fsi.exe.config
+++ b/src/fsharp/fsi/fsi.exe.config
@@ -12,15 +12,6 @@
           oldVersion="2.0.0.0-4.4.1.0"
           newVersion="4.4.1.0"/>
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity
-          name="System.ValueTuple"
-          publicKeyToken="b03f5f7f11d50a3a"
-          culture="neutral"/>
-        <bindingRedirect
-          oldVersion="2.0.0.0-4.4.1.0"
-          newVersion="4.0.0.0"/>
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/fsharp/fsi/fsiAnyCPU.exe.config b/src/fsharp/fsi/fsiAnyCPU.exe.config
index ac5d1435a25..e04b0a7caec 100644
--- a/src/fsharp/fsi/fsiAnyCPU.exe.config
+++ b/src/fsharp/fsi/fsiAnyCPU.exe.config
@@ -12,15 +12,6 @@
           oldVersion="2.0.0.0-4.4.1.0"
           newVersion="4.4.1.0"/>
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity
-          name="System.ValueTuple"
-          publicKeyToken="b03f5f7f11d50a3a"
-          culture="neutral"/>
-        <bindingRedirect
-          oldVersion="2.0.0.0-4.4.1.0"
-          newVersion="4.0.0.0"/>
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>