nuget.exe now pulled in though NuGet

Author: Mpdreamz

build/scripts/Tooling.fs

@@ -1,8 +1,6 @@
 namespace Scripts
 
 open System
-open System.IO
-open System.Net
 open ProcNet
 open Fake.IO.Globbing.Operators
 open ProcNet.Std
@@ -47,38 +45,8 @@ module Tooling =
         member this.ExecIn workingDirectory arguments = this.ExecInWithTimeout workingDirectory arguments timeout
         member this.Exec arguments = this.ExecWithTimeout arguments timeout
 
-    let nugetFile =
-        let targetLocation = "build/tools/nuget/nuget.exe" 
-        if (not (File.Exists targetLocation))
-        then
-            printfn "Nuget not found at %s. Downloading now" targetLocation
-            let url = "http://dist.nuget.org/win-x86-commandline/latest/nuget.exe" 
-            Directory.CreateDirectory("build/tools/nuget") |> ignore
-            use webClient = new WebClient()
-            webClient.DownloadFile(url, targetLocation)
-            printfn "nuget downloaded"
-        targetLocation 
-
-    let Nuget = BuildTooling(None, nugetFile)
+    let Nuget = BuildTooling(None, "build/scripts/bin/Release/netcoreapp2.2/nuget.exe")
     let ILRepack = BuildTooling(None, "build/scripts/bin/Release/netcoreapp2.2/ILRepack.exe")
     let DotNet = BuildTooling(Some <| TimeSpan.FromMinutes(5.), "dotnet")
 
-    type DotTraceTool = {
-        Name:string;
-        Download:string;
-        TargetDir:string;
-    }
-
-    type DiffTooling(exe) =       
-        let installPath = @"C:\Program Files (x86)\Progress\JustAssembly\Libraries"  
-        let downloadPage = "https://www.telerik.com/download-trial-file/v2/justassembly"  
-        let toolPath = Path.Combine(installPath,exe)
-        
-        member this.Exec arguments =
-            if (Directory.Exists installPath |> not) then
-                failwith (sprintf "JustAssembly is not installed in the default location %s. Download and install from %s" installPath downloadPage)
-        
-            execInWithTimeout defaultTimeout (Some ".") toolPath arguments 
-            
-    let JustAssembly = DiffTooling("JustAssembly.CommandLineTool.exe")
 

build/scripts/scripts.fsproj

@@ -73,19 +73,18 @@
     <PackageReference Include="Fake.IO.Zip" Version="5.12.6" />
     <PackageReference Include="FSharp.Data" Version="3.0.1" />
     <PackageReference Include="FSharp.Data.TypeProviders" Version="5.0.0.6" />
-    <PackageReference Include="ILRepack" Version="2.1.0-beta1" GeneratePathProperty="true" />
+    <PackageReference Include="ILRepack" Version="2.1.0-beta1" />
+    <PackageReference Include="NuGet.CommandLine" Version="4.9.4" />
     <PackageReference Include="Octokit" Version="0.32.0" />
     <PackageReference Include="Proc" Version="0.4.3" />
 
-
     <DotNetCliToolReference Include="dotnet-assembly-rewriter" Version="1.0.0-alpha20190401T093210" />
     <DotNetCliToolReference Include="dotnet-assembly-differ" Version="1.0.0-alpha20190401T104011" />
 
-<!--    <PackageReference Include="assembly-rewriter" Version="1.0.0-alpha20181126T140416" />-->
-<!--    <PackageReference Include="assembly-differ" Version="1.0.0-alpha20181126T222017" />-->
   </ItemGroup>
-  <Target Name="CopyILRepack" AfterTargets="Build">
+  <Target Name="CopyToolPackages" AfterTargets="Build">
     <Copy SourceFiles="$(PkgILRepack)\tools\ILRepack.exe" DestinationFolder="$(OutDir)" />
+    <Copy SourceFiles="$(PkgNuGet_CommandLine)\tools\nuget.exe" DestinationFolder="$(OutDir)" />
   </Target>
 
 </Project>