[aspnetcore] Bump to 6.0.0-rc.2 (#6863)

Also:

* Update EF Core 6.0 to use latest optimizations
* Use positional parameters in raw Npgsql tests

frameworks/CSharp/aspnetcore/Benchmarks/Benchmarks.csproj

@@ -12,10 +12,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0-rc.1.21452.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0-rc.2.21480.5" />
 
     <PackageReference Include="Dapper" Version="2.0.90" />
-    <PackageReference Include="MySqlConnector" Version="1.3.12" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-rc.1" />
+    <PackageReference Include="MySqlConnector" Version="1.3.13" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-rc.2" />
   </ItemGroup>
 </Project>

frameworks/CSharp/aspnetcore/Benchmarks/Data/Fortune.cs

@@ -15,8 +15,9 @@ namespace Benchmarks.Data
 
         [Column("message")]
         [StringLength(2048)]
+        [Required]
         public string Message { get; set; }
-        
+
         public int CompareTo(object obj)
         {
             return CompareTo((Fortune)obj);

frameworks/CSharp/aspnetcore/Benchmarks/Startup.cs

@@ -15,6 +15,7 @@ using System;
 using System.Data.Common;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
+using Microsoft.EntityFrameworkCore.Storage;
 
 namespace Benchmarks
 {
@@ -61,9 +62,12 @@ namespace Benchmarks
             {
                 if (Scenarios.Any("Ef"))
                 {
-                    services.AddDbContextPool<ApplicationDbContext>(options => options.UseNpgsql(appSettings.ConnectionString));
+                    services.AddDbContextPool<ApplicationDbContext>(options => options
+                        .UseNpgsql(appSettings.ConnectionString,
+                            o => o.ExecutionStrategy(d => new NonRetryingExecutionStrategy(d)))
+                        .EnableThreadSafetyChecks(false));
                 }
-                
+
                 if (Scenarios.Any("Raw") || Scenarios.Any("Dapper"))
                 {
                     services.AddSingleton<DbProviderFactory>(NpgsqlFactory.Instance);

frameworks/CSharp/aspnetcore/PlatformBenchmarks/Data/Providers/RawDbMySqlConnector.cs

@@ -19,8 +19,8 @@ namespace PlatformBenchmarks
     {
         private readonly ConcurrentRandom _random;
         private readonly string _connectionString;
-        private readonly MemoryCache _cache = new MemoryCache(
-            new MemoryCacheOptions()
+        private readonly MemoryCache _cache = new(
+            new MemoryCacheOptions
             {
                 ExpirationScanFrequency = TimeSpan.FromMinutes(60)
             });
@@ -98,7 +98,7 @@ namespace PlatformBenchmarks
                     var (cmd, idParameter) = await rawdb.CreateReadCommandAsync(db);
                     using (cmd)
                     {
-                        Func<ICacheEntry, Task<CachedWorld>> create = async (entry) =>
+                        Func<ICacheEntry, Task<CachedWorld>> create = async _ =>
                         {
                             return await rawdb.ReadSingleRow(cmd);
                         };
@@ -110,7 +110,7 @@ namespace PlatformBenchmarks
 
                         for (; i < result.Length; i++)
                         {
-                            result[i] = await rawdb._cache.GetOrCreateAsync<CachedWorld>(key, create);
+                            result[i] = await rawdb._cache.GetOrCreateAsync(key, create);
 
                             id = rawdb._random.Next(1, 10001);
                             idParameter.Value = id;
@@ -245,7 +245,7 @@ namespace PlatformBenchmarks
             }
         }
         
-        private static readonly object[] _cacheKeys = Enumerable.Range(0, 10001).Select((i) => new CacheKey(i)).ToArray();
+        private static readonly object[] _cacheKeys = Enumerable.Range(0, 10001).Select(i => new CacheKey(i)).ToArray();
 
         public sealed class CacheKey : IEquatable<CacheKey>
         {

frameworks/CSharp/aspnetcore/PlatformBenchmarks/Data/Providers/RawDbNpgsql.cs

@@ -19,8 +19,8 @@ namespace PlatformBenchmarks
     {
         private readonly ConcurrentRandom _random;
         private readonly string _connectionString;
-        private readonly MemoryCache _cache = new MemoryCache(
-            new MemoryCacheOptions()
+        private readonly MemoryCache _cache = new(
+            new MemoryCacheOptions
             {
                 ExpirationScanFrequency = TimeSpan.FromMinutes(60)
             });
@@ -98,7 +98,7 @@ namespace PlatformBenchmarks
                     var (cmd, idParameter) = rawdb.CreateReadCommand(db);
                     using (cmd)
                     {
-                        Func<ICacheEntry, Task<CachedWorld>> create = async (entry) =>
+                        Func<ICacheEntry, Task<CachedWorld>> create = async _ =>
                         {
                             return await rawdb.ReadSingleRow(cmd);
                         };
@@ -110,7 +110,7 @@ namespace PlatformBenchmarks
 
                         for (; i < result.Length; i++)
                         {
-                            result[i] = await rawdb._cache.GetOrCreateAsync<CachedWorld>(key, create);
+                            result[i] = await rawdb._cache.GetOrCreateAsync(key, create);
 
                             id = rawdb._random.Next(1, 10001);
                             idParameter.TypedValue = id;
@@ -215,8 +215,8 @@ namespace PlatformBenchmarks
 
         private (NpgsqlCommand readCmd, NpgsqlParameter<int> idParameter) CreateReadCommand(NpgsqlConnection connection)
         {
-            var cmd = new NpgsqlCommand("SELECT id, randomnumber FROM world WHERE id = @Id", connection);
-            var parameter = new NpgsqlParameter<int>(parameterName: "@Id", value: _random.Next(1, 10001));
+            var cmd = new NpgsqlCommand("SELECT id, randomnumber FROM world WHERE id = $1", connection);
+            var parameter = new NpgsqlParameter<int> { TypedValue = _random.Next(1, 10001) };
 
             cmd.Parameters.Add(parameter);
 
@@ -238,7 +238,7 @@ namespace PlatformBenchmarks
             }
         }
 
-        private static readonly object[] _cacheKeys = Enumerable.Range(0, 10001).Select((i) => new CacheKey(i)).ToArray();
+        private static readonly object[] _cacheKeys = Enumerable.Range(0, 10001).Select(i => new CacheKey(i)).ToArray();
 
         public sealed class CacheKey : IEquatable<CacheKey>
         {

frameworks/CSharp/aspnetcore/PlatformBenchmarks/PlatformBenchmarks.csproj

@@ -12,8 +12,8 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Condition=" '$(DatabaseProvider)' == 'Npgsql' " Include="Npgsql" Version="6.0.0-rc.1" />
-    <PackageReference Condition=" '$(DatabaseProvider)' == 'MySqlConnector' " Include="MySqlConnector" Version="1.3.12" />
+    <PackageReference Condition=" '$(DatabaseProvider)' == 'Npgsql' " Include="Npgsql" Version="6.0.0-rc.2" />
+    <PackageReference Condition=" '$(DatabaseProvider)' == 'MySqlConnector' " Include="MySqlConnector" Version="1.3.13" />
   </ItemGroup>
 
   <ItemGroup>

frameworks/CSharp/aspnetcore/aspcore-ado-my.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY PlatformBenchmarks .
 RUN dotnet publish -c Release -o out /p:DatabaseProvider=MySqlConnector
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO

frameworks/CSharp/aspnetcore/aspcore-ado-pg-up.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY PlatformBenchmarks .
 RUN dotnet publish -c Release -o out /p:DatabaseProvider=Npgsql
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO

frameworks/CSharp/aspnetcore/aspcore-ado-pg.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY PlatformBenchmarks .
 RUN dotnet publish -c Release -o out /p:DatabaseProvider=Npgsql
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO

frameworks/CSharp/aspnetcore/aspcore-mvc-ado-my.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.mysql.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbSingleQueryRaw,MvcDbMultiQueryRaw,MvcDbMultiUpdateRaw,MvcDbFortunesRaw"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbSingleQueryRaw,MvcDbMultiQueryRaw,MvcDbMultiUpdateRaw,MvcDbFortunesRaw"]

frameworks/CSharp/aspnetcore/aspcore-mvc-ado-pg-up.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.postgresql.updates.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbMultiUpdateRaw"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbMultiUpdateRaw"]

frameworks/CSharp/aspnetcore/aspcore-mvc-ado-pg.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbSingleQueryRaw,MvcDbMultiQueryRaw,MvcDbFortunesRaw"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbSingleQueryRaw,MvcDbMultiQueryRaw,MvcDbFortunesRaw"]

frameworks/CSharp/aspnetcore/aspcore-mvc-dap-my.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.mysql.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbSingleQueryDapper,MvcDbMultiQueryDapper,MvcDbMultiUpdateDapper,MvcDbFortunesDapper"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbSingleQueryDapper,MvcDbMultiQueryDapper,MvcDbMultiUpdateDapper,MvcDbFortunesDapper"]

frameworks/CSharp/aspnetcore/aspcore-mvc-dap-pg-up.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.postgresql.updates.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbMultiUpdateDapper"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbMultiUpdateDapper"]

frameworks/CSharp/aspnetcore/aspcore-mvc-dap-pg.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbSingleQueryDapper,MvcDbMultiQueryDapper,MvcDbFortunesDapper"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbSingleQueryDapper,MvcDbMultiQueryDapper,MvcDbFortunesDapper"]

frameworks/CSharp/aspnetcore/aspcore-mvc-ef-pg.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbSingleQueryEf,MvcDbMultiQueryEf,MvcDbFortunesEf"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=MvcDbSingleQueryEf,MvcDbMultiQueryEf,MvcDbFortunesEf"]

frameworks/CSharp/aspnetcore/aspcore-mvc.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -16,4 +16,4 @@ COPY --from=build /app/out ./
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=mvcplaintext,mvcjson"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=mvcplaintext,mvcjson"]

frameworks/CSharp/aspnetcore/aspcore-mw-ado-my.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.mysql.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbSingleQueryRaw,DbMultiQueryRaw,DbMultiUpdateRaw,DbFortunesRaw"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbSingleQueryRaw,DbMultiQueryRaw,DbMultiUpdateRaw,DbFortunesRaw"]

frameworks/CSharp/aspnetcore/aspcore-mw-ado-pg-up.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.postgresql.updates.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbMultiUpdateRaw"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbMultiUpdateRaw"]

frameworks/CSharp/aspnetcore/aspcore-mw-ado-pg.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbSingleQueryRaw,DbMultiQueryRaw,DbFortunesRaw"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbSingleQueryRaw,DbMultiQueryRaw,DbFortunesRaw"]

frameworks/CSharp/aspnetcore/aspcore-mw-dap-my.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.mysql.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbSingleQueryDapper,DbMultiQueryDapper,DbMultiUpdateDapper,DbFortunesDapper"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbSingleQueryDapper,DbMultiQueryDapper,DbMultiUpdateDapper,DbFortunesDapper"]

