From bd64dccfc42bf3c088aacb352b1d58de05c4da11 Mon Sep 17 00:00:00 2001
From: Alfonso Garcia-Caro <alfonso.garcia-caro@hotmail.com>
Date: Thu, 7 Jul 2016 14:10:58 +0200
Subject: [PATCH] Fix FSharp.Compiler.Service.fsproj

---
 .../FSharp.Compiler.Service.fsproj            | 521 ++++++++++--------
 1 file changed, 296 insertions(+), 225 deletions(-)

diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
index df23ef2b0b..82892fdafb 100644
--- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
+++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -1,249 +1,286 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+# Copyright (c) 2002-2011 Microsoft Corporation. 
+#
+# 
+# 
+# 
+#
+#
+# You must not remove this notice, or any other, from this software.
+-->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Name />
-    <AssemblyName>FSharp.Compiler.Service</AssemblyName>
-    <RootNamespace />
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion />
-    <ProjectGuid>2e4d67b4-522d-4cf7-97e4-ba940f0b18f3</ProjectGuid>
-    <ProjectType />
     <OutputType>Library</OutputType>
+    <AssemblyName>FSharp.Compiler.Service</AssemblyName>
+    <NoWarn>$(NoWarn);44;62;9</NoWarn>
+    <ProjectGuid>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</ProjectGuid>
+    <AllowCrossTargeting>true</AllowCrossTargeting>
     <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <AutoGenerateBindingRedirects />
-    <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
+    <BaseAddress>0x06800000</BaseAddress>
+    <OtherFlags>$(OtherFlags) /warnon:1182</OtherFlags>
+    <Tailcalls>true</Tailcalls>
+    <FsLexUnicode>true</FsLexUnicode>
+    <OtherFlags>$(OtherFlags) --times</OtherFlags>
+    <NoWarn>$(NoWarn);69;65;54;61;75</NoWarn>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\bin\$(TargetFrameworkVersion)</OutputPath>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
+    <DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
+    <DefineConstants Condition="$(TargetFrameworkVersion) == 'v4.5'">$(DefineConstants);FX_ATLEAST_45</DefineConstants>
+    <DefineConstants Condition="$(TargetFrameworkVersion) == 'v4.0'">$(DefineConstants);FX_NO_GENERIC_WEAKREFERENCE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
+    <DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
+    <DefineConstants>$(DefineConstants);TYPE_PROVIDER_SECURITY</DefineConstants>
+    <DefineConstants>$(DefineConstants);EXTENSIBLE_DUMPER</DefineConstants>
+    <DefineConstants>$(DefineConstants);INCLUDE_METADATA_WRITER</DefineConstants>
+    <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
+    <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_MSBUILDRESOLVER_RUNTIMELIKE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_LCIDFROMCODEPAGE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_RESX_RESOURCE_READER</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_RESIDENT_COMPILER</DefineConstants>
+    <DefineConstants>$(DefineConstants);SHADOW_COPY_REFERENCES</DefineConstants>
+    <DefineConstants>$(DefineConstants);EXTENSIONTYPING</DefineConstants>
+    <DefineConstants>$(DefineConstants);COMPILER_SERVICE_ASSUMES_FSHARP_CORE_4_4_0_0</DefineConstants>
+    <DefineConstants>$(DefineConstants);COMPILER_SERVICE</DefineConstants>
+    <DefineConstants>$(DefineConstants);NO_STRONG_NAMES</DefineConstants>
+    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
+    <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\..\..\</SolutionDir>
+    <TargetFrameworkProfile />
   </PropertyGroup>
+  <PropertyGroup>
+    <FsLexYaccPath>$(SolutionDir)lib\bootstrap\4.0</FsLexYaccPath>
+    <FsSrGenToolPath>$(SolutionDir)packages\FsSrGen\lib\net46</FsSrGenToolPath>
+    <FsLexToolPath>$(FsLexYaccPath)</FsLexToolPath>
+    <FsYaccToolPath>$(FsLexYaccPath)</FsYaccToolPath>
+    <FsLexToolExe>fslex.exe</FsLexToolExe>
+    <FsYaccToolExe>fsyacc.exe</FsYaccToolExe>
+    <EnsureThereAreNoUnusedFsSrGenResources>false</EnsureThereAreNoUnusedFsSrGenResources>
+  </PropertyGroup>
+  <!-- MonoDevelop likes these here to recognise the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols />
-    <DebugType />
+    <DefineConstants>DEBUG; $(DefineConstants)</DefineConstants>
     <Optimize>false</Optimize>
-    <Tailcalls />
-    <OutputPath />
-    <DefineConstants>DEBUG $(DefineConstants)</DefineConstants>
-    <WarningLevel />
+    <OtherFlags>$(OtherFlags) --no-jit-optimize --jit-tracking</OtherFlags>
+    <DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.xml</DocumentationFile>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>true</Prefer32Bit>
-    <OtherFlags>$(OtherFlags) --no-jit-optimize --jit-tracking</OtherFlags>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols />
-    <DebugType />
     <Optimize>true</Optimize>
