Merge pull request #519 from rneatherway/reorganise-nuget

Change nuget layout for ProjectCracker package

Author: dsyme

docs/content/project.fsx

@@ -315,13 +315,11 @@ FSharp.Compiler.Service.ProjectCracker. This NuGet package contains a
 library FSharp.Compiler.Service.ProjectCracker.dll, which should be
 referenced by your application directly, and an executable
 FSharp.Compiler.Service.ProjectCrackerTool.exe, which should be copied
-into the output folder of your application by the build process. This
-can be accomplished by adding lines to your `.fsproj` file similar to:
-
-    <Target Name="AfterBuild">
-        <Copy SourceFiles="..\packages\FSharp.Compiler.Service.ProjectCracker\lib\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe" DestinationFolder="$(OutputPath)" />
-        <Copy SourceFiles="..\packages\FSharp.Compiler.Service.ProjectCracker\lib\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" DestinationFolder="$(OutputPath)" />
-    </Target>
+into the output folder of your application by the build process. If
+you install using Paket or NuGet, then this will be configured for you
+automatically. If not, you should reference the provided `.targets`
+file manually in your application. This can be found in the NuGet
+package at `build/net45/FSharp.Compiler.Service.ProjectCrackerTool.targets`.
 
 The reason for this split is so that the analysis of an F# project
 file is performed out of process, in order that the necessary assembly

nuget/projectcracker.template

@@ -12,10 +12,11 @@ iconurl https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.p
 tags
     F#, fsharp, msbuild, editor
 files
-    ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe ==> lib/net45
-    ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe.config ==> lib/net45
-    ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.?db ==> lib/net45
-    ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe.?db ==> lib/net45
+    ../src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.targets ==> build/net45
+    ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe ==> utilities/net45
+    ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe.config ==> utilities/net45
+    ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.?db ==> utilities/net45
+    ../bin/v4.5/FSharp.Compiler.Service.ProjectCrackerTool.exe.?db ==> utilities/net45
     ../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.xml ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.?db ==> lib/net45

src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj

@@ -59,6 +59,7 @@
     <Compile Include="ProjectCrackerOptions.fs" />
     <Compile Include="Program.fs" />
     <None Include="App.config" />
+    <None Include="FSharp.Compiler.Service.ProjectCrackerTool.targets" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" Condition=" '$(TargetFrameworkVersion)' == 'v4.0'" />

src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.targets

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0"     xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Target Name="FSharp.Compiler.Service.ProjectCrackerToolCopy" AfterTargets="Build">
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)\..\..\utilities\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe" DestinationFolder="$(OutputPath)" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)\..\..\utilities\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" DestinationFolder="$(OutputPath)" />
+</Target>
+</Project>