coreclr target for FSharp.LanguageService.Compiler

src/absil/il.fs

@@ -1,6 +1,6 @@
 // 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.
 
-module internal Microsoft.FSharp.Compiler.AbstractIL.IL
+module (*internal*) Microsoft.FSharp.Compiler.AbstractIL.IL
 
 #nowarn "49"
 #nowarn "44" // This construct is deprecated. please use List.item

src/absil/il.fsi

@@ -2,7 +2,7 @@
 
 /// The "unlinked" view of .NET metadata and code.  Central to 
 ///  to Abstract IL library
-module internal Microsoft.FSharp.Compiler.AbstractIL.IL 
+module (*internal*) Microsoft.FSharp.Compiler.AbstractIL.IL 
 
 open Internal.Utilities
 open System.Collections.Generic
@@ -378,7 +378,7 @@ and ILTypes = ILList<ILType>
 
 
 [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
-module ILList = 
+module internal ILList = 
     val inline map : ('T -> 'U) -> ILList<'T> -> ILList<'U>
     val inline mapi : (int -> 'T -> 'U) -> ILList<'T> -> ILList<'U>
     val inline isEmpty : ILList<'T> -> bool

src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj

@@ -21,7 +21,11 @@
     <ProjectGuid>{a437a6ec-5323-47c2-8f86-e2cac54ff152}</ProjectGuid>
     <AllowCrossTargeting>true</AllowCrossTargeting>
     <BaseAddress>0x06800000</BaseAddress>
+    <OtherFlags Condition=" '$(TargetFramework)'=='coreclr'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
   </PropertyGroup>
+  <!-- References -->
+  <Import Project="$(FSharpSourcesRoot)\.nuget\NuGet.targets" Condition="Exists('$(FSharpSourcesRoot)\.nuget\NuGet.targets')" />
+  <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
   <ItemGroup>
     <FilesToLocalize Include="$(OutDir)$(AssemblyName).dll">
       <TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
@@ -31,6 +35,9 @@
     </FilesToLocalize>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.dll.fs">
+      <Link>assemblyinfo.FSharp.Compiler.dll.fs</Link>
+    </Compile>
     <FsSrGen Include="..\FSComp.txt">
       <Link>FSComp.txt</Link>
     </FsSrGen>
@@ -40,10 +47,9 @@
     <Compile Include="..\..\utils\reshapedreflection.fs">
       <Link>Reflection\reshapedreflection.fs</Link>
     </Compile>
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.dll.fs">
-      <Link>assemblyinfo.FSharp.Compiler.dll.fs</Link>
+    <Compile Include="..\..\utils\reshapedmsbuild.fs">
+      <Link>Reflection\reshapedmsbuild.fs</Link>
     </Compile>
-    <Compile Include="InternalsVisibleTo.fs" />
     <Compile Include="..\..\utils\sformat.fsi">
       <Link>ErrorText\sformat.fsi</Link>
     </Compile>
@@ -198,6 +204,9 @@
     <Compile Include="..\..\absil\ilmorph.fs">
       <Link>AbsIL/ilmorph.fs</Link>
     </Compile>
+    <Compile Include="..\..\absil\ilsign.fs" Condition=" '$(TargetFramework)'=='coreclr'">
+      <Link>AbsIL\ilsign.fs</Link>
+    </Compile>
     <Compile Include="..\..\absil\ilsupp.fsi">
       <Link>AbsIL/ilsupp.fsi</Link>
     </Compile>
@@ -491,6 +500,12 @@
     <Compile Include="..\vs\Symbols.fs">
       <Link>Service/Symbols.fs</Link>
     </Compile>
+    <Compile Include="..\vs\Exprs.fsi">
+      <Link>Service/Exprs.fsi</Link>
+    </Compile>
+    <Compile Include="..\vs\Exprs.fs">
+      <Link>Service/Exprs.fs</Link>
+    </Compile>
     <Compile Include="..\vs\ServiceLexing.fsi">
       <Link>Service/ServiceLexing.fsi</Link>
     </Compile>
@@ -524,8 +539,14 @@
     <Compile Include="..\vs\service.fs">
       <Link>Service/service.fs</Link>
     </Compile>
+    <Compile Include="InternalsVisibleTo.fs" Condition="'$(TargetFramework)' != 'coreclr'">
+      <Link>InternalsVisibleTo.fs</Link>
+    </Compile>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'coreclr'">
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'coreclr'">
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -543,6 +564,8 @@
     <Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader\1.0.7\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
     <Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.3.0-beta-23816\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
     <Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0-rc3-23805\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
       <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
       <Name>FSharp.Core</Name>

src/fsharp/FSharp.LanguageService.Compiler/project.json

@@ -0,0 +1,38 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
+    "NETStandard.Library": "1.5.0-rc2-23911",
+    "System.Collections.Immutable":"1.2.0-rc2-23911",
+    "System.Diagnostics.Process": "4.1.0-rc2-23911",
+    "System.Diagnostics.TraceSource": "4.0.0-rc2-23911",
+    "System.Linq.Expressions": "4.0.11-rc2-23911",
+    "System.Linq.Queryable": "4.0.1-rc2-23911",
+    "System.Net.Requests": "4.0.11-rc2-23911",
+    "System.Reflection.Emit": "4.0.1-rc2-23911",
+    "System.Reflection.Emit.ILGeneration": "4.0.1-rc2-23911",
+    "System.Reflection.Metadata": "1.3.0-rc2-23911",
+    "System.Reflection.TypeExtensions": "4.1.0-rc2-23911",
+    "System.Runtime.InteropServices": "4.1.0-rc2-23911",
+    "System.Runtime.InteropServices.PInvoke": "4.0.0-rc2-23911",
+    "System.Runtime.Loader": "4.0.0-rc2-23911",
+    "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23911",
+    "System.Security.Cryptography.Primitives": "4.0.0-rc2-23911",
+    "System.Threading.Tasks.Parallel": "4.0.1-rc2-23911",
+    "System.Threading.Thread": "4.0.0-rc2-23911",
+    "System.Threading.ThreadPool": "4.0.10-rc2-23911",
+    "Microsoft.DiaSymReader.PortablePdb": "1.0.0-rc-60301",
+    "Microsoft.DiaSymReader": "1.0.7",
+  },
+  "runtimes": {
+    "win7-x86": { },
+    "win7-x64": { },
+    "osx.10.10-x64": { },
+    "ubuntu.14.04-x64": { }
+  },
+  "frameworks": {
+    "dnxcore50": {
+      "imports": "portable-net45+win8"
+    }
+  }
+}
+

src/fsharp/ast.fs

@@ -1,6 +1,6 @@
 // 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.
 
-module internal Microsoft.FSharp.Compiler.Ast
+module (*internal*) Microsoft.FSharp.Compiler.Ast
 
 open System.Collections.Generic
 open Internal.Utilities

src/fsharp/range.fs

@@ -1,7 +1,7 @@
 // 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.
 
 /// Anything to do with special names of identifiers and other lexical rules 
-module internal Microsoft.FSharp.Compiler.Range
+module (*internal*) Microsoft.FSharp.Compiler.Range
 
 open System.IO
 open System.Collections.Generic

src/fsharp/range.fsi

@@ -1,6 +1,6 @@
 // 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.
 
-module internal Microsoft.FSharp.Compiler.Range
+module (*internal*) Microsoft.FSharp.Compiler.Range
 
 open System.Text
 open System.Collections.Generic