-    <Tailcalls />
-    <OutputPath />
-    <DefineConstants />
-    <WarningLevel />
+    <DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.xml</DocumentationFile>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>true</Prefer32Bit>
-    <OtherFlags />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0' OR '$(VisualStudioVersion)' == '11.0'">
-    <DebugSymbols />
-    <DebugType />
-    <Optimize />
-    <Tailcalls />
-    <OutputPath />
-    <DefineConstants />
-    <WarningLevel />
-    <PlatformTarget />
-    <Prefer32Bit />
-    <OtherFlags />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="Microsoft.Build.Tasks.v4.0" />
-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Compile Include="../../assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs">
+    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.dll.fs">
       <Link>AssemblyInfo/assemblyinfo.FSharp.Compiler.Service.dll.fs</Link>
     </Compile>
-    <Compile Include="../../assemblyinfo/assemblyinfo.shared.fs">
+    <Compile Include="..\..\assemblyinfo\assemblyinfo.shared.fs" Condition="Exists('..\..\assemblyinfo\assemblyinfo.shared.fs')">
       <Link>AssemblyInfo/assemblyinfo.shared.fs</Link>
     </Compile>
-    <Compile Include="$(IntermediateOutputPath)/FSComp.fs" />
-    <Compile Include="$(IntermediateOutputPath)/FSIstrings.fs" />
-    <EmbeddedResource Include="../FSStrings.resx">
+    <FsSrGen Include="..\FSComp.txt" Condition="'$(NoFsSrGenTask)' != 'true'">
+      <Link>FSComp.txt</Link>
+    </FsSrGen>
+    <FsSrGen Include="..\fsi\FSIstrings.txt" Condition="'$(NoFsSrGenTask)' != 'true'">
+      <Link>FSIstrings.txt</Link>
+    </FsSrGen>
+    <Compile Include="$(IntermediateOutputPath)\FSComp.fs" Condition="'$(NoFsSrGenTask)' == 'true'" />
+    <Compile Include="$(IntermediateOutputPath)\FSIstrings.fs" Condition="'$(NoFsSrGenTask)' == 'true'" />
+    <EmbeddedResource Include="..\FSStrings.resx">
       <Link>FSStrings.resx</Link>
     </EmbeddedResource>
-    <Compile Include="../../utils/reshapedreflection.fs">
+    <FsLex Include="..\lex.fsl">
+      <OtherFlags>--lexlib Internal.Utilities.Text.Lexing</OtherFlags>
+      <Link>lex.fsl</Link>
+    </FsLex>
+    <FsLex Include="..\..\absil\illex.fsl">
+      <OtherFlags>--lexlib Internal.Utilities.Text.Lexing</OtherFlags>
+      <Link>illex.fsl</Link>
+    </FsLex>
+    <FsYacc Include="..\..\absil\ilpars.fsy">
+      <Module>Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser</Module>
+      <Open>Microsoft.FSharp.Compiler.AbstractIL</Open>
+      <OtherFlags>--internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
+      <Link>ilpars.fsy</Link>
+    </FsYacc>
+    <FsYacc Include="..\pars.fsy">
+      <Module>Microsoft.FSharp.Compiler.Parser</Module>
+      <Open>Microsoft.FSharp.Compiler</Open>
+      <OtherFlags>--internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
+      <Link>pars.fsy</Link>
+    </FsYacc>
+    <Compile Include="..\..\utils\reshapedreflection.fs">
       <Link>Reshaped/reshapedreflection.fs</Link>
     </Compile>
-    <Compile Include="../../utils/reshapedmsbuild.fs">
+    <Compile Include="..\..\utils\reshapedmsbuild.fs">
       <Link>Reshaped/reshapedmsbuild.fs</Link>
     </Compile>
-    <Compile Include="../../utils/sformat.fsi">
+    <Compile Include="..\..\utils\sformat.fsi">
       <Link>ErrorText/sformat.fsi</Link>
     </Compile>
-    <Compile Include="../../utils/sformat.fs">
+    <Compile Include="..\..\utils\sformat.fs">
       <Link>ErrorText/sformat.fs</Link>
     </Compile>
-    <Compile Include="../sr.fsi">
+    <Compile Include="..\sr.fsi">
       <Link>ErrorText/sr.fsi</Link>
     </Compile>
-    <Compile Include="../sr.fs">
+    <Compile Include="..\sr.fs">
       <Link>ErrorText/sr.fs</Link>
     </Compile>
-    <Compile Include="../../utils/prim-lexing.fsi">
+    <Compile Include="..\..\utils\prim-lexing.fsi">
       <Link>LexYaccRuntime/prim-lexing.fsi</Link>
     </Compile>
-    <Compile Include="../../utils/prim-lexing.fs">
+    <Compile Include="..\..\utils\prim-lexing.fs">
       <Link>LexYaccRuntime/prim-lexing.fs</Link>
     </Compile>
-    <Compile Include="../../utils/prim-parsing.fsi">
+    <Compile Include="..\..\utils\prim-parsing.fsi">
       <Link>LexYaccRuntime/prim-parsing.fsi</Link>
     </Compile>
