From 3d3e0837a66a3de75885e882d544b39fb855e0d9 Mon Sep 17 00:00:00 2001
From: Don Syme <donsyme@fastmail.fm>
Date: Tue, 8 Nov 2016 21:36:47 +0000
Subject: [PATCH] remove a directory and a file

---
 ...yinfo.FSharp.Compiler.Server.Shared.dll.fs | 24 -------------------
 .../AssemblyInfo.fs                           | 16 +++++++++++--
 .../FSharp.Compiler.Server.Shared.fsproj      |  7 +-----
 .../FSharpInteractiveServer.fs}               |  0
 src/fsharp/fsiserver/FSServerShared.txt       |  1 -
 5 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs
 rename src/fsharp/{fsiserver/fsiserver.fs => FSharp.Compiler.Server.Shared/FSharpInteractiveServer.fs} (100%)
 delete mode 100644 src/fsharp/fsiserver/FSServerShared.txt

diff --git a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs
deleted file mode 100644
index c7133d838db..00000000000
--- a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-
-namespace Microsoft.FSharp
-open System.Reflection
-open System.Runtime.InteropServices
-
-[<assembly:AssemblyDescription("FSharp.Compiler.Server.Shared.dll")>]
-[<assembly:AssemblyCompany("Microsoft Corporation")>]
-[<assembly:AssemblyTitle("FSharp.Compiler.Server.Shared.dll")>]
-[<assembly:AssemblyCopyright("\169 Microsoft Corporation.  Apache 2.0 License.")>]
-[<assembly:AssemblyProduct("Microsoft\174 F#")>]
-[<assembly:ComVisible(false)>]
-
-#if NO_STRONG_NAMES
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi")>]
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu")>]
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.VS.FSI")>]
-#endif
-#if STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
-[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.VS.FSI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
-#endif
-do()
diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs b/src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs
index 2d4f36875d2..6097b487ca6 100644
--- a/src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs
+++ b/src/fsharp/FSharp.Compiler.Server.Shared/AssemblyInfo.fs
@@ -3,17 +3,29 @@
 namespace Microsoft.FSharp
 
 open System.Reflection
-
+open System.Runtime.InteropServices
+#if NO_STRONG_NAMES
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.VS.FSI")>]
+#endif
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.VS.FSI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
 do()
 
+[<assembly:AssemblyDescription("FSharp.Compiler.Server.Shared.dll")>]
+[<assembly:AssemblyCompany("Microsoft Corporation")>]
+[<assembly:AssemblyTitle("FSharp.Compiler.Server.Shared.dll")>]
+[<assembly:AssemblyCopyright("\169 Microsoft Corporation.  Apache 2.0 License.")>]
+[<assembly:AssemblyProduct("Microsoft\174 F#")>]
+[<assembly:ComVisible(false)>]
+do()
+
 #if !CROSS_PLATFORM_COMPILER
 // This Visual Studio-specific attribute is needed on this DLL because for historical reasons it shipped as part of the Visual F# IDE Tools rather than this F# SDK
 open Microsoft.VisualStudio.Shell
 [<assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\FSharp.Compiler.Server.Shared.dll")>]
 #endif
-
 do()
 
diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
index ccd4ed6dbda..a7cd74fa2e6 100644
--- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
+++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
@@ -22,12 +22,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs">
-      <Link>assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs</Link>
-    </Compile>
-    <Compile Include="..\fsiserver\fsiserver.fs">
-      <Link>fsiserver.fs</Link>
-    </Compile>
+    <Compile Include="FSharpInteractiveServer.fs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'coreclr'">
       <None Include="project.json" />
diff --git a/src/fsharp/fsiserver/fsiserver.fs b/src/fsharp/FSharp.Compiler.Server.Shared/FSharpInteractiveServer.fs
similarity index 100%
rename from src/fsharp/fsiserver/fsiserver.fs
rename to src/fsharp/FSharp.Compiler.Server.Shared/FSharpInteractiveServer.fs
diff --git a/src/fsharp/fsiserver/FSServerShared.txt b/src/fsharp/fsiserver/FSServerShared.txt
deleted file mode 100644
index d96fff0ad73..00000000000
--- a/src/fsharp/fsiserver/FSServerShared.txt
+++ /dev/null
@@ -1 +0,0 @@
-# FS Server.Shared resource strings
\ No newline at end of file