v5.7.2 (#231)

* Fix Entity.HttpAgentCustomMapper * Re-gen demo.
Avanade · Dec 16, 2023 · 0bb5203 · 0bb5203
1 parent 82caaf1
commit 0bb5203
Show file tree

Hide file tree

Showing 31 changed files with 63 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Represents the **NuGet** versions.
 
+## v5.7.2
+- *Fixed:* The `Entity.HttpAgentCustomMapper` property has been added to the schema for correctly include within code-generation.
+- *Fixed:* Upgraded `CoreEx` (`v3.7.0`) to include all related fixes and improvements.
+
 ## v5.7.1
 - *Fixed:* All related package dependencies updated to latest.
 

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

diff --git a/docs/Entity-Entity-Config.md b/docs/Entity-Entity-Config.md
@@ -255,6 +255,7 @@ Property | Description
 **`odataModel`** | The corresponding OData model name (required where `AutoImplement` is `OData`).
 **`odataCollectionName`** | The name of the underlying OData collection where `AutoImplement` is `OData`.<br/>&dagger; The underlying `Simple.OData.Client` will attempt to infer.
 `odataCustomMapper` | Indicates that a custom OData `Mapper` will be used; i.e. not generated.<br/>&dagger; Otherwise, by default, a `Mapper` will be generated.
+`httpAgentCustomMapper` | Indicates that a custom HTTP Agent `Mapper` will be used; i.e. not generated.<br/>&dagger; Otherwise, by default, a `Mapper` will be generated.
 
 <br/>
 

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.6.3" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.7.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
   </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
@@ -11,7 +11,7 @@
     <Folder Include="DataSvc\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.Cosmos" Version="3.6.2" />
-    <PackageReference Include="CoreEx.Validation" Version="3.6.3" />
+    <PackageReference Include="CoreEx.Cosmos" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.7.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.6.3" />
+    <PackageReference Include="CoreEx" Version="3.7.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
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.6.3" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.7.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.6.3" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.7.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.5.0" />
   </ItemGroup>

diff --git a/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj b/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj
@@ -15,13 +15,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.6.3" />
-    <PackageReference Include="CoreEx.Cosmos" Version="3.6.2" />
-    <PackageReference Include="CoreEx.Database" Version="3.6.3" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.6.3" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.6.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.6.3" />
-    <PackageReference Include="CoreEx.FluentValidation" Version="3.6.3" />
+    <PackageReference Include="CoreEx" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Cosmos" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Database" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.7.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.7.0" />
+    <PackageReference Include="CoreEx.FluentValidation" Version="3.7.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.20" />
   </ItemGroup>
 

diff --git a/samples/Demo/Beef.Demo.Business/Entities/Generated/Company.cs b/samples/Demo/Beef.Demo.Business/Entities/Generated/Company.cs
@@ -18,7 +18,7 @@ public partial class Company : ReferenceDataBaseEx<Guid, Company>
     /// </summary>
     public string? ExternalCode
     {
-        get => GetMapping<string?>(nameof(ExternalCode));
+        get => GetMapping<string>(nameof(ExternalCode));
         set { var __externalCode = ExternalCode; SetValue(ref __externalCode, value); SetMapping(nameof(ExternalCode), __externalCode!); }
     }
 

diff --git a/samples/Demo/Beef.Demo.Business/Entities/Generated/Gender.cs b/samples/Demo/Beef.Demo.Business/Entities/Generated/Gender.cs
@@ -36,7 +36,7 @@ public partial class Gender : ReferenceDataBaseEx<Guid, Gender>
     [JsonIgnore]
     public string? TripCode
     {
-        get => GetMapping<string?>(nameof(TripCode));
+        get => GetMapping<string>(nameof(TripCode));
         set { var __tripCode = TripCode; SetValue(ref __tripCode, value); SetMapping(nameof(TripCode), __tripCode!); }
     }
 

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.6.3" />
+    <PackageReference Include="CoreEx" Version="3.7.0" />
     <PackageReference Include="Grpc.Tools" Version="2.60.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

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.6.3" />
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.7.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.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.6.3" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.7.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.5.0" />
   </ItemGroup>

diff --git a/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj b/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
@@ -5,10 +5,10 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.6.3" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.6.3" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.6.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.6.3" />
+    <PackageReference Include="CoreEx" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.7.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.7.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.20" />
   </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.6.3" />
+    <PackageReference Include="CoreEx" Version="3.7.0" />
   </ItemGroup>
 </Project>
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,13 +32,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.6.3" />
+    <PackageReference Include="CoreEx" Version="3.7.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.6.3" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.7.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.6.3" />
-    <PackageReference Include="CoreEx.Azure" Version="3.6.3" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Azure" Version="3.7.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.7" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.5.0" />

diff --git a/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj b/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj
@@ -5,10 +5,10 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.6.3" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.6.3" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.6.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.6.3" />
+    <PackageReference Include="CoreEx" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.7.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.7.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.20" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj b/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
@@ -4,6 +4,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.6.3" />
+    <PackageReference Include="CoreEx" Version="3.7.0" />
   </ItemGroup>
 </Project>
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
@@ -16,8 +16,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.Azure" Version="3.6.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.6.3" />
+    <PackageReference Include="CoreEx.Azure" Version="3.7.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.7.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.13.5" />

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
@@ -28,7 +28,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.6.3" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.7.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,13 +32,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.6.3" />
+    <PackageReference Include="CoreEx" Version="3.7.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.6.3" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.7.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
@@ -65,15 +65,15 @@
       "type": "generated",
       "generator": "constant",
       "parameters": {
-        "value": "3.6.3"
+        "value": "3.7.0"
       },
       "replaces": "CoreExVersion"
     },
     "beef_version": {
       "type": "generated",
       "generator": "constant",
       "parameters": {
-        "value": "5.7.1"
+        "value": "5.7.2"
       },
       "replaces": "BeefVersion"
     },