-    <Compile Include="../../utils/prim-parsing.fs">
+    <Compile Include="..\..\utils\prim-parsing.fs">
       <Link>LexYaccRuntime/prim-parsing.fs</Link>
     </Compile>
-    <Compile Include="../../utils/ResizeArray.fsi">
-      <Link>Utilities/ResizeArray.fsi</Link>
+    <Compile Include="..\..\utils\ResizeArray.fsi">
+      <Link>Utilities\ResizeArray.fsi</Link>
     </Compile>
-    <Compile Include="../../utils/ResizeArray.fs">
-      <Link>Utilities/ResizeArray.fs</Link>
+    <Compile Include="..\..\utils\ResizeArray.fs">
+      <Link>Utilities\ResizeArray.fs</Link>
     </Compile>
-    <Compile Include="../../utils/HashMultiMap.fsi">
+    <Compile Include="..\..\utils\HashMultiMap.fsi">
       <Link>Utilities/HashMultiMap.fsi</Link>
     </Compile>
-    <Compile Include="../../utils/HashMultiMap.fs">
+    <Compile Include="..\..\utils\HashMultiMap.fs">
       <Link>Utilities/HashMultiMap.fs</Link>
     </Compile>
-    <Compile Include="../../utils/EditDistance.fs">
-      <Link>Utilities/EditDistance.fs</Link>
+    <Compile Include="..\..\utils\EditDistance.fs">
+      <Link>Utilities\EditDistance.fs</Link>
     </Compile>
-    <Compile Include="../../utils/TaggedCollections.fsi">
+    <Compile Include="..\..\utils\TaggedCollections.fsi">
       <Link>Utilities/TaggedCollections.fsi</Link>
     </Compile>
-    <Compile Include="../../utils/TaggedCollections.fs">
+    <Compile Include="..\..\utils\TaggedCollections.fs">
       <Link>Utilities/TaggedCollections.fs</Link>
     </Compile>
-    <Compile Include="../FlatList.fs">
+    <Compile Include="..\FlatList.fs">
       <Link>Utilities/FlatList.fs</Link>
     </Compile>
-    <Compile Include="../QueueList.fs">
+    <Compile Include="..\QueueList.fs">
       <Link>Utilities/QueueList.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ildiag.fsi">
+    <Compile Include="..\..\absil\ildiag.fsi">
       <Link>Utilities/ildiag.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/ildiag.fs">
+    <Compile Include="..\..\absil\ildiag.fs">
       <Link>Utilities/ildiag.fs</Link>
     </Compile>
-    <Compile Include="../../absil/illib.fs">
+    <Compile Include="..\..\absil\illib.fs">
       <Link>Utilities/illib.fs</Link>
     </Compile>
-    <Compile Include="../../utils/filename.fsi">
+    <Compile Include="..\..\utils\filename.fsi">
       <Link>Utilities/filename.fsi</Link>
     </Compile>
-    <Compile Include="../../utils/filename.fs">
+    <Compile Include="..\..\utils\filename.fs">
       <Link>Utilities/filename.fs</Link>
     </Compile>
-    <Compile Include="../../absil/zmap.fsi">
+    <Compile Include="..\..\absil\zmap.fsi">
       <Link>Utilities/zmap.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/zmap.fs">
+    <Compile Include="..\..\absil\zmap.fs">
       <Link>Utilities/zmap.fs</Link>
     </Compile>
-    <Compile Include="../../absil/zset.fsi">
+    <Compile Include="..\..\absil\zset.fsi">
       <Link>Utilities/zset.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/zset.fs">
+    <Compile Include="..\..\absil\zset.fs">
       <Link>Utilities/zset.fs</Link>
     </Compile>
-    <Compile Include="../../absil/bytes.fsi">
+    <Compile Include="..\..\absil\bytes.fsi">
       <Link>Utilities/bytes.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/bytes.fs">
+    <Compile Include="..\..\absil\bytes.fs">
       <Link>Utilities/bytes.fs</Link>
     </Compile>
-    <Compile Include="../lib.fs">
+    <Compile Include="..\lib.fs">
       <Link>Utilities/lib.fs</Link>
     </Compile>
-    <Compile Include="../ErrorResolutionHints.fs">
+    <Compile Include="..\ErrorResolutionHints.fs">
       <Link>Utilities/ErrorResolutionHints.fs</Link>
     </Compile>
-    <Compile Include="../InternalCollections.fsi">
+    <Compile Include="..\InternalCollections.fsi">
       <Link>Utilities/InternalCollections.fsi</Link>
     </Compile>
-    <Compile Include="../InternalCollections.fs">
+    <Compile Include="..\InternalCollections.fs">
       <Link>Utilities/InternalCollections.fs</Link>
     </Compile>
-    <Compile Include="../rational.fsi">
+    <Compile Include="..\rational.fsi">
       <Link>Utilities/rational.fsi</Link>
     </Compile>
-    <Compile Include="../rational.fs">
+    <Compile Include="..\rational.fs">
       <Link>Utilities/rational.fs</Link>
     </Compile>
-    <Compile Include="../TraceCall.fsi">
+    <Compile Include="..\TraceCall.fsi">
       <Link>Utilities/TraceCall.fsi</Link>
     </Compile>
