Avanade · chullybun · Oct 11, 2024 · Oct 11, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 Represents the **NuGet** versions.
 
+## v5.16.1
+- *Fixed:* Upgraded dependencies related to `System.Text.Json`; resolve [Microsoft Security Advisory CVE-2024-43485](https://github.com/advisories/GHSA-8g4q-xg66-9fp4).
+
 ## v5.16.0
 - *Enhancement:* Database code-generation defaults to the use of [JSON](https://learn.microsoft.com/en-us/sql/relational-databases/json/json-data-sql-server)-serialized parameters versus UDT/TVP to minimize the need for additional database objects; specifically [User-Defined Types](https://learn.microsoft.com/en-us/sql/t-sql/statements/create-type-transact-sql) (UDT).
   - A new `CollectionType` property has been added to the code-generation configuration for query-based collection passing; supports `JSON` (default) and `UDT` (previous) values. Note that for JSON passing a `NVARCHAR(MAX)` type should be used.

diff --git a/Common.targets b/Common.targets
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>5.16.0</Version>
+		<Version>5.16.1</Version>
 		<LangVersion>preview</LangVersion>
 		<Authors>Avanade</Authors>
 		<Company>Avanade</Company>

diff --git a/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj b/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.25.6" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.8.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj b/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj
@@ -12,8 +12,8 @@
     <Folder Include="DataSvc\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Cosmos" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Validation" Version="3.25.6" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Cosmos" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.27.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj b/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj
@@ -8,6 +8,6 @@
     <Folder Include="Entities\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.25.6" />
+    <PackageReference Include="CoreEx" Version="3.27.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj b/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj
@@ -39,7 +39,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.25.6" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj b/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.25.6" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.8.1" />
   </ItemGroup>

diff --git a/samples/Demo/Beef.Demo.Api/Controllers/PersonController.cs b/samples/Demo/Beef.Demo.Api/Controllers/PersonController.cs
@@ -13,25 +13,22 @@ public partial class PersonController
         [HttpPost("api/v1/persons/extend-response", Name = "Person_ExtendResponse")]
         [ProducesResponseType(typeof(string), (int)HttpStatusCode.OK)]
         [ProducesResponseType((int)HttpStatusCode.NoContent)]
-        public Task<IActionResult> ExtendResponse(string? name)
-            => _webApi.PostWithResultAsync(Request, p =>
-            {
-                return Result.GoAsync(() => _manager.ExtendResponseAsync(name))  // Execute the business logic.
-                    .ThenAs(r =>                                                 // Then handle response where Result.IsSuccess; otherwise, allow to bubble out.
+        public Task<IActionResult> ExtendResponse(string? name) => _webApi.PostWithResultAsync(Request, p => 
+            Result.GoAsync(() => _manager.ExtendResponseAsync(name))         // Execute the business logic.
+                .ThenAs(r =>                                                 // Then handle response where Result.IsSuccess; otherwise, allow any error/exceptions to bubble out.
+                {
+                    var ia = p.CreateActionResult(r, HttpStatusCode.OK);     // Use standard CoreEx to create a ValueContentResult with an OK status to handle the response.
+                    if (ia is ValueContentResult vcr)                        // Ensure is a ValueContentResult, and if so, then manipulate.
                     {
-                        var ia = ValueContentResult.CreateResult(r, HttpStatusCode.OK, null, _webApi.JsonSerializer, p.RequestOptions, false, null);  // Use standard CoreEx ValueContentResult to handle the response.
-                        if (ia is ValueContentResult vcr)                        // Ensure is a ValueContentResult, and if so, then manipulate.
+                        vcr.BeforeExtension = hr =>                          // Extend the reponse by adding a new header.
                         {
-                            vcr.BeforeExtension = hr =>                          // Extend the reponse by adding a new header.
-                            {
-                                hr.Headers.Add("X-Beef-Test", "123");
-                                return Task.CompletedTask;
-                            };
-                        }
+                            hr.Headers.Add("X-Beef-Test", "123");
+                            return Task.CompletedTask;
+                        };
+                    }
 
-                        return ia;
-                    });
-            }, alternateStatusCode: HttpStatusCode.NoContent, operationType: CoreEx.OperationType.Unspecified);
+                    return ia;
+                }), alternateStatusCode: HttpStatusCode.NoContent, operationType: CoreEx.OperationType.Unspecified);
     }
 }
 

