Import clitools via paket

Author: forki

fcs/.paket/Paket.Restore.targets

@@ -30,7 +30,7 @@
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
   </PropertyGroup>
 
-  <Target Name="PaketRestore" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
+  <Target Name="PaketRestore" Condition="'$(PaketRestoreDisabled)' != 'True'" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
 
     <!-- Step 1 Check if lockfile is properly restored -->
     <PropertyGroup>
@@ -88,7 +88,7 @@
     <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)"' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
 
     <!-- This shouldn't actually happen, but just to be sure. -->
-    <Error Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' " Text="A paket file for the framework '$(TargetFramework)' is missing. Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
+    <Error Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' AND '$(ResolveNuGetPackages)' != 'False' " Text="Paket file '$(PaketResolvedFilePath)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
 
     <!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
     <ReadLinesFromFile Condition="Exists('$(PaketResolvedFilePath)')" File="$(PaketResolvedFilePath)" >

fcs/FSharp.Compiler.Service.Tests.netcore/FSharp.Compiler.Service.Tests.netcore.fsproj

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp1.0</TargetFramework>
@@ -56,4 +57,5 @@
     <Exec Command="dotnet restore &quot;$(MSBuildProjectDirectory)/../../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard1.6/Sample_NETCoreSDK_FSharp_Library_netstandard1.6.fsproj&quot;" />
     <Exec Command="dotnet build &quot;$(MSBuildProjectDirectory)/../../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard1.6/Sample_NETCoreSDK_FSharp_Library_netstandard1.6.fsproj&quot;" />
   </Target>
+  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>

fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\src</FSharpSourcesRoot>
@@ -646,5 +647,7 @@
   </ItemGroup>
   <Import Project="$(FSharpSourcesRoot)\scripts\fssrgen.targets" />
   <Import Project="$(FSharpSourcesRoot)\..\packages\FsLexYacc.7.0.6\build\FsLexYacc.targets" />
-	<Target Name="GenerateCode" AfterTargets="Restore" BeforeTargets="BeforeBuild"       DependsOnTargets="CallFsLex;CallFsYacc;ProcessFsSrGen"></Target>
+  <Target Name="GenerateCode" AfterTargets="Restore" BeforeTargets="BeforeBuild" DependsOnTargets="CallFsLex;CallFsYacc;ProcessFsSrGen">
+  </Target>
+  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>

fcs/FSharp.Compiler.Service.netstandard/paket.references

@@ -9,4 +9,6 @@ nuget Microsoft.Build.Utilities.Core 14.3.0
 nuget Microsoft.Build.Framework 14.3.0
 nuget Microsoft.Build.Engine 14.3.0
 nuget Microsoft.Build 14.3.0
-nuget System.Threading.Tasks.Dataflow 4.5.24.0
+nuget System.Threading.Tasks.Dataflow 4.5.24.0
+clitool dotnet-mergenupkg
+clitool dotnet-fssrgen

fcs/FSharp.Compiler.Service/paket.references

@@ -1,6 +1,8 @@
 RESTRICTION: || (== net45) (== net46)
 NUGET
   remote: https://www.nuget.org/api/v2
+    dotnet-fssrgen (3.4) - clitool: true
+    dotnet-mergenupkg (2.1) - clitool: true
     FAKE (4.63.2)
     FSharp.Compiler.Service (2.0.0.6)
     FSharp.Formatting (2.14.4)

fcs/paket.dependencies

@@ -0,0 +1,2 @@
+dotnet-mergenupkg
+dotnet-fssrgen

fcs/paket.lock

@@ -1,10 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net45</TargetFramework>
   </PropertyGroup>
-   <ItemGroup>
-    <DotNetCliToolReference Include="dotnet-mergenupkg" Version="1.0.*" />
-    <DotNetCliToolReference Include="dotnet-fssrgen" Version="3.3.*" />
-  </ItemGroup>
+  <Import Project=".paket\Paket.Restore.targets" />
 </Project>