Core: new toolchain implementation with dnx451 code reuse

.nuget/NuGet.Config

@@ -5,5 +5,6 @@
   </solution>
   <packageSources>
     <add key="fsprojects" value="https://www.myget.org/F/fsprojects/api/v3/index.json" />
+    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
   </packageSources>
 </configuration>

BenchmarkDotNet.Samples/project.json

@@ -25,6 +25,7 @@
         "define": [ "CORE" ]
       },
       "dependencies": {
+        "NETStandard.Library": "1.0.0-rc2-23811",
         "System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-23225"
       }
     }

BenchmarkDotNet/Portability/RuntimeInformation.cs

@@ -10,6 +10,8 @@ namespace BenchmarkDotNet.Portability
 {
     internal class RuntimeInformation
     {
+        internal static string ExecutableExtension => IsWindows() ? ".exe" : string.Empty;
+
         internal static bool IsWindows()
         {
 #if !CORE
@@ -81,6 +83,5 @@ internal static string GetClrVersion()
             return "CORE"; // TODO: verify if it is possible to get this for CORE
 #endif
         }
-
     }
 }

BenchmarkDotNet/Templates/BenchmarkProject.json

@@ -15,11 +15,10 @@
     "run": "BenchmarkDotNet.Autogenerated"
   },
 