frameworks/CSharp/aspnetcore/aspcore-mw-dap-pg-up.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.postgresql.updates.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbMultiUpdateDapper"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbMultiUpdateDapper"]

frameworks/CSharp/aspnetcore/aspcore-mw-dap-pg.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbSingleQueryDapper,DbMultiQueryDapper,DbFortunesDapper"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbSingleQueryDapper,DbMultiQueryDapper,DbFortunesDapper"]

frameworks/CSharp/aspnetcore/aspcore-mw-ef-pg.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO
@@ -17,4 +17,4 @@ COPY Benchmarks/appsettings.postgresql.json ./appsettings.json
 
 EXPOSE 8080
 
-ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbSingleQueryEf,DbMultiQueryEf,DbFortunesEf"]
+ENTRYPOINT ["dotnet", "Benchmarks.dll", "scenarios=DbSingleQueryEf,DbMultiQueryEf,DbFortunesEf"]

frameworks/CSharp/aspnetcore/aspcore-mw-json.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO

frameworks/CSharp/aspnetcore/aspcore-mw.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY Benchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 
 # Full PGO

frameworks/CSharp/aspnetcore/aspcore.dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-rc.2 AS build
 WORKDIR /app
 COPY PlatformBenchmarks .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2 AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV DOTNET_SYSTEM_NET_SOCKETS_INLINE_COMPLETIONS 1