-    <Compile Include="../TraceCall.fs">
+    <Compile Include="..\TraceCall.fs">
       <Link>Utilities/TraceCall.fs</Link>
     </Compile>
-    <Compile Include="../range.fsi">
+    <Compile Include="..\range.fsi">
       <Link>ErrorLogging/range.fsi</Link>
     </Compile>
-    <Compile Include="../range.fs">
+    <Compile Include="..\range.fs">
       <Link>ErrorLogging/range.fs</Link>
     </Compile>
-    <Compile Include="../ErrorLogger.fs">
+    <Compile Include="..\ErrorLogger.fs">
       <Link>ErrorLogging/ErrorLogger.fs</Link>
     </Compile>
-    <Compile Include="../ReferenceResolution.fsi">
+    <Compile Include="..\ReferenceResolution.fsi">
       <Link>ReferenceResolution/ReferenceResolution.fsi</Link>
     </Compile>
-    <Compile Include="../ReferenceResolution.fs">
+    <Compile Include="..\ReferenceResolution.fs">
       <Link>ReferenceResolution/ReferenceResolution.fs</Link>
     </Compile>
-    <Compile Include="../../absil/il.fsi">
+    <FsLex Include="..\..\absil\illex.fsl">
+      <OtherFlags>--lexlib Internal.Utilities.Text.Lexing</OtherFlags>
+      <Link>AbsIL/illex.fsl</Link>
+    </FsLex>
+    <Compile Include="..\..\absil\il.fsi">
       <Link>AbsIL/il.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/il.fs">
+    <Compile Include="..\..\absil\il.fs">
       <Link>AbsIL/il.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ilx.fsi">
+    <Compile Include="..\..\absil\ilx.fsi">
       <Link>AbsIL/ilx.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/ilx.fs">
+    <Compile Include="..\..\absil\ilx.fs">
       <Link>AbsIL/ilx.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ilascii.fsi">
+    <Compile Include="..\..\absil\ilascii.fsi">
       <Link>AbsIL/ilascii.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/ilascii.fs">
+    <Compile Include="..\..\absil\ilascii.fs">
       <Link>AbsIL/ilascii.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ilprint.fsi">
+    <Compile Include="..\..\absil\ilprint.fsi">
       <Link>AbsIL/ilprint.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/ilprint.fs">
+    <Compile Include="..\..\absil\ilprint.fs">
       <Link>AbsIL/ilprint.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ilmorph.fsi">
+    <Compile Include="..\..\absil\ilmorph.fsi">
       <Link>AbsIL/ilmorph.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/ilmorph.fs">
+    <Compile Include="..\..\absil\ilmorph.fs">
       <Link>AbsIL/ilmorph.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ilsupp.fsi">
+    <Compile Include="..\..\absil\ilsupp.fsi">
       <Link>AbsIL/ilsupp.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/ilsupp.fs">
+    <Compile Include="..\..\absil\ilsupp.fs">
       <Link>AbsIL/ilsupp.fs</Link>
     </Compile>
     <Compile Include="ilpars.fs">
@@ -252,67 +289,81 @@
     <Compile Include="illex.fs">
       <Link>AbsIL/illex.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ilbinary.fsi">
+    <Compile Include="..\..\absil\ilbinary.fsi">
       <Link>AbsIL/ilbinary.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/ilbinary.fs">
+    <Compile Include="..\..\absil\ilbinary.fs">
       <Link>AbsIL/ilbinary.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ilread.fsi">
+    <Compile Include="..\..\absil\ilread.fsi">
       <Link>AbsIL/ilread.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/ilread.fs">
+    <Compile Include="..\..\absil\ilread.fs">
       <Link>AbsIL/ilread.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ilwritepdb.fsi">
+    <Compile Include="..\..\absil\ilwritepdb.fsi">
       <Link>AbsIL/ilwritepdb.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/ilwritepdb.fs">
+    <Compile Include="..\..\absil\ilwritepdb.fs">
       <Link>AbsIL/ilwritepdb.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ilwrite.fsi">
+    <Compile Include="..\..\absil\ilwrite.fsi">
       <Link>AbsIL/ilwrite.fsi</Link>
     </Compile>
-    <Compile Include="../../absil/ilwrite.fs">
+    <Compile Include="..\..\absil\ilwrite.fs">
       <Link>AbsIL/ilwrite.fs</Link>
     </Compile>
-    <Compile Include="../../absil/ilreflect.fs">
+    <Compile Include="..\..\absil\ilreflect.fs">
       <Link>AbsIL/ilreflect.fs</Link>
     </Compile>
-    <Compile Include="../../utils/CompilerLocationUtils.fs">
+    <Compile Include="..\..\utils\CompilerLocationUtils.fs">
       <Link>CompilerLocation/CompilerLocationUtils.fs</Link>
     </Compile>
-    <Compile Include="../PrettyNaming.fs">
+    <Compile Include="..\PrettyNaming.fs">
       <Link>PrettyNaming/PrettyNaming.fs</Link>
     </Compile>