diff --git a/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj b/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj
@@ -16,14 +16,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.25.6" />
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Cosmos" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Database" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.25.6" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Validation" Version="3.25.6" />
-    <PackageReference Include="CoreEx.FluentValidation" Version="3.25.6" />
+    <PackageReference Include="CoreEx" Version="3.27.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Cosmos" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Database" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.27.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.27.0" />
+    <PackageReference Include="CoreEx.FluentValidation" Version="3.27.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.20" />
   </ItemGroup>
 

diff --git a/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj b/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
@@ -7,7 +7,7 @@
     <Folder Include="Agents\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.25.6" />
+    <PackageReference Include="CoreEx" Version="3.27.0" />
     <PackageReference Include="Grpc.Tools" Version="2.66.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/samples/Demo/Beef.Demo.Database/Program.cs b/samples/Demo/Beef.Demo.Database/Program.cs
@@ -20,7 +20,7 @@ public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args)
         {
             args.AddAssembly<Program>();
             args.AddSchemaOrder("Sec", "Ref", "Demo");
-            args.UseBeefSchema();
+            args.IncludeExtendedSchemaScripts();
             return args;
         }
     }

diff --git a/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj b/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj
@@ -52,7 +52,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.UnitTesting" Version="3.25.6" />
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.27.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj b/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.25.6" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.8.1" />
   </ItemGroup>

diff --git a/samples/My.Hr/My.Hr.Business/Data/HrDb.cs b/samples/My.Hr/My.Hr.Business/Data/HrDb.cs
@@ -3,13 +3,8 @@
 /// <summary>
 /// Represents the <b>My.Hr</b> database.
 /// </summary>
-public class HrDb : SqlServerDatabase
+public class HrDb(Func<SqlConnection> create, ILogger<HrDb>? logger = null) : SqlServerDatabase(create, logger)
 {
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HrDb"/> class.
-    /// </summary>
-    public HrDb(Func<SqlConnection> create, ILogger<HrDb>? logger = null) : base(create, logger) { }
-
     /// <inheritdoc/>
     protected override Task OnConnectionOpenAsync(DbConnection connection, CancellationToken cancellationToken)
         => SetSqlSessionContextAsync(cancellationToken: cancellationToken);

diff --git a/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj b/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.25.6" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Validation" Version="3.25.6" />
+    <PackageReference Include="CoreEx" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.27.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.27.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.31" />
   </ItemGroup>
 </Project>
diff --git a/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj b/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj
@@ -4,6 +4,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.25.6" />
+    <PackageReference Include="CoreEx" Version="3.27.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/My.Hr/My.Hr.Database/Program.cs b/samples/My.Hr/My.Hr.Database/Program.cs
@@ -24,5 +24,5 @@ static Task<int> Main(string[] args) => SqlServerMigrationConsole
     /// </summary>
     /// <param name="args">The <see cref="MigrationArgs"/>.</param>
     /// <returns>The <see cref="MigrationArgs"/>.</returns>
-    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args) => args.AddAssembly<Program>().UseBeefSchema();
+    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args) => args.AddAssembly<Program>().IncludeExtendedSchemaScripts();
 }
diff --git a/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj b/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.25.6" />
+    <PackageReference Include="CoreEx" Version="3.27.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -42,7 +42,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.25.6" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj b/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj
@@ -6,8 +6,8 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Azure" Version="3.25.6" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Azure" Version="3.27.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
     <PackageReference Include="AspNetCore.HealthChecks.Azure.Storage.Blobs" Version="8.0.1" />
     <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" />

diff --git a/samples/MyEf.Hr/MyEf.Hr.Business/Data/HrEfDb.cs b/samples/MyEf.Hr/MyEf.Hr.Business/Data/HrEfDb.cs
@@ -3,12 +3,6 @@
 /// <summary>
 /// Represents the <b>My.Hr</b> database using Entity Framework.
 /// </summary>
-public class HrEfDb : EfDb<HrEfDbContext>
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HrEfDb"/> class.
-    /// </summary>
-    /// <param name="dbContext">The entity framework database context.</param>
-    /// <param name="mapper">The <see cref="IMapper"/>.</param>
-    public HrEfDb(HrEfDbContext dbContext, IMapper mapper) : base(dbContext, mapper) { }
-}
+/// <param name="dbContext">The entity framework database context.</param>
+/// <param name="mapper">The <see cref="IMapper"/>.</param>
+public class HrEfDb(HrEfDbContext dbContext, IMapper mapper) : EfDb<HrEfDbContext>(dbContext, mapper) { }
diff --git a/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj b/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj
@@ -6,11 +6,11 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.25.6" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Validation" Version="3.25.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
+    <PackageReference Include="CoreEx" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.27.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.27.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Data\EfModel\Generated\" />

diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj b/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
@@ -5,6 +5,6 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.25.6" />
+    <PackageReference Include="CoreEx" Version="3.27.0" />
   </ItemGroup>
 </Project>
diff --git a/samples/MyEf.Hr/MyEf.Hr.Database/Program.cs b/samples/MyEf.Hr/MyEf.Hr.Database/Program.cs
@@ -24,5 +24,5 @@ static Task<int> Main(string[] args) => SqlServerMigrationConsole
     /// </summary>
     /// <param name="args">The <see cref="MigrationArgs"/>.</param>
     /// <returns>The <see cref="MigrationArgs"/>.</returns>
-    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args) => args.AddAssembly<Program>().UseBeefSchema();
+    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args) => args.AddAssembly<Program>().IncludeExtendedSchemaScripts();
 }
diff --git a/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj b/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj
@@ -15,14 +15,14 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.Azure" Version="3.25.6" />
-    <PackageReference Include="CoreEx.Validation" Version="3.25.6" />
+    <PackageReference Include="CoreEx.Azure" Version="3.27.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.27.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.22.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.4.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.10" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MyEf.Hr.Common\MyEf.Hr.Common.csproj" />

diff --git a/samples/MyEf.Hr/MyEf.Hr.Security.Test/MyEf.Hr.Security.Test.csproj b/samples/MyEf.Hr/MyEf.Hr.Security.Test/MyEf.Hr.Security.Test.csproj
@@ -27,7 +27,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.25.6" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/MyEf.Hr/MyEf.Hr.Test/MyEf.Hr.Test.csproj b/samples/MyEf.Hr/MyEf.Hr.Test/MyEf.Hr.Test.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.25.6" />
+    <PackageReference Include="CoreEx" Version="3.27.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -42,7 +42,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.25.6" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/templates/Beef.Template.Solution/content/.template.config/template.json b/templates/Beef.Template.Solution/content/.template.config/template.json
@@ -85,15 +85,15 @@
       "type": "generated",
       "generator": "constant",
       "parameters": {
-        "value": "3.25.6"
+        "value": "3.27.0"
       },
       "replaces": "CoreExVersion"
     },
     "beef_version": {
       "type": "generated",
       "generator": "constant",
       "parameters": {
-        "value": "5.16.0"
+        "value": "5.16.1"
       },
       "replaces": "BeefVersion"
     },

diff --git a/...s/Beef.Template.Solution/content/Company.AppName.Business/Company.AppName.Business.csproj b/...s/Beef.Template.Solution/content/Company.AppName.Business/Company.AppName.Business.csproj
@@ -24,7 +24,7 @@
     <!--#endif -->
     <PackageReference Include="CoreEx.Validation" Version="CoreExVersion" />
     <!--#if (implement_sqlserver) -->
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
     <!--#endif -->
     <!--#if (implement_mysql) -->
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />

diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Database/Program.cs b/templates/Beef.Template.Solution/content/Company.AppName.Database/Program.cs
@@ -45,7 +45,7 @@ public static Task<int> Main(string[] args) => PostgresMigrationConsole
     /// <returns>The <see cref="MigrationArgs"/>.</returns>
     /// <remarks>This is also invoked from the unit tests to ensure consistency of execution.</remarks>
 #if (implement_database)
-    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args) => args.AddAssembly<Program>().UseBeefSchema();
+    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args) => args.AddAssembly<Program>().IncludeExtendedSchemaScripts();
 #endif
 #if (implement_sqlserver || implement_mysql || implement_postgres)
     public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args) => args.AddAssembly<Program>();

diff --git a/tools/Beef.CodeGen.Core/Beef.CodeGen.Core.csproj b/tools/Beef.CodeGen.Core/Beef.CodeGen.Core.csproj
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OnRamp" Version="2.2.2" />
-    <PackageReference Include="DbEx" Version="2.6.1" />
+    <PackageReference Include="OnRamp" Version="2.2.3" />
+    <PackageReference Include="DbEx" Version="2.7.1" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.22" />
   </ItemGroup>
 

diff --git a/tools/Beef.Database.Core/Beef.Database.Core.csproj b/tools/Beef.Database.Core/Beef.Database.Core.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database" Version="3.25.6" />
-    <PackageReference Include="DbEx" Version="2.6.1" />
+    <PackageReference Include="CoreEx.Database" Version="3.27.0" />
+    <PackageReference Include="DbEx" Version="2.7.1" />
   </ItemGroup>
 
   <ItemGroup>