Use Forge to parse .fsproj files

.gitignore

@@ -216,7 +216,6 @@ release.sh
 localpackages/
 paket-files
 *.orig
-.paket/paket.exe
 docs/content/license.md
 docs/content/release-notes.md
 .fake

.paket/paket.targets

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- Enable the restore command to run before builds -->
+    <RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
+    <!-- Download Paket.exe if it does not already exist -->
+    <DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
+    <PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
+    <PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
+    <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
+    <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- Paket command -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
+    <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
+    <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
+    <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
+    <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
+    <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
+    <!-- Commands -->
+    <PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
+    <PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences>
+    <PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
+    <RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
+    <DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
+    <!-- We need to ensure packages are restored prior to assembly resolve -->
+    <BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
+  </PropertyGroup>
+  <Target Name="CheckPrerequisites">
+    <!-- Raise an error if we're unable to locate paket.exe -->
+    <Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
+    <MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
+  </Target>
+  <Target Name="DownloadPaket">
+    <Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
+  </Target>
+  <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+    <Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" ContinueOnError="true" />
+  </Target>
+</Project>

build.cmd

@@ -1,11 +1,6 @@
 @echo off
 cls
 
-.paket\paket.bootstrapper.exe
-if errorlevel 1 (
-  exit /b %errorlevel%
-)
-
 .paket\paket.exe restore
 if errorlevel 1 (
   exit /b %errorlevel%

build.fsx

@@ -312,7 +312,7 @@ Target "FableCompilerNetcore" (fun _ ->
 Target "NUnitTest" (fun _ ->
     let testsBuildDir = "build/tests"
 
-    !! "src/tests/Fable.Tests.fsproj"
+    !! "src/tests/Main/Fable.Tests.fsproj"
     |> MSBuildRelease testsBuildDir "Build"
     |> ignore
 
@@ -322,11 +322,10 @@ Target "NUnitTest" (fun _ ->
 
 let compileAndRunMochaTests es2015 =
     let testsBuildDir = "build/tests"
-    let testCompileArgs = if es2015 then ["--ecma es2015"] else []
+    let testCompileArgs =
+        ["--verbose" + if es2015 then " --ecma es2015" else ""]
 
-    MSBuildDebug "src/tests/DllRef/bin" "Build" ["src/tests/DllRef/Fable.Tests.DllRef.fsproj"] |> ignore
     Node.run "." "build/fable" ["src/tests/DllRef"]
-    Node.run "." "build/fable" ["src/tests/Other"]
     Node.run "." "build/fable" ("src/tests/"::testCompileArgs)
     FileUtils.cp "src/tests/package.json" testsBuildDir
     Npm.install testsBuildDir []

build.sh

@@ -7,11 +7,6 @@ else
   MONO="mono"
 fi
 
-$MONO .paket/paket.bootstrapper.exe
-exit_code=$?
-if [ $exit_code -ne 0 ]; then
-exit $exit_code
-fi
 if [ -e "paket.lock" ]; then
 $MONO .paket/paket.exe restore
 else

docs/source/docs/compiling.md

@@ -40,7 +40,6 @@ Option                  | Short     | Description
 `--loose`               |           | Enable “loose” transformations for babel-preset-es2015 plugins (true by default).
 `--babelrc`             |           | Use a `.babelrc` file for Babel configuration (invalidates other Babel related options).
 `--refs`                |           | Specify dll or project references in `Reference=js/import/path` format (see below).
-`--msbuild`             |           | Pass MSBuild arguments like `Configuration=Release`.
 `--clamp`               |           | Compile unsigned byte arrays as Uint8ClampedArray.
 `--copyExt`             |           | Copy external files into `fable_external` folder (true by default).
 `--coreLib`             |           | In some cases, you may need to pass a different route to the core library, like `--coreLib fable-core/es2015`.

paket.dependencies

@@ -1,22 +1,17 @@
 source https://www.nuget.org/api/v2
 
 nuget FAKE
-nuget FSharp.Compiler.Service
-nuget FSharp.Compiler.Service.ProjectCracker
+nuget FSharp.Compiler.Service 8.0.0
 nuget FSharp.Core
 nuget Newtonsoft.Json
 nuget Fable.JsonConverter
 nuget NUnit
 nuget NUnit.Runners
-github fsprojects/FSharp.TypeProviders.StarterPack src/ProvidedTypes.fs
-
-github fsprojects/Forge/1.0.1 src/Forge.ProjectSystem/Prelude.fs
-github fsprojects/Forge/1.0.1 src/Forge.ProjectSystem/XLinq.fs
-github fsprojects/Forge/1.0.1 src/Forge.ProjectSystem/ResizeArray.fs
-github fsprojects/Forge/1.0.1 src/Forge.ProjectSystem/Constants.fs
-github fsprojects/Forge/1.0.1 src/Forge.ProjectSystem/ProjectSystem.fs
-
 nuget Suave
+github fable-compiler/Forge
+github fsprojects/FSharp.TypeProviders.StarterPack src/ProvidedTypes.fs
+github fsharp/FSharp.Compiler.Service src/fsharp/ReferenceResolver.fs
+github fsharp/FSharp.Compiler.Service src/fsharp/SimulatedMSBuildReferenceResolver.fs
 
 group Docs
   source https://www.nuget.org/api/v2

paket.lock

@@ -1,14 +1,26 @@
 NUGET
   remote: https://www.nuget.org/api/v2
+    Argu (3.2)
     Fable.JsonConverter (0.0.3)
       FSharp.Core
       Newtonsoft.Json
-    FAKE (4.41.6)
+    FAKE (4.42)
+    FParsec (1.0.2)
     FSharp.Compiler.Service (8.0)
       System.Collections.Immutable (>= 1.2)
       System.Reflection.Metadata (>= 1.4.1-beta-24227-04)
-    FSharp.Compiler.Service.ProjectCracker (8.0)
     FSharp.Core (4.0.0.1)
+    FSharp.Formatting (2.10)
+      FSharp.Compiler.Service (>= 0.0.87)
+      FSharpVSPowerTools.Core (1.8)
+    FSharpVSPowerTools.Core (1.8)
+      FSharp.Compiler.Service (>= 0.0.87)
+    FsUnit (2.3.2)
+      FSharp.Core (>= 3.1.2.5)
+      NUnit (3.5)
+    Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full
+      Microsoft.Bcl.Build (>= 1.0.14)
+    Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full
     Microsoft.CSharp (4.0.1) - framework: >= netstandard10
       System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard13
       System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard13
@@ -26,8 +38,12 @@ NUGET
       System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard13
       System.Runtime.InteropServices (>= 4.1) - framework: dnxcore50, >= netstandard13
       System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard13
+    Microsoft.Net.Http (2.2.29) - framework: net10, net11, net20, net30, net35, net40, net40-full
+      Microsoft.Bcl (>= 1.1.10)
+      Microsoft.Bcl.Build (>= 1.0.14)
     Microsoft.NETCore.Platforms (1.0.1) - framework: >= netstandard10
     Microsoft.NETCore.Targets (1.0.1) - framework: >= netstandard10
+    Mono.Posix (4.0)
     Newtonsoft.Json (9.0.1)
       Microsoft.CSharp (>= 4.0.1) - framework: >= netstandard10
       System.Collections (>= 4.0.11) - framework: >= netstandard10
@@ -65,12 +81,16 @@ NUGET
       NUnit.Extension.NUnitV2ResultWriter (>= 3.5)
       NUnit.Extension.TeamCityEventListener (>= 1.0.2)
       NUnit.Extension.VSProjectLoader (>= 3.5)
+    Octokit (0.23)
+      Microsoft.Net.Http  - framework: net10, net11, net20, net30, net35, net40, net40-full
     runtime.native.System (4.0) - framework: >= netstandard13
       Microsoft.NETCore.Platforms (>= 1.0.1)
       Microsoft.NETCore.Targets (>= 1.0.1)
     runtime.native.System.IO.Compression (4.1) - framework: >= netstandard13
       Microsoft.NETCore.Platforms (>= 1.0.1)
       Microsoft.NETCore.Targets (>= 1.0.1)
+    SharpZipLib (0.86)
+    SourceLink.Fake (1.1)
     Suave (1.1.3)
       FSharp.Core (>= 3.1.2.5)
     System.Collections (4.0.11) - framework: >= netstandard10
@@ -311,19 +331,32 @@ NUGET
       System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard13
       System.Xml.ReaderWriter (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13
 GITHUB
+  remote: fable-compiler/Forge
+    FULLPROJECT (7677a368304f0337047ed8ad925991aa7187a8bf)
+      Argu
+      FAKE
+      FParsec
+      FSharp.Core
+      FSharp.Formatting
+      FsUnit
+      Mono.Posix
+      NUnit
+      NUnit.Runners
+      SharpZipLib
+      SourceLink.Fake
+  remote: fsharp/FAKE
+    modules/Octokit/Octokit.fsx (f3f230ffde29fa370daf7d7be53e872e929dd487)
+      Octokit (>= 0.20)
   remote: fsprojects/FSharp.TypeProviders.StarterPack
     src/ProvidedTypes.fs (c50ace31d335b7bcb83b102d2cfd0ce2007ed681)
-  remote: fsprojects/Forge
-    src/Forge.ProjectSystem/Constants.fs (f75374896a2894e3187e3a2909e769fb920f3af4)
-    src/Forge.ProjectSystem/Prelude.fs (f75374896a2894e3187e3a2909e769fb920f3af4)
-    src/Forge.ProjectSystem/ProjectSystem.fs (f75374896a2894e3187e3a2909e769fb920f3af4)
-    src/Forge.ProjectSystem/ResizeArray.fs (f75374896a2894e3187e3a2909e769fb920f3af4)
-    src/Forge.ProjectSystem/XLinq.fs (f75374896a2894e3187e3a2909e769fb920f3af4)
+  remote: fsharp/FSharp.Compiler.Service
+    src/fsharp/ReferenceResolver.fs (174875dde3dcc5288616adca7b5b1468fda3bdb2)
+    src/fsharp/SimulatedMSBuildReferenceResolver.fs (174875dde3dcc5288616adca7b5b1468fda3bdb2)
 GROUP Docs
 NUGET
   remote: https://www.nuget.org/api/v2
     DotLiquid (2.0.55)
-    FAKE (4.41.6)
+    FAKE (4.42)
     FSharp.Compiler.Service (2.0.0.6)
     FSharp.Core (4.0.0.1)
     FSharp.Formatting (2.14.2)

src/fable/Fable.Client.Node/Fable.Client.Node.fsproj

@@ -45,14 +45,28 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Numerics" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\paket-files\fsharp\FSharp.Compiler.Service\src\fsharp\ReferenceResolver.fs">
+      <Paket>True</Paket>
+      <Link>paket-files/ReferenceResolver.fs</Link>
+    </Compile>
+    <Compile Include="..\..\..\paket-files\fsharp\FSharp.Compiler.Service\src\fsharp\SimulatedMSBuildReferenceResolver.fs">
+      <Paket>True</Paket>
+      <Link>paket-files/SimulatedMSBuildReferenceResolver.fs</Link>
+    </Compile>
     <Compile Include="AssemblyInfo.fs" />
     <None Include="App.config" />
     <Compile Include="Main.fs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\paket-files\fable-compiler\Forge\src\Forge.ProjectSystem\Forge.ProjectSystem.fsproj">
+      <Name>Forge.ProjectSystem</Name>
+      <Project>{9029be0f-a72c-4281-9fd1-aa15f5722306}</Project>
+      <Private>True</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Fable.Compiler\Fable.Compiler.fsproj">
       <Name>Fable.Compiler</Name>
       <Project>{d341ff6b-f526-4370-8318-0f5a654ba70c}</Project>
@@ -80,14 +94,7 @@
     </Otherwise>
   </Choose>
   <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <PropertyGroup>
-        <__paket__FSharp_Compiler_Service_ProjectCracker_targets>net45\FSharp.Compiler.Service.ProjectCracker</__paket__FSharp_Compiler_Service_ProjectCracker_targets>
-      </PropertyGroup>
-    </When>
-  </Choose>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
@@ -110,17 +117,6 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
-        <Reference Include="FSharp.Compiler.Service.ProjectCracker">
-          <HintPath>..\..\..\packages\FSharp.Compiler.Service.ProjectCracker\lib\net45\FSharp.Compiler.Service.ProjectCracker.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')">
       <ItemGroup>
@@ -879,5 +875,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\..\..\packages\FSharp.Compiler.Service.ProjectCracker\build\$(__paket__FSharp_Compiler_Service_ProjectCracker_targets).targets" Condition="Exists('..\..\..\packages\FSharp.Compiler.Service.ProjectCracker\build\$(__paket__FSharp_Compiler_Service_ProjectCracker_targets).targets')" Label="Paket" />
 </Project>