-    <Compile Include="../../ilx/ilxsettings.fs">
+    <Compile Include="..\..\ilx\ilxsettings.fs">
       <Link>ILXErase/ilxsettings.fs</Link>
     </Compile>
-    <Compile Include="../../ilx/EraseClosures.fsi">
+    <Compile Include="..\..\ilx\EraseClosures.fsi">
       <Link>ILXErase/EraseClosures.fsi</Link>
     </Compile>
-    <Compile Include="../../ilx/EraseClosures.fs">
+    <Compile Include="..\..\ilx\EraseClosures.fs">
       <Link>ILXErase/EraseClosures.fs</Link>
     </Compile>
-    <Compile Include="../../ilx/EraseUnions.fsi">
+    <Compile Include="..\..\ilx\EraseUnions.fsi">
       <Link>ILXErase/EraseUnions.fsi</Link>
     </Compile>
-    <Compile Include="../../ilx/EraseUnions.fs">
+    <Compile Include="..\..\ilx\EraseUnions.fs">
       <Link>ILXErase/EraseUnions.fs</Link>
     </Compile>
-    <Compile Include="../UnicodeLexing.fsi">
+    <FsLex Include="..\lex.fsl">
+      <OtherFlags>--lexlib Internal.Utilities.Text.Lexing</OtherFlags>
+      <Link>ParserAndUntypedAST/lex.fsl</Link>
+    </FsLex>
+    <FsLex Include="..\pplex.fsl">
+      <OtherFlags>--lexlib Internal.Utilities.Text.Lexing</OtherFlags>
+      <Link>ParserAndUntypedAST/pplex.fsl</Link>
+    </FsLex>
+    <FsYacc Include="..\pppars.fsy">
+      <Module>Microsoft.FSharp.Compiler.PPParser</Module>
+      <Open>Microsoft.FSharp.Compiler</Open>
+      <OtherFlags>--internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
+      <Link>ParserAndUntypedAST/pppars.fsy</Link>
+    </FsYacc>
+    <Compile Include="..\UnicodeLexing.fsi">
       <Link>ParserAndUntypedAST/UnicodeLexing.fsi</Link>
     </Compile>
-    <Compile Include="../UnicodeLexing.fs">
+    <Compile Include="..\UnicodeLexing.fs">
       <Link>ParserAndUntypedAST/UnicodeLexing.fs</Link>
     </Compile>
-    <Compile Include="../layout.fsi">
+    <Compile Include="..\layout.fsi">
       <Link>ParserAndUntypedAST/layout.fsi</Link>
     </Compile>
-    <Compile Include="../layout.fs">
+    <Compile Include="..\layout.fs">
       <Link>ParserAndUntypedAST/layout.fs</Link>
     </Compile>
-    <Compile Include="../ast.fs">
+    <Compile Include="..\ast.fs">
       <Link>ParserAndUntypedAST/ast.fs</Link>
     </Compile>
     <Compile Include="pppars.fs">
@@ -321,10 +372,10 @@
     <Compile Include="pars.fs">
       <Link>ParserAndUntypedAST/pars.fs</Link>
     </Compile>
-    <Compile Include="../lexhelp.fsi">
+    <Compile Include="..\lexhelp.fsi">
       <Link>ParserAndUntypedAST/lexhelp.fsi</Link>
     </Compile>
-    <Compile Include="../lexhelp.fs">
+    <Compile Include="..\lexhelp.fs">
       <Link>ParserAndUntypedAST/lexhelp.fs</Link>
     </Compile>
     <Compile Include="pplex.fs">
@@ -333,258 +384,278 @@
     <Compile Include="lex.fs">
       <Link>ParserAndUntypedAST/lex.fs</Link>
     </Compile>
-    <Compile Include="../LexFilter.fs">
+    <Compile Include="..\LexFilter.fs">
       <Link>ParserAndUntypedAST/LexFilter.fs</Link>
     </Compile>
-    <Compile Include="../tainted.fsi">
+    <Compile Include="..\tainted.fsi">
       <Link>TypedAST/tainted.fsi</Link>
     </Compile>
-    <Compile Include="../tainted.fs">
+    <Compile Include="..\tainted.fs">
       <Link>TypedAST/tainted.fs</Link>
     </Compile>
-    <Compile Include="../ExtensionTyping.fsi">
+    <Compile Include="..\ExtensionTyping.fsi">
       <Link>TypedAST/ExtensionTyping.fsi</Link>
     </Compile>
-    <Compile Include="../ExtensionTyping.fs">
+    <Compile Include="..\ExtensionTyping.fs">
       <Link>TypedAST/ExtensionTyping.fs</Link>
     </Compile>
-    <Compile Include="../QuotationPickler.fsi">
+    <Compile Include="..\QuotationPickler.fsi">
       <Link>TypedAST/QuotationPickler.fsi</Link>
     </Compile>
-    <Compile Include="../QuotationPickler.fs">
+    <Compile Include="..\QuotationPickler.fs">
       <Link>TypedAST/QuotationPickler.fs</Link>
     </Compile>
-    <Compile Include="../tast.fs">
+    <Compile Include="..\tast.fs">
       <Link>TypedAST/tast.fs</Link>
     </Compile>
