Refactored to version 1.0.1

Henk Kin · Henk Kin · commit 54f2d7e4a718 · 2019-10-02T16:18:42.000+02:00
diff --git a/.bettercodehub.yml b/.bettercodehub.yml
@@ -0,0 +1,3 @@
+component_depth: 2
+languages:
+- csharp
diff --git a/Identifiers.EntityFrameworkCore.SqlServer.sln b/Identifiers.EntityFrameworkCore.SqlServer.sln
@@ -5,6 +5,13 @@ VisualStudioVersion = 16.0.29324.140
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identifiers.EntityFrameworkCore.SqlServer", "Identifiers.EntityFrameworkCore.SqlServer\Identifiers.EntityFrameworkCore.SqlServer.csproj", "{90E30D11-B814-47C4-BA3B-EB1E963A43EA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3750EA4C-3861-4ED4-B0AD-F872D2AA550B}"
+	ProjectSection(SolutionItems) = preProject
+		.bettercodehub.yml = .bettercodehub.yml
+		appveyor.yml = appveyor.yml
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/Identifiers.EntityFrameworkCore.SqlServer/IdentifierMigrationsAnnotationProvider.cs b/Identifiers.EntityFrameworkCore.SqlServer/IdentifierMigrationsAnnotationProvider.cs
@@ -6,7 +6,7 @@
 
 namespace Identifiers.EntityFrameworkCore.SqlServer
 {
-    public class IdentifierMigrationsAnnotationProvider : MigrationsAnnotationProvider
+    internal class IdentifierMigrationsAnnotationProvider : MigrationsAnnotationProvider
     {
         public IdentifierMigrationsAnnotationProvider(MigrationsAnnotationProviderDependencies dependencies)
             : base(dependencies)
@@ -20,7 +20,7 @@ public override IEnumerable<IAnnotation> For(IProperty property)
             var annotation = property.FindAnnotation("Identifier");
             return annotation == null
                 ? baseAnnotations
-                : baseAnnotations.Concat(new[] { new Annotation("SqlServer:ValueGenerationStrategy", annotation.Value)  });
+                : baseAnnotations.Concat(new[] { new Annotation("SqlServer:ValueGenerationStrategy", annotation.Value) });
         }
     }
-}
+}
diff --git a/Identifiers.EntityFrameworkCore.SqlServer/IdentifierPropertyBuilderExtensions.cs b/Identifiers.EntityFrameworkCore.SqlServer/IdentifierPropertyBuilderExtensions.cs
@@ -5,15 +5,16 @@
 namespace Identifiers.EntityFrameworkCore.SqlServer
 {
     public static class IdentifierPropertyBuilderExtensions
-    { 
+    {
         public static PropertyBuilder<Identifier> IdentifierValueGeneratedOnAdd(this PropertyBuilder<Identifier> propertyBuilder)
         {
             propertyBuilder = propertyBuilder
                 .ValueGeneratedOnAdd()
                 .HasAnnotation("Identifier", SqlServerValueGenerationStrategy.IdentityColumn);
 
             propertyBuilder.Metadata.SetBeforeSaveBehavior(PropertySaveBehavior.Ignore);
+
             return propertyBuilder;
         }
     }
-}
+}
diff --git a/Identifiers.EntityFrameworkCore.SqlServer/IdentifierSqlServerDbContextOptionsExtensions.cs b/Identifiers.EntityFrameworkCore.SqlServer/IdentifierSqlServerDbContextOptionsExtensions.cs
@@ -7,12 +7,12 @@ namespace Identifiers.EntityFrameworkCore.SqlServer
 {
     public static class IdentifierSqlServerDbContextOptionsExtensions
     {
-        public static DbContextOptionsBuilder UseIdentifiers<TDatabaseClrType>(this DbContextOptionsBuilder optionsBuilder) where TDatabaseClrType : IConvertible
+        public static DbContextOptionsBuilder UseIdentifiers<TDatabaseClrType>(this DbContextOptionsBuilder optionsBuilder)
         {
             optionsBuilder.ReplaceService<IMigrationsAnnotationProvider, IdentifierMigrationsAnnotationProvider>();
             optionsBuilder.ReplaceService<IValueConverterSelector, IdentifierValueConverterSelector<TDatabaseClrType>>();
 
             return optionsBuilder;
         }
     }
-}
+}
diff --git a/Identifiers.EntityFrameworkCore.SqlServer/IdentifierValueConverter.cs b/Identifiers.EntityFrameworkCore.SqlServer/IdentifierValueConverter.cs
@@ -1,17 +1,16 @@
 ﻿using System;
