EF Value Generator for int and long backed Id's

src/StronglyTypedIds/Templates/Guid/Guid_EfCoreValueConverter.cs

@@ -8,4 +8,14 @@ public EfCoreValueConverter(Microsoft.EntityFrameworkCore.Storage.ValueConversio
                     value => new TESTID(value),
                     mappingHints
                 ) { }
+        }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<TESTID>
+        { 
+            public override bool GeneratesTemporaryValues => false;
+
+            public override TESTID Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            { 
+                return TESTID.New();
+            }
         }

src/StronglyTypedIds/Templates/Int/Int_EfCoreValueConverter.cs

@@ -8,4 +8,16 @@ public EfCoreValueConverter(Microsoft.EntityFrameworkCore.Storage.ValueConversio
                     value => new TESTID(value),
                     mappingHints
                 ) { }
+        }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<TESTID>
+        {
+            private int _id = int.MinValue;
+            public override bool GeneratesTemporaryValues => true;
+
+            public override TESTID Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            {
+                System.Threading.Interlocked.Increment(ref _id);
+                return new TESTID(_id);
+            }
         }

src/StronglyTypedIds/Templates/Long/Long_EfCoreValueConverter.cs

@@ -8,4 +8,16 @@ public EfCoreValueConverter(Microsoft.EntityFrameworkCore.Storage.ValueConversio
                     value => new TESTID(value),
                     mappingHints
                 ) { }
+        }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<TESTID>
+        {
+            private long _id = long.MinValue;
+            public override bool GeneratesTemporaryValues => true;
+
+            public override TESTID Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            {
+                System.Threading.Interlocked.Increment(ref _id);
+                return new TESTID(_id);
+            }
         }

test/StronglyTypedIds.IntegrationTests/LongIdTests.cs

@@ -200,6 +200,32 @@ public void WhenEfCoreValueConverterUsesValueConverter()
                 Assert.Equal(original.Id, retrieved.Id);
             }
         }
+
+        [Fact]
+        public void WhenEfCoreValueGenerationUsesValueGenerator()
+        {
+            var connection = new SqliteConnection("DataSource=:memory:");
+            connection.Open();
+
+            var options = new DbContextOptionsBuilder<TestDbContext>()
+                .UseSqlite(connection)
+                .Options;
+
+            var original = new GenerationTestEntity(); 
+            using (var context = new TestDbContext(options))
+            {
+                context.Database.EnsureCreated();
+                context.GenerationEntities.Add(original); 
+                context.SaveChanges();
+            }
+
+            using (var context = new TestDbContext(options))
+            {
+                var all = context.GenerationEntities.ToList();
+                var retrieved = Assert.Single(all);
+                Assert.Equal(1, retrieved.Id.Value); 
+            }
+        }
 
         [Fact]
         public async Task WhenDapperValueConverterUsesValueConverter()
@@ -322,6 +348,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         public class TestDbContext : DbContext
         {
             public DbSet<TestEntity> Entities { get; set; }
+            public DbSet<GenerationTestEntity> GenerationEntities { get; set; }
 
             public TestDbContext(DbContextOptions options) : base(options)
             {
@@ -337,6 +364,15 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                             .HasConversion(new EfCoreLongId.EfCoreValueConverter())
                             .ValueGeneratedNever();
                     });
+                modelBuilder
+                    .Entity<GenerationTestEntity>(builder =>
+                    {
+                        builder
+                            .Property(x => x.Id)
+                            .HasConversion(new EfCoreLongId.EfCoreValueConverter())
+                            .HasValueGenerator<EfCoreLongId.EfCoreValueGenerator>()
+                            .ValueGeneratedOnAdd();
+                    });
             }
         }
 
@@ -345,6 +381,11 @@ public class TestEntity
             public EfCoreLongId Id { get; set; }
         }
 