-    <Compile Include="../TcGlobals.fs">
+    <Compile Include="..\TcGlobals.fs">
       <Link>TypedAST/TcGlobals.fs</Link>
     </Compile>
-    <Compile Include="../TastOps.fsi">
+    <Compile Include="..\TastOps.fsi">
       <Link>TypedAST/TastOps.fsi</Link>
     </Compile>
-    <Compile Include="../TastOps.fs">
+    <Compile Include="..\TastOps.fs">
       <Link>TypedAST/TastOps.fs</Link>
     </Compile>
-    <Compile Include="../TastPickle.fsi">
+    <Compile Include="..\TastPickle.fsi">
       <Link>TypedAST/TastPickle.fsi</Link>
     </Compile>
-    <Compile Include="../TastPickle.fs">
+    <Compile Include="..\TastPickle.fs">
       <Link>TypedAST/TastPickle.fs</Link>
     </Compile>
-    <Compile Include="../import.fsi">
+    <Compile Include="..\import.fsi">
       <Link>Logic/import.fsi</Link>
     </Compile>
-    <Compile Include="../import.fs">
+    <Compile Include="..\import.fs">
       <Link>Logic/import.fs</Link>
     </Compile>
-    <Compile Include="../infos.fs">
+    <Compile Include="..\infos.fs">
       <Link>Logic/infos.fs</Link>
     </Compile>
-    <Compile Include="../AccessibilityLogic.fs">
+    <Compile Include="..\AccessibilityLogic.fs">
       <Link>Logic/AccessibilityLogic.fs</Link>
     </Compile>
-    <Compile Include="../AttributeChecking.fs">
+    <Compile Include="..\AttributeChecking.fs">
       <Link>Logic/AttributeChecking.fs</Link>
     </Compile>
-    <Compile Include="../InfoReader.fs">
+    <Compile Include="..\InfoReader.fs">
       <Link>Logic/InfoReader.fs</Link>
     </Compile>
-    <Compile Include="../NicePrint.fs">
+    <Compile Include="..\NicePrint.fs">
       <Link>Logic/NicePrint.fs</Link>
     </Compile>
-    <Compile Include="../AugmentWithHashCompare.fsi">
+    <Compile Include="..\AugmentWithHashCompare.fsi">
       <Link>Logic/AugmentWithHashCompare.fsi</Link>
     </Compile>
-    <Compile Include="../AugmentWithHashCompare.fs">
+    <Compile Include="..\AugmentWithHashCompare.fs">
       <Link>Logic/AugmentWithHashCompare.fs</Link>
     </Compile>
-    <Compile Include="../NameResolution.fsi">
+    <Compile Include="..\NameResolution.fsi">
       <Link>Logic/NameResolution.fsi</Link>
     </Compile>
-    <Compile Include="../NameResolution.fs">
+    <Compile Include="..\NameResolution.fs">
       <Link>Logic/NameResolution.fs</Link>
     </Compile>
-    <Compile Include="../TypeRelations.fs">
+    <Compile Include="..\TypeRelations.fs">
       <Link>Logic/TypeRelations.fs</Link>
     </Compile>
-    <Compile Include="../SignatureConformance.fs">
+    <Compile Include="..\SignatureConformance.fs">
       <Link>Logic/SignatureConformance.fs</Link>
     </Compile>
-    <Compile Include="../MethodOverrides.fs">
+    <Compile Include="..\MethodOverrides.fs">
       <Link>Logic/MethodOverrides.fs</Link>
     </Compile>
-    <Compile Include="../MethodCalls.fs">
+    <Compile Include="..\MethodCalls.fs">
       <Link>Logic/MethodCalls.fs</Link>
     </Compile>
-    <Compile Include="../PatternMatchCompilation.fsi">
+    <Compile Include="..\PatternMatchCompilation.fsi">
       <Link>Logic/PatternMatchCompilation.fsi</Link>
     </Compile>
-    <Compile Include="../PatternMatchCompilation.fs">
+    <Compile Include="..\PatternMatchCompilation.fs">
       <Link>Logic/PatternMatchCompilation.fs</Link>
     </Compile>
-    <Compile Include="../ConstraintSolver.fsi">
+    <Compile Include="..\ConstraintSolver.fsi">
       <Link>Logic/ConstraintSolver.fsi</Link>
     </Compile>
-    <Compile Include="../ConstraintSolver.fs">
+    <Compile Include="..\ConstraintSolver.fs">
       <Link>Logic/ConstraintSolver.fs</Link>
     </Compile>
-    <Compile Include="../CheckFormatStrings.fsi">
+    <Compile Include="..\CheckFormatStrings.fsi">
       <Link>Logic/CheckFormatStrings.fsi</Link>
     </Compile>
-    <Compile Include="../CheckFormatStrings.fs">
+    <Compile Include="..\CheckFormatStrings.fs">
       <Link>Logic/CheckFormatStrings.fs</Link>
     </Compile>
-    <Compile Include="../FindUnsolved.fs">
+    <Compile Include="..\FindUnsolved.fs">
       <Link>Logic/FindUnsolved.fs</Link>
     </Compile>