-using Identifiers.TypeConverters;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Identifiers.EntityFrameworkCore.SqlServer
 {
-    public class IdentifierValueConverter<TDatabaseClrType> : ValueConverter<Identifier, TDatabaseClrType> where TDatabaseClrType : IConvertible
+    internal class IdentifierValueConverter<TDatabaseClrType> : ValueConverter<Identifier, TDatabaseClrType>
     {
         public IdentifierValueConverter(ConverterMappingHints mappingHints = null)
             : base(
-                id => IdentifierTypeConverter.FromIdentifier<TDatabaseClrType>(id),
-                value => IdentifierTypeConverter.ToIdentifier<TDatabaseClrType>(value),
-                new ConverterMappingHints(valueGeneratorFactory: (p, t) => new IdentifierValueGenerator<TDatabaseClrType>()) 
+                id => (TDatabaseClrType)Convert.ChangeType(id.GetValue(), typeof(TDatabaseClrType)),
+                value => new Identifier(value),
+                new ConverterMappingHints(valueGeneratorFactory: (p, t) => new IdentifierValueGenerator<TDatabaseClrType>())
             )
         { }
     }
-}
+}
diff --git a/Identifiers.EntityFrameworkCore.SqlServer/IdentifierValueConverterSelector.cs b/Identifiers.EntityFrameworkCore.SqlServer/IdentifierValueConverterSelector.cs
@@ -5,11 +5,7 @@
 
 namespace Identifiers.EntityFrameworkCore.SqlServer
 {
-    /// <summary>
-    /// Thanks to https://andrewlock.net/strongly-typed-ids-in-ef-core-using-strongly-typed-entity-ids-to-avoid-primitive-obsession-part-4/
-    /// </summary>
-    /// <typeparam name="TDatabaseClrType"></typeparam>
-    public class IdentifierValueConverterSelector<TDatabaseClrType> : ValueConverterSelector where TDatabaseClrType : IConvertible
+    internal class IdentifierValueConverterSelector<TDatabaseClrType> : ValueConverterSelector
     {
         // The dictionary in the base type is private, so we need our own one here.
         private readonly ConcurrentDictionary<(Type ModelClrType, Type ProviderClrType), ValueConverterInfo> _converters
diff --git a/Identifiers.EntityFrameworkCore.SqlServer/IdentifierValueGenerator.cs b/Identifiers.EntityFrameworkCore.SqlServer/IdentifierValueGenerator.cs
@@ -6,11 +6,11 @@
 namespace Identifiers.EntityFrameworkCore.SqlServer
 {
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "<Pending>")]
-    public class IdentifierValueGenerator<TDatabaseClrType> : ValueGenerator<Identifier> where TDatabaseClrType : IConvertible
+    internal class IdentifierValueGenerator<TDatabaseClrType> : ValueGenerator<Identifier>
     {
         private readonly ValueGenerator _valueGenerator;
 
-        public IdentifierValueGenerator() 
+        public IdentifierValueGenerator()
         {
             if (typeof(TDatabaseClrType) == typeof(short))
             {
@@ -43,4 +43,4 @@ public override Identifier Next(EntityEntry entry)
         public override bool GeneratesTemporaryValues
             => true;
     }
-}
+}
diff --git a/Identifiers.EntityFrameworkCore.SqlServer/Identifiers.EntityFrameworkCore.SqlServer.csproj b/Identifiers.EntityFrameworkCore.SqlServer/Identifiers.EntityFrameworkCore.SqlServer.csproj
@@ -10,9 +10,10 @@
     <RepositoryUrl>https://github.com/HenkKin/Identifiers.EntityFrameworkCore.SqlServer.git</RepositoryUrl>
     <RepositoryType>GitHub</RepositoryType>
     <PackageTags>Identifiers id int guid di DependencyInjection Core EntityFramework EF SqlServer</PackageTags>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.0.0</FileVersion>
-    <Version>1.0.0</Version>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
+    <FileVersion>1.0.1.0</FileVersion>
+    <Version>1.0.1</Version>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,8 @@
+version: 1.0.{build}
+image:
+- Visual Studio 2019
+
+build_script:
+- cmd: dotnet build
+test_script:
+- cmd: dotnet test

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+component_depth: 2`
	`2`	`+languages:`
	`3`	`+- csharp`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Identifiers.EntityFrameworkCore.SqlServer`
`8`	`8`	`{`
`9`		`- public class IdentifierMigrationsAnnotationProvider : MigrationsAnnotationProvider`
	`9`	`+ internal class IdentifierMigrationsAnnotationProvider : MigrationsAnnotationProvider`
`10`	`10`	`{`
`11`	`11`	`public IdentifierMigrationsAnnotationProvider(MigrationsAnnotationProviderDependencies dependencies)`
`12`	`12`	`: base(dependencies)`
`@@ -20,7 +20,7 @@ public override IEnumerable<IAnnotation> For(IProperty property)`
`20`	`20`	`var annotation = property.FindAnnotation("Identifier");`
`21`	`21`	`return annotation == null`
`22`	`22`	`? baseAnnotations`
`23`		`- : baseAnnotations.Concat(new[] { new Annotation("SqlServer:ValueGenerationStrategy", annotation.Value) });`
	`23`	`+ : baseAnnotations.Concat(new[] { new Annotation("SqlServer:ValueGenerationStrategy", annotation.Value) });`
`24`	`24`	`}`
`25`	`25`	`}`
`26`		`-}`
	`26`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,16 @@`
`5`	`5`	`namespace Identifiers.EntityFrameworkCore.SqlServer`
`6`	`6`	`{`
`7`	`7`	`public static class IdentifierPropertyBuilderExtensions`
`8`		`- {`
	`8`	`+ {`
`9`	`9`	`public static PropertyBuilder<Identifier> IdentifierValueGeneratedOnAdd(this PropertyBuilder<Identifier> propertyBuilder)`
`10`	`10`	`{`
`11`	`11`	`propertyBuilder = propertyBuilder`
`12`	`12`	`.ValueGeneratedOnAdd()`
`13`	`13`	`.HasAnnotation("Identifier", SqlServerValueGenerationStrategy.IdentityColumn);`
`14`	`14`
`15`	`15`	`propertyBuilder.Metadata.SetBeforeSaveBehavior(PropertySaveBehavior.Ignore);`
	`16`	`+`
`16`	`17`	`return propertyBuilder;`
`17`	`18`	`}`
`18`	`19`	`}`
`19`		`-}`
	`20`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ namespace Identifiers.EntityFrameworkCore.SqlServer`
`7`	`7`	`{`
`8`	`8`	`public static class IdentifierSqlServerDbContextOptionsExtensions`
`9`	`9`	`{`
`10`		`- public static DbContextOptionsBuilder UseIdentifiers<TDatabaseClrType>(this DbContextOptionsBuilder optionsBuilder) where TDatabaseClrType : IConvertible`
	`10`	`+ public static DbContextOptionsBuilder UseIdentifiers<TDatabaseClrType>(this DbContextOptionsBuilder optionsBuilder)`
`11`	`11`	`{`
`12`	`12`	`optionsBuilder.ReplaceService<IMigrationsAnnotationProvider, IdentifierMigrationsAnnotationProvider>();`
`13`	`13`	`optionsBuilder.ReplaceService<IValueConverterSelector, IdentifierValueConverterSelector<TDatabaseClrType>>();`
`14`	`14`
`15`	`15`	`return optionsBuilder;`
`16`	`16`	`}`
`17`	`17`	`}`
`18`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,16 @@`
`1`	`1`	`using System;`
`2`		`-using Identifiers.TypeConverters;`
`3`	`2`	`using Microsoft.EntityFrameworkCore.Storage.ValueConversion;`
`4`	`3`
`5`	`4`	`namespace Identifiers.EntityFrameworkCore.SqlServer`
`6`	`5`	`{`
`7`		`- public class IdentifierValueConverter<TDatabaseClrType> : ValueConverter<Identifier, TDatabaseClrType> where TDatabaseClrType : IConvertible`
	`6`	`+ internal class IdentifierValueConverter<TDatabaseClrType> : ValueConverter<Identifier, TDatabaseClrType>`
`8`	`7`	`{`
`9`	`8`	`public IdentifierValueConverter(ConverterMappingHints mappingHints = null)`
`10`	`9`	`: base(`
`11`		`- id => IdentifierTypeConverter.FromIdentifier<TDatabaseClrType>(id),`
`12`		`- value => IdentifierTypeConverter.ToIdentifier<TDatabaseClrType>(value),`
`13`		`- new ConverterMappingHints(valueGeneratorFactory: (p, t) => new IdentifierValueGenerator<TDatabaseClrType>())`
	`10`	`+ id => (TDatabaseClrType)Convert.ChangeType(id.GetValue(), typeof(TDatabaseClrType)),`
	`11`	`+ value => new Identifier(value),`
	`12`	`+ new ConverterMappingHints(valueGeneratorFactory: (p, t) => new IdentifierValueGenerator<TDatabaseClrType>())`
`14`	`13`	`)`
`15`	`14`	`{ }`
`16`	`15`	`}`
`17`		`-}`
	`16`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Identifiers.EntityFrameworkCore.SqlServer`
`7`	`7`	`{`
`8`		`- /// <summary>`
`9`		`- /// Thanks to https://andrewlock.net/strongly-typed-ids-in-ef-core-using-strongly-typed-entity-ids-to-avoid-primitive-obsession-part-4/`
`10`		`- /// </summary>`
`11`		`- /// <typeparam name="TDatabaseClrType"></typeparam>`
`12`		`- public class IdentifierValueConverterSelector<TDatabaseClrType> : ValueConverterSelector where TDatabaseClrType : IConvertible`
	`8`	`+ internal class IdentifierValueConverterSelector<TDatabaseClrType> : ValueConverterSelector`
`13`	`9`	`{`
`14`	`10`	`// The dictionary in the base type is private, so we need our own one here.`
`15`	`11`	`private readonly ConcurrentDictionary<(Type ModelClrType, Type ProviderClrType), ValueConverterInfo> _converters`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`	`namespace Identifiers.EntityFrameworkCore.SqlServer`
`7`	`7`	`{`
`8`	`8`	`[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "<Pending>")]`
`9`		`- public class IdentifierValueGenerator<TDatabaseClrType> : ValueGenerator<Identifier> where TDatabaseClrType : IConvertible`
	`9`	`+ internal class IdentifierValueGenerator<TDatabaseClrType> : ValueGenerator<Identifier>`
`10`	`10`	`{`
`11`	`11`	`private readonly ValueGenerator _valueGenerator;`
`12`	`12`
`13`		`- public IdentifierValueGenerator()`
	`13`	`+ public IdentifierValueGenerator()`
`14`	`14`	`{`
`15`	`15`	`if (typeof(TDatabaseClrType) == typeof(short))`
`16`	`16`	`{`
`@@ -43,4 +43,4 @@ public override Identifier Next(EntityEntry entry)`
`43`	`43`	`public override bool GeneratesTemporaryValues`
`44`	`44`	`=> true;`
`45`	`45`	`}`
`46`		`-}`
	`46`	`+}`