Merge pull request #255 from petabridge/dev

v1.2.2 NBench Release
petabridge · Jul 24, 2018 · 3225434 · 3225434
2 parents 7fdcbca + 557f2fb
commit 3225434
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -57,8 +57,8 @@ After defining some NBench `PerfBenchmark` methods and declaring some measuremen
 The easiest way to run NBench in any runtime, .NET Core or .NET Framework is to install the `dotnet-nbench` NuGet package and add it as a `DotNetCliToolReference` to your NBench test projects.
 
 ```
-<PackageReference Include="NBench" Version="1.2" />
-<DotNetCliToolReference Include="dotnet-nbench" Version="1.2" />
+<PackageReference Include="NBench" Version="1.2.1" />
+<DotNetCliToolReference Include="dotnet-nbench" Version="1.2.1" />
 ```
 
 This will allow you to run NBench specifications for all frameworks your test projects target, including multi-targeted projects, by simply running the following command in the working directory of your test project:

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+#### v1.2.2 July 24 2018
+* [Bug: unable to propagate --concurrent setting to .NET Core executables via dotnet nbench](https://github.com/petabridge/NBench/issues/250) - fixed.
+* [.Net Core: NU1605    Detected package downgrade: System.Reflection.TypeExtensions](https://github.com/petabridge/NBench/issues/246) - fixed.
+
 #### v1.2.1 July 11 2018
 Fixed an issue with the `dotnet-nbench` package where it missed a required runtime in order to execute against .NET Core 2.* projects. 
 

diff --git a/build.fsx b/build.fsx
@@ -127,8 +127,10 @@ Target "NBench" <| fun _ ->
                 |> append (filename project)
                 |> append "--output"
                 |> append outputPerfTests
-                |> append "--concurrent true" 
-                |> append "--trace true"
+                |> append "--concurrent" 
+                |> append "true"
+                |> append "--trace"
+                |> append "true"
                 |> append "--diagnostic"
                 |> append "--no-build"
                 |> toText

diff --git a/src/NBench.Execution/CommandLine.cs b/src/NBench.Execution/CommandLine.cs
@@ -166,21 +166,21 @@ public static string FormatCapturedArguments(bool includeOutput = true)
             string output = "";
 
             if (HasProperty(TracingKey))
-                output += $"{TracingKey}={GetSingle(TracingKey)} ";
+                output += $"{TracingKey} {GetSingle(TracingKey)} ";
 
             if (HasProperty(ConcurrentKey))
             {
-                output += $"{ConcurrentKey}={GetSingle(ConcurrentKey)} ";
+                output += $"{ConcurrentKey} {GetSingle(ConcurrentKey)} ";
             }
 
             if (HasProperty(ExcludeKey))
             {
-                output += $"{ExcludeKey}={string.Join(",", GetProperty(ExcludeKey))} ";
+                output += $"{ExcludeKey} {string.Join(",", GetProperty(ExcludeKey))} ";
             }
 
             if (HasProperty(IncludeKey))
             {
-                output += $"{IncludeKey}={string.Join(",", GetProperty(IncludeKey))} ";
+                output += $"{IncludeKey} {string.Join(",", GetProperty(IncludeKey))} ";
             }
 
             if (HasProperty(ConfigurationKey))
@@ -190,7 +190,7 @@ public static string FormatCapturedArguments(bool includeOutput = true)
 
             if (HasProperty(OutputKey) && includeOutput)
             {
-                output += $"{OutputKey}={GetSingle(OutputKey)} ";
+                output += $"{OutputKey} {GetSingle(OutputKey)} ";
             }
 
             if (HasProperty(DiagnosticsKey))

diff --git a/src/NBench/NBench.csproj b/src/NBench/NBench.csproj
@@ -24,13 +24,13 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="System.Diagnostics.Contracts" Version="4.0.1" />
-    <PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
-    <PackageReference Include="System.Runtime.Loader" Version="4.0.0" />
-    <PackageReference Include="System.Threading.Thread" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.0" />
+    <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
+    <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
+    <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NBench/Sdk/Compiler/Assemblies/NetCoreAssemblyRuntimeLoader.cs b/src/NBench/Sdk/Compiler/Assemblies/NetCoreAssemblyRuntimeLoader.cs
@@ -39,7 +39,6 @@ public NetCoreAssemblyRuntimeLoader(Assembly assembly, IBenchmarkOutput trace)
             _resolver = new CompositeCompilationAssemblyResolver(new ICompilationAssemblyResolver[]{
                 new AppBaseCompilationAssemblyResolver(Path.GetDirectoryName(Assembly.CodeBase)),
                 new ReferenceAssemblyPathResolver(),
-                new PackageCacheCompilationAssemblyResolver(),
                 new PackageCompilationAssemblyResolver()});
 
             _loadContext.Resolving += LoadContextOnResolving;
@@ -66,7 +65,6 @@ public NetCoreAssemblyRuntimeLoader(string path, IBenchmarkOutput trace)
             _resolver = new CompositeCompilationAssemblyResolver(new ICompilationAssemblyResolver[]{
                 new AppBaseCompilationAssemblyResolver(Path.GetDirectoryName(path)),
                 new ReferenceAssemblyPathResolver(),
-                new PackageCacheCompilationAssemblyResolver(),
                 new PackageCompilationAssemblyResolver()});
 
             _loadContext.Resolving += LoadContextOnResolving;

diff --git a/src/common.props b/src/common.props
@@ -2,16 +2,17 @@
   <PropertyGroup>
     <Copyright>Copyright © 2015-2018 Petabridge</Copyright>
     <Authors>Petabridge</Authors>
-    <VersionPrefix>1.2.1</VersionPrefix>
-    <PackageReleaseNotes>Fixed an issue with the `dotnet-nbench` package where it missed a required runtime in order to execute against .NET Core 2.* projects.</PackageReleaseNotes>
+    <VersionPrefix>1.2.2</VersionPrefix>
+    <PackageReleaseNotes>[Bug: unable to propagate --concurrent setting to .NET Core executables via dotnet nbench](https://github.com/petabridge/NBench/issues/250) - fixed.
+[.Net Core: NU1605    Detected package downgrade: System.Reflection.TypeExtensions](https://github.com/petabridge/NBench/issues/246) - fixed.</PackageReleaseNotes>
     <PackageProjectUrl>
       https://github.com/petabridge/NBench
     </PackageProjectUrl>
     <PackageLicenseUrl>
       https://github.com/petabridge/NBench/blob/dev/LICENSE
     </PackageLicenseUrl>
     <PackageTags>performance;benchmarking;benchmark;perf;testing;NBench</PackageTags>
-    <NoWarn>$(NoWarn);CS1591;NU1605</NoWarn>
+    <NoWarn>$(NoWarn);CS1591;</NoWarn>
     <PackageIconUrl>https://github.com/petabridge/NBench/raw/dev/images/NBench_logo_square_140.png</PackageIconUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/petabridge/NBench</RepositoryUrl>