Get benchmarking and profiling working again

Broken with the move to new new csproj

Author: russcam

build/scripts/Benchmarking.fsx

@@ -21,15 +21,10 @@ module Benchmarker =
         let projectJson = testsProjectDirectory @@ "project.json"
         // running benchmarks can timeout so clean up any generated benchmark files
         try
-            DotNetCli.Restore(fun p ->
-                { p with
-                    Project = projectJson
-                })
-
             DotNetCli.RunCommand(fun p ->
                 { p with
-                    WorkingDir = testsProjectDirectory
-                }) "run Benchmark"
+                    WorkingDir = testsProjectDirectory                
+                }) "run -f net46 -c Release Benchmark"
         finally
             let benchmarkOutputFiles =
                 let output = combinePaths testsProjectDirectory "BenchmarkDotNet.Artifacts"

build/scripts/Building.fsx

@@ -9,6 +9,7 @@
 #load @"Versioning.fsx"
 
 open System 
+open System.IO
 open Fake 
 open FSharp.Data 
 
@@ -42,6 +43,7 @@ module Build =
                 "CurrentAssemblyFileVersion", (Versioning.CurrentAssemblyFileVersion.ToString());
                 "DoSourceLink", sourceLink;
                 "DotNetCoreOnly", if buildingOnTravis then "1" else "";
+                "OutputPathBaseDir", Path.GetFullPath Paths.BuildOutput;
             ] 
             |> List.map (fun (p,v) -> sprintf "%s=%s" p v)
             |> String.concat ";"
@@ -78,4 +80,4 @@ module Build =
             DotNetCli.RunCommand (fun p -> { p with TimeOut = TimeSpan.FromMinutes(3.) }) "clean src/Elasticsearch.sln -c Release" |> ignore
             DotNetProject.All |> Seq.iter(fun p -> CleanDir(Paths.BinFolder p.Name))
         | (_, _) -> 
-            tracefn "Skiping clean target only run when calling 'release', 'canary', 'clean' as targets directly"
+            tracefn "Skipping clean target only run when calling 'release', 'canary', 'clean' as targets directly"

build/scripts/Commandline.fsx

@@ -67,16 +67,17 @@ module Commandline =
         setEnvironVar "FAKEBUILD" "1"
         printfn "%A" arguments
         match arguments with
-        | [] | ["build"] | ["test"] | ["clean"] -> ignore()
+        | [] | ["build"] | ["test"] | ["clean"] | ["benchmark"] | ["profile"] -> ignore()
         | ["release"; version] -> setBuildParam "version" version
 
         | ["test"; testFilter] -> setBuildParam "testfilter" testFilter
 
-        | ["profile"; esVersions] -> setBuildParam "esversions" esVersions
+        | ["profile"; esVersions] -> 
+            setBuildParam "esversions" esVersions
         | ["profile"; esVersions; testFilter] ->
             setBuildParam "esversions" esVersions
-            setBuildParam "testfilter" testFilter
-
+            setBuildParam "testfilter" testFilter        
+          
         | ["integrate"; esVersions] -> setBuildParam "esversions" esVersions
         | ["integrate"; esVersions; clusterFilter] ->
             setBuildParam "esversions" esVersions

build/scripts/Profiling.fsx

@@ -48,8 +48,8 @@ module Profiler =
         member val Commit = commit with get, set
         member val Functions = functions with get, set
 
-    let private project = "Tests"
-    let private profiledApp = sprintf "%s/%s/%s.exe" (Paths.Output("v4.6")) project project
+    let private project = PrivateProject(Tests).Name
+    let private profiledApp = sprintf "%s/net46/%s.exe" (Paths.Output("Tests")) project
     let private snapShotOutput = Paths.Output("ProfilingSnapshot.dtp")
     let private snapShotStatsOutput = Paths.Output("ProfilingSnapshotStats.html")
     let private profileOutput = Paths.Output("ProfilingReport.xml")
@@ -63,7 +63,8 @@ module Profiler =
 
     let Run() = 
         let date = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffz")
-        Tooling.execProcessWithTimeout profiledApp ["Profile";"Class";getBuildParam "testfilter"] (TimeSpan.FromMinutes 30.) |> ignore
+        trace profiledApp
+        Tooling.execProcessWithTimeout profiledApp ["Profile";"Class";getBuildParam "testfilter"] (TimeSpan.FromMinutes 30.) "." |> ignore
         trace "Profiling finished."
 
         let performanceOutput = Paths.Output("profiling/performance") |> directoryInfo

src/CodeGeneration/ApiGenerator/ApiGenerator.csproj

@@ -16,4 +16,5 @@
     <Folder Include="RestSpecification\XPack\Info" />
   </ItemGroup>
   <Import Project="..\..\..\.paket\Paket.Restore.targets" />
+  <Import Project="..\..\outputpath.props" />
 </Project>

src/CodeGeneration/DocGenerator/DocGenerator.csproj

@@ -19,4 +19,5 @@
     <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
   </ItemGroup>
   <Import Project="..\..\..\.paket\Paket.Restore.targets" />
+  <Import Project="..\..\outputpath.props" />
 </Project>

src/Elasticsearch.Net/Elasticsearch.Net.csproj

@@ -17,4 +17,5 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
+  <Import Project="..\outputpath.props" />
 </Project>

src/Nest/Nest.csproj

@@ -32,4 +32,5 @@
   </ItemGroup>
   <!--<Import Project="..\..\.paket\Paket.Restore.targets" />-->
   <Import Project="..\..\.paket\Paket.Restore.targets" />
+  <Import Project="..\outputpath.props" />
 </Project>

src/Tests/Program.cs

@@ -59,7 +59,7 @@ static Program()
 		// TODO: Renamed this from Main to TestMain because of a bug with Resharper and running unit tests
 		// in Visual Studio with .NET Core: https://youtrack.jetbrains.com/issue/RSRP-464233
 		// Once this is fixed, look at renaming back and removing additional packages. See https://github.com/elastic/elasticsearch-net/pull/2793
-		public static void TestMain(string[] args)
+		public static void Main(string[] args)
 		{
 			if (args.Length == 0)
 				Console.WriteLine("Must specify at least one argument: TestAssemblyPath, Profile or Benchmark ");

src/Tests/Tests.csproj

@@ -23,7 +23,6 @@
     <PackageReference Include="BenchMarkDotNet" Version="0.10.0" />
     <PackageReference Include="DiffPlex" Version="1.4.1" />
     <PackageReference Include="System.Reactive" Version="3.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <!-- TODO only for Desktop CLR? -->
     <PackageReference Include="System.Buffers" Version="4.3.0" />
     <!-- TODO update -->
@@ -32,14 +31,12 @@
     <PackageReference Include="JetBrains.Profiler.Kernel.Windows.Api" Version="108.0.20170209.151431-eap01" />
     <Reference Include="..\..\build\profiling\JetBrains.Profiler.Windows.SelfApi.dll" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'!='net45'">
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
     <PackageReference Include="System.Net.Http" Version="4.3.0" />
     <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Document\Single\Index\Attachment_Test_Document.pdf" />
   </ItemGroup>
+  <Import Project="..\outputpath.props" />
 </Project>