-    <Compile Include="../QuotationTranslator.fsi">
+    <Compile Include="..\QuotationTranslator.fsi">
       <Link>Logic/QuotationTranslator.fsi</Link>
     </Compile>
-    <Compile Include="../QuotationTranslator.fs">
+    <Compile Include="..\QuotationTranslator.fs">
       <Link>Logic/QuotationTranslator.fs</Link>
     </Compile>
-    <Compile Include="../PostInferenceChecks.fsi">
+    <Compile Include="..\PostInferenceChecks.fsi">
       <Link>Logic/PostInferenceChecks.fsi</Link>
     </Compile>
-    <Compile Include="../PostInferenceChecks.fs">
+    <Compile Include="..\PostInferenceChecks.fs">
       <Link>Logic/PostInferenceChecks.fs</Link>
     </Compile>
-    <Compile Include="../TypeChecker.fsi">
+    <Compile Include="..\TypeChecker.fsi">
       <Link>Logic/TypeChecker.fsi</Link>
     </Compile>
-    <Compile Include="../TypeChecker.fs">
+    <Compile Include="..\TypeChecker.fs">
       <Link>Logic/TypeChecker.fs</Link>
     </Compile>
-    <Compile Include="../Optimizer.fsi">
+    <Compile Include="..\Optimizer.fsi">
       <Link>Optimize/Optimizer.fsi</Link>
     </Compile>
-    <Compile Include="../Optimizer.fs">
+    <Compile Include="..\Optimizer.fs">
       <Link>Optimize/Optimizer.fs</Link>
     </Compile>
-    <Compile Include="../DetupleArgs.fsi">
+    <Compile Include="..\DetupleArgs.fsi">
       <Link>Optimize/DetupleArgs.fsi</Link>
     </Compile>
-    <Compile Include="../DetupleArgs.fs">
+    <Compile Include="..\DetupleArgs.fs">
       <Link>Optimize/DetupleArgs.fs</Link>
     </Compile>
-    <Compile Include="../InnerLambdasToTopLevelFuncs.fsi">
+    <Compile Include="..\InnerLambdasToTopLevelFuncs.fsi">
       <Link>Optimize/InnerLambdasToTopLevelFuncs.fsi</Link>
     </Compile>
-    <Compile Include="../InnerLambdasToTopLevelFuncs.fs">
+    <Compile Include="..\InnerLambdasToTopLevelFuncs.fs">
       <Link>Optimize/InnerLambdasToTopLevelFuncs.fs</Link>
     </Compile>
-    <Compile Include="../LowerCallsAndSeqs.fs">
+    <Compile Include="..\LowerCallsAndSeqs.fs">
       <Link>Optimize/LowerCallsAndSeqs.fs</Link>
     </Compile>
-    <Compile Include="../autobox.fs">
-      <Link>Optimize/autobox.fs</Link>
+    <Compile Include="..\autobox.fs">
+      <Link>Optimize\autobox.fs</Link>
     </Compile>
-    <Compile Include="../IlxGen.fsi">
+    <Compile Include="..\IlxGen.fsi">
       <Link>CodeGen/IlxGen.fsi</Link>
     </Compile>
-    <Compile Include="../IlxGen.fs">
+    <Compile Include="..\IlxGen.fs">
       <Link>CodeGen/IlxGen.fs</Link>
     </Compile>
-    <Compile Include="../CompileOps.fsi">
+    <Compile Include="..\CompileOps.fsi">
       <Link>Driver/CompileOps.fsi</Link>
     </Compile>
-    <Compile Include="../CompileOps.fs">
+    <Compile Include="..\CompileOps.fs">
       <Link>Driver/CompileOps.fs</Link>
     </Compile>
-    <Compile Include="../CompileOptions.fsi">
+    <Compile Include="..\CompileOptions.fsi">
       <Link>Driver/CompileOptions.fsi</Link>
     </Compile>
-    <Compile Include="../CompileOptions.fs">
+    <Compile Include="..\CompileOptions.fs">
       <Link>Driver/CompileOptions.fs</Link>
     </Compile>
-    <Compile Include="../fsc.fsi">
+    <Compile Include="..\fsc.fsi">
       <Link>Driver/fsc.fsi</Link>
     </Compile>
-    <Compile Include="../fsc.fs">
+    <Compile Include="..\fsc.fs">
       <Link>Driver/fsc.fs</Link>
     </Compile>
-    <Compile Include="../vs/IncrementalBuild.fsi">
+    <Compile Include="..\vs\IncrementalBuild.fsi">
       <Link>Service/IncrementalBuild.fsi</Link>
     </Compile>
-    <Compile Include="../vs/IncrementalBuild.fs">
+    <Compile Include="..\vs\IncrementalBuild.fs">
       <Link>Service/IncrementalBuild.fs</Link>
     </Compile>
-    <Compile Include="../vs/Reactor.fsi">
+    <Compile Include="..\vs\Reactor.fsi">
       <Link>Service/Reactor.fsi</Link>
     </Compile>
-    <Compile Include="../vs/Reactor.fs">
+    <Compile Include="..\vs\Reactor.fs">
       <Link>Service/Reactor.fs</Link>
     </Compile>