diff --git a/tools/Beef.CodeGen.Core/Config/Entity/EntityConfig.cs b/tools/Beef.CodeGen.Core/Config/Entity/EntityConfig.cs
@@ -630,6 +630,14 @@ public class EntityConfig : ConfigBase<CodeGenConfig, CodeGenConfig>
             Description = "Prepended to `Operation.HttpAgentCode` where specified to enable standardized functionality.")]
         public string? HttpAgentCode { get; set; }
 
+        /// <summary>
+        /// Indicates that a custom HTTP Agent <c>Mapper</c> will be used; i.e. not generated.
+        /// </summary>
+        [JsonProperty("httpAgentCustomMapper", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        [CodeGenProperty("OData", Title = "Indicates that a custom HTTP Agent `Mapper` will be used; i.e. not generated.",
+            Description = "Otherwise, by default, a `Mapper` will be generated.")]
+        public bool? HttpAgentCustomMapper { get; set; }
+
         /// <summary>
         /// Gets or sets the `HttpAgent` data-layer name that should be used for base mappings.
         /// </summary>

diff --git a/tools/Beef.CodeGen.Core/Schema/entity.beef-5.json b/tools/Beef.CodeGen.Core/Schema/entity.beef-5.json
@@ -711,6 +711,11 @@
           "title": "The fluent-style method-chaining C# HTTP Agent API code to include where 'Operation.AutoImplement' is 'HttpAgent'.",
           "description": "Prepended to 'Operation.HttpAgentCode' where specified to enable standardized functionality."
         },
+        "httpAgentCustomMapper": {
+          "type": "boolean",
+          "title": "Indicates that a custom HTTP Agent 'Mapper' will be used; i.e. not generated.",
+          "description": "Otherwise, by default, a 'Mapper' will be generated."
+        },
         "httpAgentMapperBase": {
           "type": "string",
           "title": "The HTTP Agent data-layer name that should be used for base mappings."

diff --git a/tools/Beef.CodeGen.Core/Templates/Entity_cs.hbs b/tools/Beef.CodeGen.Core/Templates/Entity_cs.hbs
@@ -181,7 +181,7 @@ public {{#if Abstract}}abstract {{/if}}partial class {{{EntityName}}} : {{{Entit
     {{#if RefDataMapping}}
     public {{{PropertyType}}} {{Name}}
     {
-        get => GetMapping<{{{PropertyType}}}>(nameof({{Name}}));
+        get => GetMapping<{{{Type}}}>(nameof({{Name}}));
         set { var _{{PropertyPrivateName}} = {{Name}}; SetValue(ref _{{PropertyPrivateName}}, value); SetMapping(nameof({{Name}}), _{{PropertyPrivateName}}!); }
     }
     {{else}}

diff --git a/tools/Beef.Database.Core/Beef.Database.Core.csproj b/tools/Beef.Database.Core/Beef.Database.Core.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database" Version="3.6.3" />
+    <PackageReference Include="CoreEx.Database" Version="3.7.0" />
     <PackageReference Include="DbEx" Version="2.3.14" />
   </ItemGroup>
 

diff --git a/tools/Beef.Database.MySql/Beef.Database.MySql.csproj b/tools/Beef.Database.MySql/Beef.Database.MySql.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database.MySql" Version="3.6.3" />
+    <PackageReference Include="CoreEx.Database.MySql" Version="3.7.0" />
     <PackageReference Include="DbEx.MySql" Version="2.3.14" />
   </ItemGroup>
 

diff --git a/tools/Beef.Database.SqlServer/Beef.Database.SqlServer.csproj b/tools/Beef.Database.SqlServer/Beef.Database.SqlServer.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.6.3" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.7.0" />
     <PackageReference Include="DbEx.SqlServer" Version="2.3.14" />
   </ItemGroup>
 

diff --git a/tools/Beef.Test.NUnit/Beef.Test.NUnit.csproj b/tools/Beef.Test.NUnit/Beef.Test.NUnit.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.6.3" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.7.0" />
   </ItemGroup>
 
   <Import Project="..\..\Common.targets" />