Pr2965v2

samples/core/Benchmarks/AverageBlogRanking.cs

@@ -11,15 +11,16 @@ namespace Benchmarks
     [MemoryDiagnoser]
     public class AverageBlogRanking
     {
-        public const int NumBlogs = 1000;
+        [Params(1000)]
+        public int NumBlogs;            // number of records to write [once], and read [each pass]
 
         [GlobalSetup]
         public void Setup()
         {
             using var context = new BloggingContext();
             context.Database.EnsureDeleted();
             context.Database.EnsureCreated();
-            context.SeedData();
+            context.SeedData(NumBlogs);
         }
 
         #region LoadEntities
@@ -35,7 +36,7 @@ public double LoadEntities()
                 count++;
             }
 
-            return sum / count;
+            return (double)sum / count;
         }
         #endregion
 
@@ -52,7 +53,7 @@ public double LoadEntitiesNoTracking()
                 count++;
             }
 
-            return sum / count;
+            return (double)sum / count;
         }
         #endregion
 
@@ -69,7 +70,7 @@ public double ProjectOnlyRanking()
                 count++;
             }
 
-            return sum / count;
+            return (double)sum / count;
         }
         #endregion
 
@@ -89,10 +90,10 @@ public class BloggingContext : DbContext
             protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
                 => optionsBuilder.UseSqlServer(@"Server=(localdb)\mssqllocaldb;Database=Blogging;Integrated Security=True");
 
-            public void SeedData()
+            public void SeedData(int numblogs)
             {
                 Blogs.AddRange(
-                    Enumerable.Range(0, NumBlogs).Select(i => new Blog
+                    Enumerable.Range(0, numblogs).Select(i => new Blog
                     {
                         Name = $"Blog{i}",
                         Url = $"blog{i}.blogs.net",

samples/core/Benchmarks/Benchmarks.csproj

@@ -1,12 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
+    <Optimize>true</Optimize>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.1" />
   </ItemGroup>
 </Project>

samples/core/Benchmarks/DynamicallyConstructedQueries.cs

@@ -17,7 +17,7 @@ public class DynamicallyConstructedQueries
         private int _blogNumber;
 
         [GlobalSetup]
-        public void GlobalSetup()
+        public static void GlobalSetup()
         {
             using var context = new BloggingContext();
             context.Database.EnsureDeleted();
@@ -30,7 +30,7 @@ public int WithConstant()
         {
             return GetBlogCount("blog" + Interlocked.Increment(ref _blogNumber));
 
-            int GetBlogCount(string url)
+            static int GetBlogCount(string url)
             {
                 using var context = new BloggingContext();
 

samples/core/Benchmarks/Inheritance.cs

@@ -15,7 +15,7 @@ public class Inheritance
         [Params(5000)]
         public int RowsPerEntityType { get; set; }
 
-        [GlobalSetup(Target=nameof(TPH))]
+        [GlobalSetup(Target = nameof(TPH))]
         public void SetupTPH()
         {
             Console.WriteLine("Setting up database...");
@@ -26,7 +26,7 @@ public void SetupTPH()
             Console.WriteLine("Setup complete.");
         }
 
-        [GlobalSetup(Target=nameof(TPT))]
+        [GlobalSetup(Target = nameof(TPT))]
         public void SetupTPT()
         {
             Console.WriteLine("Setting up database...");
@@ -38,15 +38,15 @@ public void SetupTPT()
         }
 
         [Benchmark]
-        public List<Root> TPH()
+        public static List<Root> TPH()
         {
             using var context = new TPHContext();
 
             return context.Roots.ToList();
         }
 
         [Benchmark]
-        public List<Root> TPT()
+        public static List<Root> TPT()
         {
             using var context = new TPTContext();
 

samples/core/Benchmarks/Program.cs

@@ -4,7 +4,6 @@ namespace Benchmarks
 {
     public class Program
     {
-        public static void Main(string[] args)
-            => BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
+        public static void Main(string[] args) => BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
     }
 }

samples/core/Benchmarks/QueryTrackingBehavior.cs

@@ -25,20 +25,20 @@ public void Setup()
             using var context = new BloggingContext();
             context.Database.EnsureDeleted();
             context.Database.EnsureCreated();
-            context.SeedData(NumBlogs, NumPostsPerBlog);
+            BloggingContext.SeedData(NumBlogs, NumPostsPerBlog);
             Console.WriteLine("Setup complete.");
         }
 
         [Benchmark(Baseline = true)]
-        public List<Post> AsTracking()
+        public static List<Post> AsTracking()
         {
             using var context = new BloggingContext();
 
             return context.Posts.AsTracking().Include(p => p.Blog).ToList();
         }
 
         [Benchmark]
-        public List<Post> AsNoTracking()
+        public static List<Post> AsNoTracking()
         {
             using var context = new BloggingContext();
 
@@ -53,7 +53,7 @@ public class BloggingContext : DbContext
             protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
                 => optionsBuilder.UseSqlServer(@"Server=(localdb)\mssqllocaldb;Database=Blogging;Integrated Security=True");
 
-            public void SeedData(int numBlogs, int numPostsPerBlog)
+            public static void SeedData(int numBlogs, int numPostsPerBlog)
             {
                 using var context = new BloggingContext();
                 context.AddRange(