-    <Compile Include="../vs/ServiceConstants.fs">
+    <Compile Include="..\vs\ServiceConstants.fs">
       <Link>Service/ServiceConstants.fs</Link>
     </Compile>
-    <Compile Include="../vs/ServiceDeclarations.fsi">
+    <Compile Include="..\vs\ServiceDeclarations.fsi">
       <Link>Service/ServiceDeclarations.fsi</Link>
     </Compile>
-    <Compile Include="../vs/ServiceDeclarations.fs">
+    <Compile Include="..\vs\ServiceDeclarations.fs">
       <Link>Service/ServiceDeclarations.fs</Link>
     </Compile>
-    <Compile Include="../vs/Symbols.fsi">
+    <Compile Include="..\vs\Symbols.fsi">
       <Link>Service/Symbols.fsi</Link>
     </Compile>
-    <Compile Include="../vs/Symbols.fs">
+    <Compile Include="..\vs\Symbols.fs">
       <Link>Service/Symbols.fs</Link>
     </Compile>
-    <Compile Include="../vs/Exprs.fsi">
+    <Compile Include="..\vs\Exprs.fsi">
       <Link>Service/Exprs.fsi</Link>
     </Compile>
-    <Compile Include="../vs/Exprs.fs">
+    <Compile Include="..\vs\Exprs.fs">
       <Link>Service/Exprs.fs</Link>
     </Compile>
-    <Compile Include="../vs/ServiceLexing.fsi">
+    <Compile Include="..\vs\ServiceLexing.fsi">
       <Link>Service/ServiceLexing.fsi</Link>
     </Compile>
-    <Compile Include="../vs/ServiceLexing.fs">
+    <Compile Include="..\vs\ServiceLexing.fs">
       <Link>Service/ServiceLexing.fs</Link>
     </Compile>
-    <Compile Include="../vs/ServiceParseTreeWalk.fs">
+    <Compile Include="..\vs\ServiceParseTreeWalk.fs">
       <Link>Service/ServiceParseTreeWalk.fs</Link>
     </Compile>
-    <Compile Include="../vs/ServiceNavigation.fsi">
+    <Compile Include="..\vs\ServiceNavigation.fsi">
       <Link>Service/ServiceNavigation.fsi</Link>
     </Compile>
-    <Compile Include="../vs/ServiceNavigation.fs">
+    <Compile Include="..\vs\ServiceNavigation.fs">
       <Link>Service/ServiceNavigation.fs</Link>
     </Compile>
-    <Compile Include="../vs/ServiceParamInfoLocations.fsi">
+    <Compile Include="..\vs\ServiceParamInfoLocations.fsi">
       <Link>Service/ServiceParamInfoLocations.fsi</Link>
     </Compile>
-    <Compile Include="../vs/ServiceParamInfoLocations.fs">
+    <Compile Include="..\vs\ServiceParamInfoLocations.fs">
       <Link>Service/ServiceParamInfoLocations.fs</Link>
     </Compile>
-    <Compile Include="../vs/ServiceUntypedParse.fsi">
+    <Compile Include="..\vs\ServiceUntypedParse.fsi">
       <Link>Service/ServiceUntypedParse.fsi</Link>
     </Compile>
-    <Compile Include="../vs/ServiceUntypedParse.fs">
+    <Compile Include="..\vs\ServiceUntypedParse.fs">
       <Link>Service/ServiceUntypedParse.fs</Link>
     </Compile>
-    <Compile Include="../vs/service.fsi">
+    <Compile Include="..\vs\service.fsi">
       <Link>Service/service.fsi</Link>
     </Compile>
-    <Compile Include="../vs/service.fs">
+    <Compile Include="..\vs\service.fs">
       <Link>Service/service.fs</Link>
     </Compile>
-    <Compile Include="../vs/SimpleServices.fsi">
+    <Compile Include="..\vs\SimpleServices.fsi">
       <Link>Service/SimpleServices.fsi</Link>
     </Compile>
-    <Compile Include="../vs/SimpleServices.fs">
+    <Compile Include="..\vs\SimpleServices.fs">
       <Link>Service/SimpleServices.fs</Link>
     </Compile>
-    <Compile Include="../fsi/fsi.fsi">
+    <Compile Include="..\fsi\fsi.fsi">
       <Link>Service/fsi.fsi</Link>
     </Compile>
-    <Compile Include="../fsi/fsi.fs">
+    <Compile Include="..\fsi\fsi.fs">
       <Link>Service/fsi.fs</Link>
     </Compile>
-    <Compile Include="obj/Debug/FSComp.fs" />
-    <Compile Include="obj/Debug/FSIstrings.fs" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.Build.Engine" />
+    <Reference Include="Microsoft.Build" />
+    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.Build.Tasks.v4.0" />
+    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <PropertyGroup>
+    <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0' OR '$(VisualStudioVersion)' == '11.0'">
+    <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+  </PropertyGroup>
   <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <UsingTask TaskName="CopyRuntimeDependencies" AssemblyFile="..\..\..\.paket\paket.exe" />
   <Target Name="AfterBuild" Condition="Exists('..\..\..\.paket\paket.exe')">