From 51a19b9a8bb0a4b5851b3e5d93005ddf8a38d891 Mon Sep 17 00:00:00 2001
From: Don Syme <donsyme@fastmail.fm>
Date: Mon, 25 Sep 2017 21:37:05 +0100
Subject: [PATCH 1/3] fix assembly reference

---
 .../Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
index 3b9fad0cd90..c0bd76dc751 100644
--- a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
+++ b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
@@ -324,8 +324,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(FSharpSourcesRoot)\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="System.Collections.Immutable, Version=1.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />

From 0ca9da8462c203fbd51e9a586d5f3cbf637bb650 Mon Sep 17 00:00:00 2001
From: Don Syme <donsyme@fastmail.fm>
Date: Tue, 26 Sep 2017 00:19:04 +0100
Subject: [PATCH 2/3] remove more build warnings

---
 src/fsharp/Fsc-proto/Fsc-proto.fsproj            |  5 +----
 .../{fsc-proto.exe.config => app.config}         |  0
 src/fsharp/Fsc/Fsc.fsproj                        |  5 +----
 src/fsharp/Fsc/{fsc.exe.config => app.config}    |  0
 src/fsharp/fsi/Fsi.fsproj                        |  4 +---
 src/fsharp/fsi/app.config                        | 16 ++++++++++++++++
 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj            |  5 +----
 .../app.config}                                  |  0
 .../testenv/src/HostedCompilerServer/App.config  | 10 ++++++++++
 9 files changed, 30 insertions(+), 15 deletions(-)
 rename src/fsharp/Fsc-proto/{fsc-proto.exe.config => app.config} (100%)
 rename src/fsharp/Fsc/{fsc.exe.config => app.config} (100%)
 create mode 100644 src/fsharp/fsi/app.config
 rename src/fsharp/{fsi/fsiAnyCpu.exe.config => fsiAnyCpu/app.config} (100%)

diff --git a/src/fsharp/Fsc-proto/Fsc-proto.fsproj b/src/fsharp/Fsc-proto/Fsc-proto.fsproj
index fb99ce70c24..1f86f23372a 100644
--- a/src/fsharp/Fsc-proto/Fsc-proto.fsproj
+++ b/src/fsharp/Fsc-proto/Fsc-proto.fsproj
@@ -443,10 +443,7 @@
     <Compile Include="..\fscmain.fs">
       <Link>fscmain.fs</Link>
     </Compile>
-    <None Include="fsc-proto.exe.config">
-      <Link>fsc-proto.exe.config</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
diff --git a/src/fsharp/Fsc-proto/fsc-proto.exe.config b/src/fsharp/Fsc-proto/app.config
similarity index 100%
rename from src/fsharp/Fsc-proto/fsc-proto.exe.config
rename to src/fsharp/Fsc-proto/app.config
diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj
index 5ed2857ea77..5e820e75eab 100644
--- a/src/fsharp/Fsc/Fsc.fsproj
+++ b/src/fsharp/Fsc/Fsc.fsproj
@@ -40,10 +40,7 @@
     <Compile Include="..\fscmain.fs">
       <Link>fscmain.fs</Link>
     </Compile>
-    <None Include="fsc.exe.config">
-      <Link>fsc.exe.config</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <None Include="app.config" />
     <None Include="..\..\windows\default.win32manifest">
       <Link>default.win32manifest</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/fsharp/Fsc/fsc.exe.config b/src/fsharp/Fsc/app.config
similarity index 100%
rename from src/fsharp/Fsc/fsc.exe.config
rename to src/fsharp/Fsc/app.config
diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/Fsi.fsproj
index 5e3d835b7b2..66b633519ad 100644
--- a/src/fsharp/fsi/Fsi.fsproj
+++ b/src/fsharp/fsi/Fsi.fsproj
@@ -46,9 +46,7 @@
     <Compile Include="fsimain.fs">
       <Link>fsimain.fs</Link>
     </Compile>
-    <None Include="fsi.exe.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>fsi.exe.config</Link>
+    <None Include="app.config">
     </None>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetDotnetProfile)' == 'coreclr'">
diff --git a/src/fsharp/fsi/app.config b/src/fsharp/fsi/app.config
new file mode 100644
index 00000000000..6ae94a8e653
--- /dev/null
+++ b/src/fsharp/fsi/app.config
@@ -0,0 +1,16 @@
+<?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>
+        <dependentAssembly>
+          <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+          <bindingRedirect oldVersion="1.0.0.0-1.2.0.0" newVersion="1.2.1.0" />
+        </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj b/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
index fe7ee65fc57..0e8d910cb99 100644
--- a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
+++ b/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
@@ -40,10 +40,7 @@
     <Compile Include="..\fsi\fsimain.fs">
       <Link>fsimain.fs</Link>
     </Compile>
