Updated EF Core samples

PawelGerr · PawelGerr · commit 3e23ba9cb180 · 2018-05-31T10:42:45.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 **/packages/**
 
 *\.sln\.DotSettings\.user
+samples/Thinktecture\.Runtime\.Extensions\.EntityFrameworkSamples/products\.db
diff --git a/samples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples/EnumValueConverter.cs b/samples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples/EnumValueConverter.cs
@@ -1,18 +1,14 @@
-﻿using Microsoft.EntityFrameworkCore.Storage.Converters;
+﻿using System;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Thinktecture.Runtime.Extensions.EntityFrameworkSamples
 {
 	public class EnumValueConverter<TEnum, TKey> : ValueConverter<TEnum, TKey>
 		where TEnum : Enum<TEnum, TKey>
 	{
 		public EnumValueConverter()
-			: this(default(ConverterMappingHints))
-		{
-		}
-
-		public EnumValueConverter(ConverterMappingHints hints)
-			: base(item => item.Key, key => Enum<TEnum, TKey>.Get(key), hints)
+			: base(item => item.Key, key => Enum<TEnum, TKey>.Get(key))
 		{
 		}
 	}
-}
+}
diff --git a/samples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples/Product.cs b/samples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples/Product.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-using Thinktecture.Runtime.Extensions.Samples;
+using Thinktecture.Runtime.Extensions.Samples.EnumLikeClass;
 
 namespace Thinktecture.Runtime.Extensions.EntityFrameworkSamples
 {
diff --git a/samples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples/ProductsDbContext.cs b/samples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples/ProductsDbContext.cs
@@ -1,5 +1,5 @@
 ﻿using Microsoft.EntityFrameworkCore;
-using Thinktecture.Runtime.Extensions.Samples;
+using Thinktecture.Runtime.Extensions.Samples.EnumLikeClass;
 
 namespace Thinktecture.Runtime.Extensions.EntityFrameworkSamples
 {
diff --git a/samples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples/Program.cs b/samples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples/Program.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
-using Thinktecture.Runtime.Extensions.Samples;
+using Thinktecture.Runtime.Extensions.Samples.EnumLikeClass;
 
 namespace Thinktecture.Runtime.Extensions.EntityFrameworkSamples
 {
@@ -25,7 +25,6 @@ public static void Main()
 				{
 					Id = Guid.NewGuid(),
 					Name = "Pear",
-					// checking for valid enumeration items is application logic
 					Category = ProductCategory.Get("Invalid Category")
 				});
 
diff --git a/samples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples.csproj b/samples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples/Thinktecture.Runtime.Extensions.EntityFrameworkSamples.csproj
@@ -1,10 +1,11 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>EXE</OutputType>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0-preview1-final" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -5,3 +5,4 @@`
`5`	`5`	`/packages/`
`6`	`6`
`7`	`7`	`*\.sln\.DotSettings\.user`
	`8`	`+samples/Thinktecture\.Runtime\.Extensions\.EntityFrameworkSamples/products\.db`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,14 @@`
`1`		`-using Microsoft.EntityFrameworkCore.Storage.Converters;`
	`1`	`+using System;`
	`2`	`+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;`
`2`	`3`
`3`	`4`	`namespace Thinktecture.Runtime.Extensions.EntityFrameworkSamples`
`4`	`5`	`{`
`5`	`6`	`public class EnumValueConverter<TEnum, TKey> : ValueConverter<TEnum, TKey>`
`6`	`7`	`where TEnum : Enum<TEnum, TKey>`
`7`	`8`	`{`
`8`	`9`	`public EnumValueConverter()`
`9`		`- : this(default(ConverterMappingHints))`
`10`		`- {`
`11`		`- }`
`12`		`-`
`13`		`- public EnumValueConverter(ConverterMappingHints hints)`
`14`		`- : base(item => item.Key, key => Enum<TEnum, TKey>.Get(key), hints)`
	`10`	`+ : base(item => item.Key, key => Enum<TEnum, TKey>.Get(key))`
`15`	`11`	`{`
`16`	`12`	`}`
`17`	`13`	`}`
`18`		`-}`
	`14`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using Thinktecture.Runtime.Extensions.Samples;`
	`2`	`+using Thinktecture.Runtime.Extensions.Samples.EnumLikeClass;`
`3`	`3`
`4`	`4`	`namespace Thinktecture.Runtime.Extensions.EntityFrameworkSamples`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using Microsoft.EntityFrameworkCore;`
`2`		`-using Thinktecture.Runtime.Extensions.Samples;`
	`2`	`+using Thinktecture.Runtime.Extensions.Samples.EnumLikeClass;`
`3`	`3`
`4`	`4`	`namespace Thinktecture.Runtime.Extensions.EntityFrameworkSamples`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using Microsoft.EntityFrameworkCore;`
`4`	`4`	`using Serilog;`
`5`		`-using Thinktecture.Runtime.Extensions.Samples;`
	`5`	`+using Thinktecture.Runtime.Extensions.Samples.EnumLikeClass;`
`6`	`6`
`7`	`7`	`namespace Thinktecture.Runtime.Extensions.EntityFrameworkSamples`
`8`	`8`	`{`
`@@ -25,7 +25,6 @@ public static void Main()`
`25`	`25`	`{`
`26`	`26`	`Id = Guid.NewGuid(),`
`27`	`27`	`Name = "Pear",`
`28`		`- // checking for valid enumeration items is application logic`
`29`	`28`	`Category = ProductCategory.Get("Invalid Category")`
`30`	`29`	`});`
`31`	`30`