Merge pull request #43 from Aaronontheweb/dev

NBench v0.1.1 release

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+#### 0.1.1 December 5 2015
+Bugfix for `NBench.Runner` NuGet package, which [didn't work properly out of the box due to a .dll dependency issue](https://github.com/petabridge/NBench/issues/41). This has been resolved!
+
 #### 0.1.0 December 3 2015
 First "production-ready" release of NBench.
 

build.fsx

@@ -170,8 +170,7 @@ module Nuget =
      // add NBench dependency for other projects
     let getDependencies project =
         match project with
-        | "NBench" -> []
-        | _ -> ["NBench", release.NugetVersion]
+        | _ -> []
 
      // used to add -pre suffix to pre-release packages
     let getProjectVersion project =
@@ -201,6 +200,21 @@ let createNugetPackages _ =
     let getDirName workingDir dirCount =
         workingDir + dirCount.ToString()
 
+    let getReleaseFiles project releaseDir =
+        match project with
+        | "NBench.Runner" -> 
+            !! (releaseDir @@ project + ".dll")
+            ++ (releaseDir @@ "NBench.dll")
+            ++ (releaseDir @@ project + ".exe")
+            ++ (releaseDir @@ project + ".pdb")
+            ++ (releaseDir @@ "NBench.pdb")
+            ++ (releaseDir @@ project + ".xml")
+        | _ ->
+            !! (releaseDir @@ project + ".dll")
+            ++ (releaseDir @@ project + ".exe")
+            ++ (releaseDir @@ project + ".pdb")
+            ++ (releaseDir @@ project + ".xml")
+
     CleanDir workingDir
 
     ensureDirectory nugetDir
@@ -239,10 +253,7 @@ let createNugetPackages _ =
         printfn "Creating output directory %s" libDir
         ensureDirectory libDir
         CleanDir libDir
-        !! (releaseDir @@ project + ".dll")
-        ++ (releaseDir @@ project + ".exe")
-        ++ (releaseDir @@ project + ".pdb")
-        ++ (releaseDir @@ project + ".xml")
+        getReleaseFiles project releaseDir
         |> CopyFiles libDir
 
         // Copy all src-files (.cs and .fs files) to workingDir/src
@@ -294,12 +305,18 @@ let publishNugetPackages _ =
                 !! (nugetDir @@ "*.nupkg") 
                 -- (nugetDir @@ "*.symbols.nupkg") |> Seq.sortBy(fun x -> x.ToLower())
             for package in normalPackages do
-                publishPackage (getBuildParamOrDefault "nugetpublishurl" "") (getBuildParam "nugetkey") 3 package
+                try
+                    publishPackage (getBuildParamOrDefault "nugetpublishurl" "") (getBuildParam "nugetkey") 3 package
+                with exn ->
+                    printfn "%s" exn.Message
 
         if shouldPushSymbolsPackages then
             let symbolPackages= !! (nugetDir @@ "*.symbols.nupkg") |> Seq.sortBy(fun x -> x.ToLower())
             for package in symbolPackages do
-                publishPackage (getBuildParam "symbolspublishurl") (getBuildParam "symbolskey") 3 package
+                try
+                    publishPackage (getBuildParam "symbolspublishurl") (getBuildParam "symbolskey") 3 package
+                with exn ->
+                    printfn "%s" exn.Message
 
 Target "Nuget" <| fun _ -> 
     createNugetPackages()
@@ -384,7 +401,6 @@ Target "All" DoNothing
 
 // tests dependencies
 "CleanTests" ==> "RunTests"
-"BuildRelease" ==> "RunTests"
 
 
 // perf dependencies

src/SharedAssemblyInfo.cs

@@ -1,11 +1,7 @@
-// Copyright (c) Petabridge <https://petabridge.com/>. All rights reserved.
-// Licensed under the Apache 2.0 license. See LICENSE file in the project root for full license information.
-
-// <auto-generated/>
+// <auto-generated/>
 using System.Reflection;
 
 [assembly: AssemblyCompanyAttribute("Petabridge")]
 [assembly: AssemblyCopyrightAttribute("Copyright © 2015")]
-[assembly: AssemblyVersionAttribute("0.0.2")]
-[assembly: AssemblyFileVersionAttribute("0.0.2")]
-
+[assembly: AssemblyVersionAttribute("0.1.0")]
+[assembly: AssemblyFileVersionAttribute("0.1.0")]