-    <None Include="..\fsi\fsiAnyCpu.exe.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>fsiAnyCpu.exe.config</Link>
-    </None>
+    <None Include="app.config" />
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
   <ItemGroup>
diff --git a/src/fsharp/fsi/fsiAnyCpu.exe.config b/src/fsharp/fsiAnyCpu/app.config
similarity index 100%
rename from src/fsharp/fsi/fsiAnyCpu.exe.config
rename to src/fsharp/fsiAnyCpu/app.config
diff --git a/tests/fsharpqa/testenv/src/HostedCompilerServer/App.config b/tests/fsharpqa/testenv/src/HostedCompilerServer/App.config
index f888c777ac1..885af92830a 100644
--- a/tests/fsharpqa/testenv/src/HostedCompilerServer/App.config
+++ b/tests/fsharpqa/testenv/src/HostedCompilerServer/App.config
@@ -6,5 +6,15 @@
     <runtime>
         <gcServer enabled="true"/>
         <gcConcurrent enabled="false"/>
+        <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>
+            <dependentAssembly>
+            <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+            <bindingRedirect oldVersion="1.0.0.0-1.2.0.0" newVersion="1.2.1.0" />
+            </dependentAssembly>
+        </assemblyBinding>
     </runtime>
 </configuration>
\ No newline at end of file

From ef9321cfa1bdd306b54c939134895636be7ef8cc Mon Sep 17 00:00:00 2001
From: dsyme <dsyme@MSRC-4079076>
Date: Tue, 26 Sep 2017 15:59:35 +0100
Subject: [PATCH 3/3] fix build

---
 FSharp.sln                                | 13 -------------
 src/fsharp/Fsc/Fsc.BuildFromSource.fsproj |  5 +----
 src/fsharp/fsi/Fsi.BuildFromSource.fsproj |  5 +----
 src/fsharp/fsi/fsi.exe.config             | 16 ----------------
 4 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 src/fsharp/fsi/fsi.exe.config

diff --git a/FSharp.sln b/FSharp.sln
index f4ac69591e4..bfa07b6d43d 100644
--- a/FSharp.sln
+++ b/FSharp.sln
@@ -205,18 +205,6 @@ Global
 		{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.ActiveCfg = Release|Any CPU
 		{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.Build.0 = Release|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.Build.0 = Debug|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.Build.0 = Proto|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.ActiveCfg = Proto|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.Build.0 = Proto|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.ActiveCfg = Release|Any CPU
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -235,6 +223,5 @@ Global
 		{88E2D422-6852-46E3-A740-83E391DC7973} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
 		{4239EFEA-E746-446A-BF7A-51FCBAB13946} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
 		{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
-		{A437A6EC-5323-47C2-8F86-E2CAC54FF152} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
 	EndGlobalSection
 EndGlobal
diff --git a/src/fsharp/Fsc/Fsc.BuildFromSource.fsproj b/src/fsharp/Fsc/Fsc.BuildFromSource.fsproj
index 9a04c0229ab..56ed5301e30 100644
--- a/src/fsharp/Fsc/Fsc.BuildFromSource.fsproj
+++ b/src/fsharp/Fsc/Fsc.BuildFromSource.fsproj
@@ -22,10 +22,7 @@
     <Compile Include="..\fscmain.fs">
       <Link>fscmain.fs</Link>
     </Compile>
-    <None Include="fsc.exe.config">
-      <Link>fsc.exe.config</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <None Include="app.config" />
     <None Include="..\..\windows\default.win32manifest">
       <Link>default.win32manifest</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/fsharp/fsi/Fsi.BuildFromSource.fsproj b/src/fsharp/fsi/Fsi.BuildFromSource.fsproj
index f94903db324..37ce88c36d7 100644
--- a/src/fsharp/fsi/Fsi.BuildFromSource.fsproj
+++ b/src/fsharp/fsi/Fsi.BuildFromSource.fsproj
@@ -26,10 +26,7 @@
     <Compile Include="fsimain.fs">
       <Link>fsimain.fs</Link>
     </Compile>
-    <None Include="fsi.exe.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>fsi.exe.config</Link>
-    </None>
+    <None Include="app.config" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/fsharp/fsi/fsi.exe.config b/src/fsharp/fsi/fsi.exe.config
deleted file mode 100644
index 6ae94a8e653..00000000000
--- a/src/fsharp/fsi/fsi.exe.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-        <dependentAssembly>
-          <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-          <bindingRedirect oldVersion="1.0.0.0-1.2.0.0" newVersion="1.2.1.0" />
-        </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>