Fix Fsharp template

CodeTherapist · Jul 8, 2019 · d936241 · d936241
1 parent 79a4aed
commit d936241
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/...et.BenchmarkProjectTemplate.FSharp/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp.nuspec b/...et.BenchmarkProjectTemplate.FSharp/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp.nuspec
@@ -9,7 +9,6 @@
     <tags>benchmark;benchmarking;performance;template</tags>
     <iconUrl>https://raw.githubusercontent.com/dotnet/BenchmarkDotNet/master/docs/guide/logo.png</iconUrl>
     <projectUrl>https://benchmarkdotnet.org</projectUrl>
-    <license type="expression">MIT</license>
     <repository type="git" url="https://github.com/dotnet/BenchmarkDotNet" ></repository>
     <packageTypes>
       <packageType name="Template" />

diff --git a/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/content/BenchmarkConfig.fs b/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/content/BenchmarkConfig.fs
@@ -1,20 +1,17 @@
-open BenchmarkDotNet.Analysers;
-open BenchmarkDotNet.Attributes;
-open BenchmarkDotNet.Columns;
-open BenchmarkDotNet.Configs;
-open BenchmarkDotNet.Exporters;
-open BenchmarkDotNet.Exporters.Csv;
-open BenchmarkDotNet.Jobs;
-open BenchmarkDotNet.Loggers;
+module Configs 
+
+open BenchmarkDotNet.Configs
+open BenchmarkDotNet.Diagnosers
+open BenchmarkDotNet.Exporters
+open BenchmarkDotNet.Validators
+
+type BenchmarkConfig() as self =
 
-type BenchmarkConfig() =
     // Configure your benchmarks, see for more details: https://benchmarkdotnet.org/articles/configs/configs.html.
-     ManualConfig
-            .Create(DefaultConfig.Instance)
-            .With(Job.ShortRun.With(Runtime.Mono))
-            .With(Job.ShortRun.With(Runtime.Core))
+    inherit ManualConfig() 
+    do
+        self
             .With(MemoryDiagnoser.Default)
             .With(MarkdownExporter.GitHub)
             .With(ExecutionValidator.FailOnError)
-    inherit ManualConfig()
-    new() = BenchmarkConfig()
+            |> ignore
diff --git a/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/content/_BenchmarkName_.fs b/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/content/_BenchmarkName_.fs
@@ -1,9 +1,11 @@
-open System;
-open BenchmarkDotNet;
-open BenchmarkDotNet.Attributes;
+module Benchmark 
+
+open System
+open BenchmarkDotNet
+open BenchmarkDotNet.Attributes
 
 #if config
-[<Config(typeof(BenchmarkConfig))>]
+[<Config(typedefof<Configs.BenchmarkConfig>)>]
 #endif
 type $(BenchmarkName) () =
     [<Params(0, 1, 15, 100)>]
@@ -36,3 +38,5 @@ type $(BenchmarkName) () =
 
     [<Benchmark>]
     member this.AsyncToSync () = Async.Sleep(this.sleepTime) |> Async.RunSynchronously
+
+
diff --git a/...tes/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/content/_BenchmarkProjectName_.fsproj b/...tes/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/content/_BenchmarkProjectName_.fsproj
@@ -14,4 +14,10 @@
     <PackageReference Include="BenchmarkDotNet" Version="0.1*" />
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.1*" />
   </ItemGroup>
+  <ItemGroup Condition="'$(config)' == true">
+    <Compile Include="BenchmarkConfig.fs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="$(BenchmarkName).fs" />
+  </ItemGroup>
 </Project>