Update benchmark handling for latest BenchmarkDotNet

(The JSON file format has changed a little.)
nodatime · May 20, 2018 · ac42918 · ac42918
1 parent 76978b5
commit ac42918
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/build/BenchmarkUploader/BriefJsonModel.cs b/build/BenchmarkUploader/BriefJsonModel.cs
@@ -28,9 +28,9 @@ public class HostEnvironment
             public bool HasRyuJit { get; set; }
             public string BenchmarkDotNetVersion { get; set; }
             public string JitModules { get; set; }
-            public OptionalString OsVersion { get; set; }
-            public OptionalString ProcessorName { get; set; }
-            public int ProcessorCount { get; set; }
+            public string OsVersion { get; set; }
+            public string ProcessorName { get; set; }
+            public int LogicalCoreCount { get; set; }
         }
 
         public class JsonBenchmark

diff --git a/build/BenchmarkUploader/Program.cs b/build/BenchmarkUploader/Program.cs
@@ -88,9 +88,9 @@ private static void ProcessRun(BenchmarkRepository environmentRepository, string
             var environment = new BenchmarkEnvironment
             {
                 Machine = Environment.MachineName.ToLowerInvariant(),
-                OperatingSystem = hostEnvironment.OsVersion?.GetValue() ?? "",
-                Processor = hostEnvironment.ProcessorName?.GetValue() ?? "",
-                ProcessorCount = hostEnvironment.ProcessorCount,
+                OperatingSystem = hostEnvironment.OsVersion ?? "",
+                Processor = hostEnvironment.ProcessorName ?? "",
+                ProcessorCount = hostEnvironment.LogicalCoreCount,
                 TargetFramework = tfm,
                 JitModules = hostEnvironment.JitModules,
                 HasRyuJit = hostEnvironment.HasRyuJit,