Skip to content

Commit 9769c73

Browse files
committed
Really make 'dotnet' work :P
1 parent 610f736 commit 9769c73

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/Benchmarks/Program.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5+
using System.IO;
56
using System.Runtime;
67
using System.Threading;
78
using Benchmarks.Configuration;
@@ -22,9 +23,12 @@ public static void Main(string[] args)
2223
Console.WriteLine("ASP.NET Core Benchmarks");
2324
Console.WriteLine("-----------------------");
2425

26+
Console.WriteLine($"Current directory: {Directory.GetCurrentDirectory()}");
27+
2528
var webHost = new WebHostBuilder()
2629
.UseServer("Microsoft.AspNetCore.Server.Kestrel")
2730
.UseCaptureStartupErrors(false)
31+
.UseApplicationBasePath(Directory.GetCurrentDirectory())
2832
.UseDefaultConfiguration(args)
2933
.UseStartup<Startup>()
3034
.ConfigureServices(services => services

src/Benchmarks/Startup.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,20 @@
1313
using Microsoft.EntityFrameworkCore;
1414
using Microsoft.Extensions.Configuration;
1515
using Microsoft.Extensions.DependencyInjection;
16+
using Microsoft.Extensions.PlatformAbstractions;
1617

1718
namespace Benchmarks
1819
{
1920
public class Startup
2021
{
21-
public Startup(IHostingEnvironment env, Scenarios scenarios)
22+
public Startup(IApplicationEnvironment appEnv, IHostingEnvironment hostingEnv, Scenarios scenarios)
2223
{
2324
// Set up configuration sources.
2425
var builder = new ConfigurationBuilder()
25-
.Include(env.Configuration)
26+
.SetBasePath(appEnv.ApplicationBasePath)
27+
.Include(hostingEnv.Configuration)
2628
.AddJsonFile("appsettings.json")
27-
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
29+
.AddJsonFile($"appsettings.{hostingEnv.EnvironmentName}.json", optional: true)
2830
.AddEnvironmentVariables();
2931

3032
Configuration = builder.Build();

src/Benchmarks/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
"ef": "Microsoft.EntityFrameworkCore.Commands"
2020
},
2121
"frameworks": {
22-
"net451": {},
2322
"dnxcore50": {
2423
"imports": "portable-net451+win8",
2524
"dependencies": {
2625
"Microsoft.NETCore.Platforms": "1.0.1-*",
2726
"System.Runtime.Serialization.Primitives": "4.1.0-*"
2827
}
29-
}
28+
},
29+
"net451": {}
3030
},
3131
"publishExclude": [
3232
"node_modules",

0 commit comments

Comments
 (0)