From cb5aea0a50a6009589d4e387f28381f92ccd17d9 Mon Sep 17 00:00:00 2001 From: Aaron Stannard Date: Sat, 14 Jul 2018 13:52:04 -0500 Subject: [PATCH] close #246 - update downstream NuGet dependencies --- src/NBench/NBench.csproj | 14 +++++++------- .../Assemblies/NetCoreAssemblyRuntimeLoader.cs | 2 -- src/common.props | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/NBench/NBench.csproj b/src/NBench/NBench.csproj index 79b8cd7b..64bc437d 100644 --- a/src/NBench/NBench.csproj +++ b/src/NBench/NBench.csproj @@ -24,13 +24,13 @@ - - - - - - - + + + + + + + diff --git a/src/NBench/Sdk/Compiler/Assemblies/NetCoreAssemblyRuntimeLoader.cs b/src/NBench/Sdk/Compiler/Assemblies/NetCoreAssemblyRuntimeLoader.cs index fd7fe2b3..8729213e 100644 --- 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 index 31e08747..23d7e369 100644 --- a/src/common.props +++ b/src/common.props @@ -11,7 +11,7 @@ https://github.com/petabridge/NBench/blob/dev/LICENSE performance;benchmarking;benchmark;perf;testing;NBench - $(NoWarn);CS1591;NU1605 + $(NoWarn);CS1591; https://github.com/petabridge/NBench/raw/dev/images/NBench_logo_square_140.png git https://github.com/petabridge/NBench