Bring over a few changes from the TechEmpower repo

src/Benchmarks/Benchmarks.csproj

@@ -8,7 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(CoreFxVersion)" />
     <PackageReference Include="Dapper" Version="$(DapperVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.ResponseCaching" Version="$(AspNetCoreVersion)" />
@@ -17,7 +16,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(AspNetCoreVersion)" />
@@ -31,10 +29,6 @@
     -->
     <PackageReference Include="Npgsql" Version="$(NpgsqlVersion)" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion)" />
+    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(CoreFxVersion)" />
   </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.Dotnet" Version="$(AspNetCoreVersion)" />
-  </ItemGroup>
-
 </Project>

src/Benchmarks/Configuration/AppSettings.cs

@@ -1,7 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
-
-using Microsoft.Extensions.Logging;
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 namespace Benchmarks.Configuration
 {

src/Benchmarks/Configuration/Scenarios.cs

@@ -155,7 +155,7 @@ public static string GetPath(Expression<Func<Scenarios, bool>> scenarioExpressio
 
         public int Enable(string partialName)
         {
-            if(string.Equals(partialName, "[default]", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(partialName, "[default]", StringComparison.OrdinalIgnoreCase))
             {
                 EnableDefault();
                 return 2;

src/Benchmarks/Data/ApplicationDbContext.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.EntityFrameworkCore;
 

src/Benchmarks/Data/ApplicationDbSeeder.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Linq;

src/Benchmarks/Data/DapperDb.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
@@ -40,7 +40,7 @@ public async Task<World> LoadSingleQueryRow()
         async Task<World> ReadSingleRow(DbConnection db)
         {
             return await db.QueryFirstOrDefaultAsync<World>(
-                    "SELECT id, randomnumber FROM world WHERE Id = @Id",
+                    "SELECT id, randomnumber FROM world WHERE id = @Id",
                     new { Id = _random.Next(1, 10001) });
         }
 

src/Benchmarks/Data/EfDb.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;

src/Benchmarks/Data/RawDb.cs

@@ -28,20 +28,19 @@ public RawDb(IRandom random, DbProviderFactory dbProviderFactory, IOptions<AppSe
         public async Task<World> LoadSingleQueryRow()
         {
             using (var db = _dbProviderFactory.CreateConnection())
-            using (var cmd = CreateReadCommand(db))
             {
                 db.ConnectionString = _connectionString;
                 await db.OpenAsync();
 
-                return await ReadSingleRow(db, cmd);
+                using (var cmd = CreateReadCommand(db))
+                {
+                    return await ReadSingleRow(db, cmd);
+                }
             }
         }
 
         async Task<World> ReadSingleRow(DbConnection connection, DbCommand cmd)
         {
-            // Prepared statements improve PostgreSQL performance by 10-15%
-            cmd.Prepare();
-
             using (var rdr = await cmd.ExecuteReaderAsync(CommandBehavior.SingleRow))
             {
                 await rdr.ReadAsync();
@@ -64,6 +63,10 @@ DbCommand CreateReadCommand(DbConnection connection)
             id.Value = _random.Next(1, 10001);
             cmd.Parameters.Add(id);
 
+            // Prepared statements improve PostgreSQL performance by 10-15%
+            // Especially if you only call them once, instead of on every execution :)
+            cmd.Prepare();
+
             return cmd;
         }
 
@@ -72,14 +75,16 @@ public async Task<World[]> LoadMultipleQueriesRows(int count)
             var result = new World[count];
 
             using (var db = _dbProviderFactory.CreateConnection())
-            using (var cmd = CreateReadCommand(db))
             {
                 db.ConnectionString = _connectionString;
                 await db.OpenAsync();
-                for (int i = 0; i < count; i++)
+                using (var cmd = CreateReadCommand(db))
                 {
-                    result[i] = await ReadSingleRow(db, cmd);
-                    cmd.Parameters["@Id"].Value = _random.Next(1, 10001);
+                    for (int i = 0; i < count; i++)
+                    {
+                        result[i] = await ReadSingleRow(db, cmd);
+                        cmd.Parameters["@Id"].Value = _random.Next(1, 10001);
+                    }
                 }
             }
 
@@ -93,43 +98,45 @@ public async Task<World[]> LoadMultipleUpdatesRows(int count)
             var updateCommand = new StringBuilder(count);
 
             using (var db = _dbProviderFactory.CreateConnection())
-            using (var updateCmd = db.CreateCommand())
-            using (var queryCmd = CreateReadCommand(db))
             {
                 db.ConnectionString = _connectionString;
                 await db.OpenAsync();
 
-                for (int i = 0; i < count; i++)
+                using (var updateCmd = db.CreateCommand())
+                using (var queryCmd = CreateReadCommand(db))
                 {
-                    results[i] = await ReadSingleRow(db, queryCmd);
-                    queryCmd.Parameters["@Id"].Value = _random.Next(1, 10001);
-                }
+                    for (int i = 0; i < count; i++)
+                    {
+                        results[i] = await ReadSingleRow(db, queryCmd);
+                        queryCmd.Parameters["@Id"].Value = _random.Next(1, 10001);
+                    }
 
-                // postgres has problems with deadlocks when these aren't sorted
-                Array.Sort<World>(results, (a, b) => a.Id.CompareTo(b.Id));
+                    // postgres has problems with deadlocks when these aren't sorted
+                    Array.Sort<World>(results, (a, b) => a.Id.CompareTo(b.Id));
 
-                for(int i = 0; i < count; i++)
-                {
-                    var id = updateCmd.CreateParameter();
-                    id.ParameterName = BatchUpdateString.Strings[i].Id;
-                    id.DbType = DbType.Int32;
-                    updateCmd.Parameters.Add(id);
-
-                    var random = updateCmd.CreateParameter();
-                    random.ParameterName = BatchUpdateString.Strings[i].Random;
-                    id.DbType = DbType.Int32;
-                    updateCmd.Parameters.Add(random);
-
-                    var randomNumber = _random.Next(1, 10001);
-                    id.Value = results[i].Id;
-                    random.Value = randomNumber;
-                    results[i].RandomNumber = randomNumber;
-
-                    updateCommand.Append(BatchUpdateString.Strings[i].UpdateQuery);
-                }
+                    for(int i = 0; i < count; i++)
+                    {
+                        var id = updateCmd.CreateParameter();
+                        id.ParameterName = BatchUpdateString.Strings[i].Id;
+                        id.DbType = DbType.Int32;
+                        updateCmd.Parameters.Add(id);
+
+                        var random = updateCmd.CreateParameter();
+                        random.ParameterName = BatchUpdateString.Strings[i].Random;
+                        id.DbType = DbType.Int32;
+                        updateCmd.Parameters.Add(random);
+
+                        var randomNumber = _random.Next(1, 10001);
+                        id.Value = results[i].Id;
+                        random.Value = randomNumber;
+                        results[i].RandomNumber = randomNumber;
+
+                        updateCommand.Append(BatchUpdateString.Strings[i].UpdateQuery);
+                    }
 
-                updateCmd.CommandText = updateCommand.ToString();
-                await updateCmd.ExecuteNonQueryAsync();
+                    updateCmd.CommandText = updateCommand.ToString();
+                    await updateCmd.ExecuteNonQueryAsync();
+                }
             }
 
             return results;

src/Benchmarks/Data/World.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.ComponentModel.DataAnnotations.Schema;
 

src/Benchmarks/Middleware/DebugInfoPageMiddleware.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Linq;
@@ -24,13 +24,7 @@ public class DebugInfoPageMiddleware
         private static readonly string _configurationName = "";
 #endif
 
-#if NET46
-        private static readonly string _targetFrameworkName = AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName;
-#elif NETCOREAPP2_0
         private static readonly string _targetFrameworkName = AppContext.TargetFrameworkName;
-#else
-#error the target framework needs to be updated.                    
-#endif
 
         private readonly IHostingEnvironment _hostingEnv;
         private readonly RequestDelegate _next;

src/Benchmarks/Middleware/FortunesDapperMiddleware.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Text.Encodings.Web;
@@ -40,7 +40,7 @@ public async Task Invoke(HttpContext httpContext)
             await _next(httpContext);
         }
     }
-    
+
     public static class FortunesDapperMiddlewareExtensions
     {
         public static IApplicationBuilder UseFortunesDapper(this IApplicationBuilder builder)

src/Benchmarks/Middleware/FortunesRawMiddleware.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Text.Encodings.Web;
@@ -40,7 +40,7 @@ public async Task Invoke(HttpContext httpContext)
             await _next(httpContext);
         }
     }
-    
+
     public static class FortunesRawMiddlewareExtensions
     {
         public static IApplicationBuilder UseFortunesRaw(this IApplicationBuilder builder)

src/Benchmarks/Middleware/MiddlewareHelpers.cs

@@ -51,7 +51,6 @@ public static async Task RenderFortunesHtml(IEnumerable<Fortune> model, HttpCont
             // fortunes includes multibyte characters so response.Length is incorrect
             httpContext.Response.ContentLength = Encoding.UTF8.GetByteCount(response);
             await httpContext.Response.WriteAsync(response);
-
         }
     }
 }

src/Benchmarks/Middleware/MultipleQueriesDapperMiddleware.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Threading.Tasks;

src/Benchmarks/Middleware/MultipleQueriesRawMiddleware.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Threading.Tasks;

src/Benchmarks/Middleware/MultipleUpdatesDapperMiddleware.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Threading.Tasks;

src/Benchmarks/Middleware/MultipleUpdatesRawMiddleware.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Threading.Tasks;

src/Benchmarks/Middleware/PlaintextMiddleware.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Text;
@@ -16,7 +16,7 @@ public class PlaintextMiddleware
         private static readonly byte[] _helloWorldPayload = Encoding.UTF8.GetBytes("Hello, World!");
 
         private readonly RequestDelegate _next;
-        
+
         public PlaintextMiddleware(RequestDelegate next)
         {
             _next = next;
@@ -41,7 +41,7 @@ public static Task WriteResponse(HttpResponse response)
             return response.Body.WriteAsync(_helloWorldPayload, 0, payloadLength);
         }
     }
-    
+
     public static class PlaintextMiddlewareExtensions
     {
         public static IApplicationBuilder UsePlainText(this IApplicationBuilder builder)

src/Benchmarks/Middleware/SingleQueryDapperMiddleware.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Threading.Tasks;

src/Benchmarks/Middleware/SingleQueryEfMiddleware.cs

@@ -8,7 +8,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 

src/Benchmarks/Middleware/SingleQueryRawMiddleware.cs

@@ -1,5 +1,5 @@
-// Copyright (c) .NET Foundation. All rights reserved. 
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Threading.Tasks;

src/Benchmarks/Program.cs

@@ -189,9 +189,11 @@ private static void StartInteractiveConsoleThread()
                         Console.WriteLine($"Gen 0: {GC.CollectionCount(0)}, Gen 1: {GC.CollectionCount(1)}, Gen 2: {GC.CollectionCount(2)}");
                     }
                 }
-            });
+            })
+            {
+                IsBackground = true
+            };
 
-            interactiveThread.IsBackground = true;
             interactiveThread.Start();
 
             started.WaitOne();