From ffd115341c20dde07395446a5c3f49fa63559f59 Mon Sep 17 00:00:00 2001
From: Steve Smith <steve@kentsmiths.com>
Date: Fri, 18 Oct 2024 17:12:16 -0400
Subject: [PATCH] Adding an EntityBase overload for Vogen Ids

Minor cleanup
Updated packages
---
 Directory.Packages.props                          | 14 +++++++-------
 .../Ardalis.SharedKernel.csproj                   |  6 ++++--
 src/Ardalis.SharedKernel/EntityBase.cs            | 15 ++++++++++++++-
 .../DispatchAndClearEvents.cs                     |  2 +-
 .../DispatchAndClearEventsWithGuidId.cs           |  2 +-
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e297b62..47c6df5 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,13 +2,13 @@
   <ItemGroup>
     <PackageVersion Include="Ardalis.GuardClauses" Version="4.6.0" />
     <PackageVersion Include="Ardalis.Specification" Version="8.0.0" />
-    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
-    <PackageVersion Include="FluentAssertions" Version="6.11.0" />
-    <PackageVersion Include="MediatR" Version="12.3.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.1" />
+    <PackageVersion Include="MediatR" Version="12.4.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Ardalis.SharedKernel/Ardalis.SharedKernel.csproj b/src/Ardalis.SharedKernel/Ardalis.SharedKernel.csproj
index 88314ff..38f8fab 100644
--- a/src/Ardalis.SharedKernel/Ardalis.SharedKernel.csproj
+++ b/src/Ardalis.SharedKernel/Ardalis.SharedKernel.csproj
@@ -13,9 +13,11 @@
     <RepositoryUrl>https://github.com/ardalis/Ardalis.SharedKernel</RepositoryUrl>
     <PackageTags>DDD;Shared Kernel;SharedKernel;Domain-Driven Design;Repository;Specification;ValueObject;Value Object;Ardalis;Clean;Clean Architecture;Clean Architecture Template</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
-    <Version>1.6.0</Version>
+    <Version>2.1.0</Version>
     <PackageReleaseNotes>
-      * Updated to latest NuGet Package Versions
+      * Updated packages
+      * Added default to TId property initializer
+      * Added another EntityBase overload to work with Vogen value objects
     </PackageReleaseNotes>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
diff --git a/src/Ardalis.SharedKernel/EntityBase.cs b/src/Ardalis.SharedKernel/EntityBase.cs
index 0c38ff7..b7b0ffc 100644
--- a/src/Ardalis.SharedKernel/EntityBase.cs
+++ b/src/Ardalis.SharedKernel/EntityBase.cs
@@ -13,5 +13,18 @@ public abstract class EntityBase : HasDomainEventsBase
 public abstract class EntityBase<TId> : HasDomainEventsBase
   where TId : struct, IEquatable<TId>
 {
-  public TId Id { get; set; }
+  public TId Id { get; set; } = default!;
 }
+
+/// <summary>
+/// For use with Vogen or similar tools for generating code for 
+/// strongly typed Ids.
+/// </summary>
+/// <typeparam name="T"></typeparam>
+/// <typeparam name="TId"></typeparam>
+public abstract class EntityBase<T, TId> : HasDomainEventsBase
+  where T : EntityBase<T, TId>
+{
+  public TId Id { get; set; } = default!;
+}
+
diff --git a/tests/Ardalis.SharedKernel.UnitTests/MediatRDomainEventDispatcherTests/DispatchAndClearEvents.cs b/tests/Ardalis.SharedKernel.UnitTests/MediatRDomainEventDispatcherTests/DispatchAndClearEvents.cs
index 35fbf1c..24b2475 100644
--- a/tests/Ardalis.SharedKernel.UnitTests/MediatRDomainEventDispatcherTests/DispatchAndClearEvents.cs
+++ b/tests/Ardalis.SharedKernel.UnitTests/MediatRDomainEventDispatcherTests/DispatchAndClearEvents.cs
@@ -18,7 +18,7 @@ public void AddTestDomainEvent()
   }
 
   [Fact]
-  public async void CallsPublishAndClearDomainEvents()
+  public async Task CallsPublishAndClearDomainEvents()
   {
     // Arrange
     var mediatorMock = new Mock<IMediator>();
diff --git a/tests/Ardalis.SharedKernel.UnitTests/MediatRDomainEventDispatcherTests/DispatchAndClearEventsWithGuidId.cs b/tests/Ardalis.SharedKernel.UnitTests/MediatRDomainEventDispatcherTests/DispatchAndClearEventsWithGuidId.cs
index c07eb39..bb5a5e8 100644
--- a/tests/Ardalis.SharedKernel.UnitTests/MediatRDomainEventDispatcherTests/DispatchAndClearEventsWithGuidId.cs
+++ b/tests/Ardalis.SharedKernel.UnitTests/MediatRDomainEventDispatcherTests/DispatchAndClearEventsWithGuidId.cs
@@ -18,7 +18,7 @@ public void AddTestDomainEvent()
   }
 
   [Fact]
-  public async void CallsPublishAndClearDomainEvents()
+  public async Task CallsPublishAndClearDomainEvents()
   {
     // Arrange
     var mediatorMock = new Mock<IMediator>();