+        public class GenerationTestEntity
+        {
+            public EfCoreLongId Id { get; set; }
+        }
+
         public class EntityWithNullableId
         {
             public NewtonsoftJsonLongId? Id { get; set; }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Guid_implementations=0.verified.txt

@@ -46,5 +46,15 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        { 
+            public override bool GeneratesTemporaryValues => false;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            { 
+                return MyTestId.New();
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Guid_implementations=2.verified.txt

@@ -46,5 +46,15 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        { 
+            public override bool GeneratesTemporaryValues => false;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            { 
+                return MyTestId.New();
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Guid_implementations=4.verified.txt

@@ -47,5 +47,15 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        { 
+            public override bool GeneratesTemporaryValues => false;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            { 
+                return MyTestId.New();
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Guid_implementations=6.verified.txt

@@ -47,5 +47,15 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        { 
+            public override bool GeneratesTemporaryValues => false;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            { 
+                return MyTestId.New();
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Int_implementations=0.verified.txt

@@ -45,5 +45,17 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        {
+            private int _id = int.MinValue;
+            public override bool GeneratesTemporaryValues => true;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            {
+                System.Threading.Interlocked.Increment(ref _id);
+                return new MyTestId(_id);
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Int_implementations=2.verified.txt

@@ -45,5 +45,17 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        {
+            private int _id = int.MinValue;
+            public override bool GeneratesTemporaryValues => true;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            {
+                System.Threading.Interlocked.Increment(ref _id);
+                return new MyTestId(_id);
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Int_implementations=4.verified.txt

@@ -46,5 +46,17 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        {
+            private int _id = int.MinValue;
+            public override bool GeneratesTemporaryValues => true;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            {
+                System.Threading.Interlocked.Increment(ref _id);
+                return new MyTestId(_id);
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Int_implementations=6.verified.txt

@@ -46,5 +46,17 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        {
+            private int _id = int.MinValue;
+            public override bool GeneratesTemporaryValues => true;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            {
+                System.Threading.Interlocked.Increment(ref _id);
+                return new MyTestId(_id);
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Long_implementations=0.verified.txt

@@ -45,5 +45,17 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        {
+            private long _id = long.MinValue;
+            public override bool GeneratesTemporaryValues => true;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            {
+                System.Threading.Interlocked.Increment(ref _id);
+                return new MyTestId(_id);
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Long_implementations=2.verified.txt

@@ -45,5 +45,17 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        {
+            private long _id = long.MinValue;
+            public override bool GeneratesTemporaryValues => true;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            {
+                System.Threading.Interlocked.Increment(ref _id);
+                return new MyTestId(_id);
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Long_implementations=4.verified.txt

@@ -46,5 +46,17 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        {
+            private long _id = long.MinValue;
+            public override bool GeneratesTemporaryValues => true;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            {
+                System.Threading.Interlocked.Increment(ref _id);
+                return new MyTestId(_id);
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=16_backingType=Long_implementations=6.verified.txt

@@ -46,5 +46,17 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        {
+            private long _id = long.MinValue;
+            public override bool GeneratesTemporaryValues => true;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            {
+                System.Threading.Interlocked.Increment(ref _id);
+                return new MyTestId(_id);
+            }
+        }
     }
 }

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=18_backingType=Guid_implementations=0.verified.txt

@@ -47,6 +47,16 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        { 
+            public override bool GeneratesTemporaryValues => false;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            { 
+                return MyTestId.New();
+            }
+        }
 
         class MyTestIdTypeConverter : System.ComponentModel.TypeConverter
         {

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=18_backingType=Guid_implementations=2.verified.txt

@@ -47,6 +47,16 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        { 
+            public override bool GeneratesTemporaryValues => false;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            { 
+                return MyTestId.New();
+            }
+        }
 
         class MyTestIdTypeConverter : System.ComponentModel.TypeConverter
         {

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=18_backingType=Guid_implementations=4.verified.txt

@@ -48,6 +48,16 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        { 
+            public override bool GeneratesTemporaryValues => false;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            { 
+                return MyTestId.New();
+            }
+        }
 
         class MyTestIdTypeConverter : System.ComponentModel.TypeConverter
         {

test/StronglyTypedIds.Tests/Snapshots/SourceGenerationHelperSnapshotTests.GeneratesIdCorrectly_ns=Some.Namespace_converter=18_backingType=Guid_implementations=6.verified.txt

@@ -48,6 +48,16 @@ namespace Some.Namespace
                     mappingHints
                 ) { }
         }
+
+        public class EfCoreValueGenerator : Microsoft.EntityFrameworkCore.ValueGeneration.ValueGenerator<MyTestId>
+        { 
+            public override bool GeneratesTemporaryValues => false;
+
+            public override MyTestId Next(Microsoft.EntityFrameworkCore.ChangeTracking.EntityEntry entry)
+            { 
+                return MyTestId.New();
+            }
+        }
 
         class MyTestIdTypeConverter : System.ComponentModel.TypeConverter
         {