Refactor to prepare test for fake-cli

Author: matthid

integrationtests/i002425-dotnet-cli-tool-works/before/.config/dotnet-tools.json

@@ -0,0 +1,5 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {}
+}

legacy-build.fsx

@@ -151,7 +151,8 @@ let version =
                         None)
                 |> Seq.append [ 0I ]
                 |> Seq.max
-            [ PreReleaseSegment.AlphaNumeric "local"; PreReleaseSegment.Numeric (currentVer + 1I) ], ""
+            let d = System.DateTime.Now
+            [ PreReleaseSegment.AlphaNumeric "local"; PreReleaseSegment.Numeric (currentVer + 1I) ], d.ToString("yyyy-MM-dd_HHmm")
 
     let semVer = SemVer.parse release.NugetVersion
     let prerelease =

src/test/Fake.Core.IntegrationTests/Fake.Core.Process.fs

@@ -8,31 +8,16 @@ open Expecto
 open Fake.Core.IntegrationTests.TestHelpers
 open System.Diagnostics
 
-let dotnetSdk = lazy DotNet.install DotNet.Versions.FromGlobalJson
-
 let dllPath = System.IO.Path.GetDirectoryName (System.Reflection.Assembly.GetExecutingAssembly().Location)
 
 let runProjectRaw noBuild proj args =
-    let options = dotnetSdk.Value (DotNet.Options.Create())
-    
-    let dir = System.IO.Path.GetDirectoryName options.DotNetCliPath
-    let oldPath =
-        options
-        |> Process.getEnvironmentVariable "PATH"
-    
     [
         yield "run"
         if noBuild then yield "--no-build"
         yield! [ "--project"; proj; "--" ]
         yield! args |> Args.fromWindowsCommandLine |> Seq.toList
     ]
-    |> CreateProcess.fromRawCommand options.DotNetCliPath
-    |> CreateProcess.withEnvironment (options.Environment |> Map.toList)
-    |> CreateProcess.setEnvironmentVariable "PATH" (
-        match oldPath with
-        | Some oldPath -> sprintf "%s%c%s" dir System.IO.Path.PathSeparator oldPath
-        | None -> dir)
-    |> CreateProcess.withWorkingDirectory options.WorkingDirectory
+    |> runDotNetRaw
 
 let runProject noBuild f proj args =
     runProjectRaw noBuild proj args

src/test/Fake.Core.IntegrationTests/SimpleHelloWorldTests.fs

@@ -8,11 +8,13 @@ open System.IO
 open System.Diagnostics
 open Newtonsoft.Json
 open Newtonsoft.Json.Linq
+open Fake.Core
 
 let fail s = Expect.isTrue s false
 let ignProc = ignore<Fake.Core.ProcessResult>
 
 
+
 type Declaration =
     { File : string
       Line : int
@@ -32,10 +34,29 @@ type Target =
       Declaration : Declaration
       Description : string }
 
+let getInfoVersion () =
+    let attr = typeof<Fake.Core.Process.ProcessList>.Assembly.GetCustomAttributes(typeof<System.Reflection.AssemblyInformationalVersionAttribute>, false)
+    match attr |> Seq.tryHead with
+    | Some (:? Reflection.AssemblyInformationalVersionAttribute as attr) -> attr.InformationalVersion
+    | None -> failwithf "Could not retrieve version"
 
 [<Tests>]
 let tests = 
   testList "Fake.Core.IntegrationTests" [
+    //testCase "fake-cli local tool works" <| fun _ ->
+    //    // dotnet tool install --version 5.19.0-alpha.local.1 fake-cli --add-source /e/Projects/FAKE/release/dotnetcore/
+    //    let res =
+    //        [
+    //            yield! ["tool"; "install"]
+    //            yield! [ "--version"; getInfoVersion ()  ]
+    //            yield "fake-cli"
+    //            yield!  ["--add-source" ]
+    //        ]
+    //        |> runDotNetRaw
+    //        |> CreateProcess.withWorkingDirectory ""
+    //        |> Proc.run
+    //    ()
+
     testCase "no dependencies hello world and casing #2314" <| fun _ ->
         let result =
             if Paket.Utils.isWindows then

src/test/Fake.Core.IntegrationTests/TestHelpers.fs

@@ -2,6 +2,7 @@
 module Fake.Core.IntegrationTests.TestHelpers
 
 open Fake.Core
+open Fake.DotNet
 open Fake.IO
 open Fake.IO.FileSystemOperators
 open System
@@ -21,6 +22,25 @@ type TestDir =
                 eprintf "Failed to delete '%s': %O" x.Dir e
                 ()
 
+let dotnetSdk = lazy DotNet.install DotNet.Versions.FromGlobalJson
+
+let runDotNetRaw args =
+    let options = dotnetSdk.Value (Fake.DotNet.DotNet.Options.Create())
+
+    let dir = System.IO.Path.GetDirectoryName options.DotNetCliPath
+    let oldPath =
+        options
+        |> Process.getEnvironmentVariable "PATH"
+
+    args
+    |> CreateProcess.fromRawCommand options.DotNetCliPath
+    |> CreateProcess.withEnvironment (options.Environment |> Map.toList)
+    |> CreateProcess.setEnvironmentVariable "PATH" (
+        match oldPath with
+        | Some oldPath -> sprintf "%s%c%s" dir System.IO.Path.PathSeparator oldPath
+        | None -> dir)
+    |> CreateProcess.withWorkingDirectory options.WorkingDirectory
+
 let createTestDir () =
     let testFile = Path.combine (Path.GetTempPath ()) (Path.GetRandomFileName ())
     Directory.CreateDirectory(testFile)