+  $REQUIREDDEPENDENCY$,
+
   "frameworks": {
-    "dnx451": {
-      "frameworkAssemblies": {
-        "System.Runtime": "4.0.10.0"
-      },
+    "$TFM$": {
       "dependencies": {
         "$EXECUTINGASSEMBLY$": {
           "version": "$EXECUTINGASSEMBLYVERSION$",

BenchmarkDotNet/Toolchains/Core/CoreToolchain.cs

@@ -1,15 +1,20 @@
 using BenchmarkDotNet.Toolchains.Classic;
-using BenchmarkDotNet.Toolchains.Dnx;
+using BenchmarkDotNet.Toolchains.DotNetCli;
 
 namespace BenchmarkDotNet.Toolchains.Core
 {
     public class CoreToolchain : Toolchain
     {
+        private const string TargetFrameworkMoniker = "dnxcore50"; // todo: when dnx gets replaced in VS with dotnet cli replace this name with fancy dotnet5.4 name
+
         public static readonly IToolchain Instance = new CoreToolchain();
 
-        private CoreToolchain() : base("Core", new DnxGenerator(), new DnxBuilder(), new ClassicExecutor())
+        private CoreToolchain()
+            : base("Core",
+                  new DotNetCliGenerator(TargetFrameworkMoniker),
+                  new DotNetCliBuilder(TargetFrameworkMoniker),
+                  new ClassicExecutor())
         {
-            // todo: implement the toolchain
         }
     }
 }

BenchmarkDotNet/Toolchains/Dnx/DnxToolchain.cs

@@ -1,12 +1,19 @@
 using BenchmarkDotNet.Toolchains.Classic;
+using BenchmarkDotNet.Toolchains.DotNetCli;
 
 namespace BenchmarkDotNet.Toolchains.Dnx
 {
     public class DnxToolchain : Toolchain
     {
+        private const string TargetFrameworkMoniker = "dnx451";
+
         public static readonly IToolchain Instance = new DnxToolchain();
 
-        private DnxToolchain() : base("Dnx", new DnxGenerator(), new DnxBuilder(), new ClassicExecutor())
+        private DnxToolchain() 
+            : base("Dnx", 
+                  new DotNetCliGenerator(TargetFrameworkMoniker), 
+                  new DotNetCliBuilder(TargetFrameworkMoniker), 
+                  new ClassicExecutor())
         {
         }
     }

BenchmarkDotNet/Toolchains/Dnx/DnxBuilder.cs → BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliBuilder.cs

@@ -2,28 +2,34 @@
 using System.Diagnostics;
 using System.IO;
 using BenchmarkDotNet.Loggers;
+using BenchmarkDotNet.Portability;
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Toolchains.Results;
 
-namespace BenchmarkDotNet.Toolchains.Dnx
+namespace BenchmarkDotNet.Toolchains.DotNetCli
 {
-    public class DnxBuilder : IBuilder
+    public class DotNetCliBuilder : IBuilder
     {
-        private static readonly int DefaultTimeout = (int)TimeSpan.FromMinutes(2).TotalMilliseconds;
+        private const string Configuration = "RELEASE";
+
+        private const string OutputDirectory = "binaries";
 
-        private string Framework { get; } = "dnx451";
+        private static readonly int DefaultTimeout = (int)TimeSpan.FromMinutes(2).TotalMilliseconds;
 
-        private string Configuration { get; } = "RELEASE";
+        private string Framework { get; }
 
-        private string OutputDirectory { get; } = "binaries";
+        public DotNetCliBuilder(string framework)
+        {
+            Framework = framework;
+        }
 
         /// <summary>
         /// generates project.lock.json that tells compiler where to take dlls and source from
         /// and builds executable and copies all required dll's
         /// </summary>
         public BuildResult Build(GenerateResult generateResult, ILogger logger, Benchmark benchmark)
         {
-            if (!ExecuteCommand("restore", generateResult.DirectoryPath, logger))
+            if (!ExecuteCommand("restore --fallbacksource https://dotnet.myget.org/F/dotnet-core/api/v3/index.json", generateResult.DirectoryPath, logger))
             {
                 return new BuildResult(generateResult, false, new Exception("dotnet restore has failed"), null);
             }
@@ -88,6 +94,6 @@ private static ProcessStartInfo BuildStartInfo(string workingDirectory, string a
         /// we use custom output path in order to avoid any future problems related to dotnet cli paths changing
         /// </summary>
         private string BuildExecutablePath(GenerateResult generateResult, Benchmark benchmark)
-            => Path.Combine(generateResult.DirectoryPath, OutputDirectory, $"{benchmark.ShortInfo}.exe");
+            => Path.Combine(generateResult.DirectoryPath, OutputDirectory, $"{benchmark.ShortInfo}{RuntimeInformation.ExecutableExtension}");
     }
 }

BenchmarkDotNet/Toolchains/Dnx/DnxGenerator.cs → BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliGenerator.cs

@@ -5,16 +5,23 @@
 using BenchmarkDotNet.Helpers;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
+using BenchmarkDotNet.Portability;
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Toolchains.Classic;
-using BenchmarkDotNet.Portability;
 
-namespace BenchmarkDotNet.Toolchains.Dnx
+namespace BenchmarkDotNet.Toolchains.DotNetCli
 {
-    internal class DnxGenerator : ClassicGenerator
+    internal class DotNetCliGenerator : ClassicGenerator
     {
         private const string ProjectFileName = "project.json";
 
+        private string TargetFrameworkMoniker { get; }
+
+        public DotNetCliGenerator(string targetFrameworkMoniker)
+        {
+            TargetFrameworkMoniker = targetFrameworkMoniker;
+        }
+
         /// <summary>
         /// we need our folder to be on the same level as the project that we want to reference
         /// we are limited by xprojs (by default compiles all .cs files in all subfolders, Program.cs could be doubled and fail the build)
@@ -34,7 +41,9 @@ protected override void GenerateProjectFile(ILogger logger, string projectDir, B
 
             var content = SetPlatform(template, benchmark.Job.Platform);
             content = SetDependencyToExecutingAssembly(content, benchmark.Target.Type);
-
+            content = SetTargetFrameworkMoniker(content, TargetFrameworkMoniker);
+            content = SetExtraDependencies(content);
+
             var projectJsonFilePath = Path.Combine(projectDir, ProjectFileName);
 
             File.WriteAllText(projectJsonFilePath, content);
@@ -60,6 +69,20 @@ private static string SetDependencyToExecutingAssembly(string template, Type ben
                 .Replace("$EXECUTINGASSEMBLY$", assemblyName.Name);
         }
 
+        private static string SetTargetFrameworkMoniker(string content, string targetFrameworkMoniker)
+        {
+            return content.Replace("$TFM$", targetFrameworkMoniker);
+        }
+
+        private static string SetExtraDependencies(string content)
+        {
+#if CORE
+            return content.Replace("$REQUIREDDEPENDENCY$", "\"dependencies\": { \"NETStandard.Library\": \"1.0.0-rc2-23811\" }");
+#else
+            return content.Replace("$REQUIREDDEPENDENCY$", "\"frameworkAssemblies\": { \"System.Runtime\": \"4.0.10.0\" }");
+#endif
+        }
+
         /// <summary>
         /// we can not simply call assemblyName.Version.ToString() because it is different than package version which can contain (and often does) text
         /// we are using the wildcard to get latest version of package/project restored

BenchmarkDotNet/project.json

@@ -54,14 +54,19 @@
         "define": [ "CORE" ]
       },
       "dependencies": {
-        "Microsoft.CSharp": "4.0.1-beta-23516",
-        "System.Collections": "4.0.11-beta-23516",
+        "NETStandard.Library": "1.0.0-rc2-23811",
+        "Microsoft.CSharp": "4.0.0",
+        "System.Collections": "4.0.10",
         "System.Console": "4.0.0-beta-23516",
-        "System.Linq": "4.0.1-beta-23516",
-        "System.Threading": "4.0.11-beta-23516",
+        "System.Linq": "4.0.0",
+        "System.Threading": "4.0.10",
         "System.Threading.Thread": "4.0.0-beta-23516",
         "System.Diagnostics.Process": "4.1.0-beta-23516",
-        "System.IO.FileSystem": "4.0.1-beta-23516",
+        "System.IO": "4.0.10",
+        "System.IO.FileSystem.Primitives": "4.0.0",
+        "System.IO.FileSystem": "4.0.0",
+        "System.Runtime": "4.0.20",
+        "System.Runtime.Extensions": "4.0.10",
         "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23516"
       }
     }