Upgrade to .Net Core 3.1

alexandre.verdon · Dresel · commit f409e46251ff · 2020-01-28T15:46:28.000+01:00
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -4,7 +4,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="StyleCop.Analyzers">
-			<Version>1.1.0-beta009</Version>
+			<Version>1.2.0-beta.113</Version>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 		<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json">
diff --git a/SpatialFocus.EntityFrameworkCore.Extensions.sln.DotSettings b/SpatialFocus.EntityFrameworkCore.Extensions.sln.DotSettings
@@ -232,6 +232,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
diff --git a/samples/SpatialFocus.EntityFrameworkCore.Extensions.SQLiteDemo/SpatialFocus.EntityFrameworkCore.Extensions.SQLiteDemo.csproj b/samples/SpatialFocus.EntityFrameworkCore.Extensions.SQLiteDemo/SpatialFocus.EntityFrameworkCore.Extensions.SQLiteDemo.csproj
@@ -1,17 +1,16 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>netcoreapp3.0</TargetFramework>
+	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
-  </ItemGroup>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
+	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\src\SpatialFocus.EntityFrameworkCore.Extensions\SpatialFocus.EntityFrameworkCore.Extensions.csproj" />
+		<ProjectReference Include="..\..\src\SpatialFocus.EntityFrameworkCore.Extensions\SpatialFocus.EntityFrameworkCore.Extensions.csproj" />
 	</ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/SpatialFocus.EntityFrameworkCore.Extensions/EnumLookupOptions.cs b/src/SpatialFocus.EntityFrameworkCore.Extensions/EnumLookupOptions.cs
@@ -11,7 +11,7 @@ namespace SpatialFocus.EntityFrameworkCore.Extensions
 
 	public class EnumLookupOptions
 	{
-		private Func<string, string> namingFunction;
+		private Func<string, string> namingFunction = name => name;
 
 		private Func<string, string> postProcessingTableNamingFunction = name => name;
 
@@ -40,49 +40,42 @@ public static EnumLookupOptions Default
 		public EnumLookupOptions Pluralize()
 		{
 			this.postProcessingTableNamingFunction = name => name.Pluralize(false);
-
 			return this;
 		}
 
 		public EnumLookupOptions SetDeleteBehavior(DeleteBehavior deleteBehavior)
 		{
 			DeleteBehavior = deleteBehavior;
-
 			return this;
 		}
 
 		public EnumLookupOptions SetNamingScheme(Func<string, string> namingFunc)
 		{
 			this.namingFunction = namingFunc;
-
 			return this;
 		}
 
 		public EnumLookupOptions Singularize()
 		{
 			this.postProcessingTableNamingFunction = name => name.Singularize(false);
-
 			return this;
 		}
 
 		public EnumLookupOptions UseEnumsWithAttributeOnly()
 		{
 			UseEnumsWithAttributesOnly = true;
-
 			return this;
 		}
 
 		public EnumLookupOptions UseNumberAsIdentifier()
 		{
 			UseNumberLookup = true;
-
 			return this;
 		}
 
 		public EnumLookupOptions UseStringAsIdentifier()
 		{
 			UseNumberLookup = false;
-
 			return this;
 		}
 	}
diff --git a/src/SpatialFocus.EntityFrameworkCore.Extensions/NamingExtension.cs b/src/SpatialFocus.EntityFrameworkCore.Extensions/NamingExtension.cs
@@ -25,26 +25,26 @@ public static void ConfigureNames(this ModelBuilder modelBuilder, NamingOptions
 				{
 					string tableName = namingOptions.TableNameSource(entity);
 
-					entity.Relational().TableName = namingOptions.TableNamingFunction(tableName);
+					entity.SetTableName(namingOptions.TableNamingFunction(tableName));
 				}
 
 				// Properties
 				entity.GetProperties()
 					.ToList()
-					.ForEach(x => x.Relational().ColumnName = namingOptions.ColumnNamingFunction(x.Relational().ColumnName));
+					.ForEach(x => x.SetColumnName(namingOptions.ColumnNamingFunction(x.GetColumnName())));
 
 				// Primary and Alternative keys
-				entity.GetKeys().ToList().ForEach(x => x.Relational().Name = namingOptions.ConstraintNamingFunction(x.Relational().Name));
+				entity.GetKeys().ToList().ForEach(x => x.SetName(namingOptions.ConstraintNamingFunction(x.GetName())));
 
 				// Foreign keys
 				entity.GetForeignKeys()
 					.ToList()
-					.ForEach(x => x.Relational().Name = namingOptions.ConstraintNamingFunction(x.Relational().Name));
+					.ForEach(x => x.SetConstraintName(namingOptions.ConstraintNamingFunction(x.GetConstraintName())));
 
 				// Indices
 				entity.GetIndexes()
 					.ToList()
-					.ForEach(x => x.Relational().Name = namingOptions.ConstraintNamingFunction(x.Relational().Name));
+					.ForEach(x => x.SetName(namingOptions.ConstraintNamingFunction(x.GetName())));
 			}
 		}
 	}
diff --git a/src/SpatialFocus.EntityFrameworkCore.Extensions/NamingOptions.cs b/src/SpatialFocus.EntityFrameworkCore.Extensions/NamingOptions.cs
@@ -11,6 +11,8 @@ namespace SpatialFocus.EntityFrameworkCore.Extensions
 
 	public class NamingOptions
 	{
+		private Func<string, string> columnNamingFunction;
+
 		private Func<string, string> constraintNamingFunction;
 
 		private Func<IMutableEntityType, bool> entitiesToSkipEntirely;
@@ -19,13 +21,17 @@ public class NamingOptions
 
 		private Func<string, string> postProcessingTableNamingFunction = name => name;
 
-		private Func<string, string> columnNamingFunction;
-
 		private Func<string, string> tableNamingFunction;
 
 		public static NamingOptions Default =>
 			new NamingOptions().SetTableNamingSource(NamingSource.DbSet).SetNamingScheme(NamingScheme.SnakeCase);
 
+		internal Func<string, string> ColumnNamingFunction
+		{
+			get => this.columnNamingFunction ?? NamingFunction;
+			set => this.columnNamingFunction = value;
+		}
+
 		internal Func<string, string> ConstraintNamingFunction
 		{
 			get => this.constraintNamingFunction ?? NamingFunction;
@@ -44,20 +50,15 @@ internal Func<IMutableEntityType, bool> EntitiesToSkipTableNaming
 			set => this.entitiesToSkipTableNaming = value;
 		}
 
-		internal Func<string, string> NamingFunction { get; set; }
-
-		internal Func<string, string> ColumnNamingFunction
-		{
-			get => this.columnNamingFunction ?? NamingFunction;
-			set => this.columnNamingFunction = value;
-		}
+		internal Func<string, string> NamingFunction { get; set; } = name => name;
 
-		internal Func<IMutableEntityType, string> TableNameSource { get; set; }
+		internal Func<IMutableEntityType, string> TableNameSource { get; set; } = NamingSource.DbSet;
 
 		internal Func<string, string> TableNamingFunction
 		{
 			get =>
-				name => this.postProcessingTableNamingFunction(this.tableNamingFunction != null ? this.tableNamingFunction(name)
+				name => this.postProcessingTableNamingFunction(this.tableNamingFunction != null
+					? this.tableNamingFunction(name)
 					: NamingFunction(name));
 			set => this.tableNamingFunction = value;
 		}
diff --git a/src/SpatialFocus.EntityFrameworkCore.Extensions/NamingSource.cs b/src/SpatialFocus.EntityFrameworkCore.Extensions/NamingSource.cs
@@ -13,6 +13,6 @@ public static class NamingSource
 	{
 		public static Func<IMutableEntityType, string> ClrType => entity => entity.ClrType.Name;
 
-		public static Func<IMutableEntityType, string> DbSet => entity => entity.Relational().TableName;
+		public static Func<IMutableEntityType, string> DbSet => entity => entity.GetTableName();
 	}
 }
diff --git a/src/SpatialFocus.EntityFrameworkCore.Extensions/SpatialFocus.EntityFrameworkCore.Extensions.csproj b/src/SpatialFocus.EntityFrameworkCore.Extensions/SpatialFocus.EntityFrameworkCore.Extensions.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<Version>1.3.0</Version>
+		<Version>2.0.0</Version>
 		<PackageId>SpatialFocus.EntityFrameworkCore.Extensions</PackageId>
 		<Title>Spatial Focus EntityFrameworkCore Extensions</Title>
 		<Description>A set of useful extensions for EntityFrameworkCore (Enum Lookup Tables, Naming of tables / properties / keys, Pluralize).</Description>
@@ -18,13 +18,13 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>netstandard2.1</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Humanizer.Core" Version="2.5.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.4" />
+		<PackageReference Include="Humanizer.Core" Version="2.7.9" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
 	</ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace SpatialFocus.EntityFrameworkCore.Extensions`
`11`	`11`
`12`	`12`	`public class EnumLookupOptions`
`13`	`13`	`{`
`14`		`- private Func<string, string> namingFunction;`
	`14`	`+ private Func<string, string> namingFunction = name => name;`
`15`	`15`
`16`	`16`	`private Func<string, string> postProcessingTableNamingFunction = name => name;`
`17`	`17`
`@@ -40,49 +40,42 @@ public static EnumLookupOptions Default`
`40`	`40`	`public EnumLookupOptions Pluralize()`
`41`	`41`	`{`
`42`	`42`	`this.postProcessingTableNamingFunction = name => name.Pluralize(false);`
`43`		`-`
`44`	`43`	`return this;`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`public EnumLookupOptions SetDeleteBehavior(DeleteBehavior deleteBehavior)`
`48`	`47`	`{`
`49`	`48`	`DeleteBehavior = deleteBehavior;`
`50`		`-`
`51`	`49`	`return this;`
`52`	`50`	`}`
`53`	`51`
`54`	`52`	`public EnumLookupOptions SetNamingScheme(Func<string, string> namingFunc)`
`55`	`53`	`{`
`56`	`54`	`this.namingFunction = namingFunc;`
`57`		`-`
`58`	`55`	`return this;`
`59`	`56`	`}`
`60`	`57`
`61`	`58`	`public EnumLookupOptions Singularize()`
`62`	`59`	`{`
`63`	`60`	`this.postProcessingTableNamingFunction = name => name.Singularize(false);`
`64`		`-`
`65`	`61`	`return this;`
`66`	`62`	`}`
`67`	`63`
`68`	`64`	`public EnumLookupOptions UseEnumsWithAttributeOnly()`
`69`	`65`	`{`
`70`	`66`	`UseEnumsWithAttributesOnly = true;`
`71`		`-`
`72`	`67`	`return this;`
`73`	`68`	`}`
`74`	`69`
`75`	`70`	`public EnumLookupOptions UseNumberAsIdentifier()`
`76`	`71`	`{`
`77`	`72`	`UseNumberLookup = true;`
`78`		`-`
`79`	`73`	`return this;`
`80`	`74`	`}`
`81`	`75`
`82`	`76`	`public EnumLookupOptions UseStringAsIdentifier()`
`83`	`77`	`{`
`84`	`78`	`UseNumberLookup = false;`
`85`		`-`
`86`	`79`	`return this;`
`87`	`80`	`}`
`88`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,26 +25,26 @@ public static void ConfigureNames(this ModelBuilder modelBuilder, NamingOptions`
`25`	`25`	`{`
`26`	`26`	`string tableName = namingOptions.TableNameSource(entity);`
`27`	`27`
`28`		`- entity.Relational().TableName = namingOptions.TableNamingFunction(tableName);`
	`28`	`+ entity.SetTableName(namingOptions.TableNamingFunction(tableName));`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// Properties`
`32`	`32`	`entity.GetProperties()`
`33`	`33`	`.ToList()`
`34`		`- .ForEach(x => x.Relational().ColumnName = namingOptions.ColumnNamingFunction(x.Relational().ColumnName));`
	`34`	`+ .ForEach(x => x.SetColumnName(namingOptions.ColumnNamingFunction(x.GetColumnName())));`
`35`	`35`
`36`	`36`	`// Primary and Alternative keys`
`37`		`- entity.GetKeys().ToList().ForEach(x => x.Relational().Name = namingOptions.ConstraintNamingFunction(x.Relational().Name));`
	`37`	`+ entity.GetKeys().ToList().ForEach(x => x.SetName(namingOptions.ConstraintNamingFunction(x.GetName())));`
`38`	`38`
`39`	`39`	`// Foreign keys`
`40`	`40`	`entity.GetForeignKeys()`
`41`	`41`	`.ToList()`
`42`		`- .ForEach(x => x.Relational().Name = namingOptions.ConstraintNamingFunction(x.Relational().Name));`
	`42`	`+ .ForEach(x => x.SetConstraintName(namingOptions.ConstraintNamingFunction(x.GetConstraintName())));`
`43`	`43`
`44`	`44`	`// Indices`
`45`	`45`	`entity.GetIndexes()`
`46`	`46`	`.ToList()`
`47`		`- .ForEach(x => x.Relational().Name = namingOptions.ConstraintNamingFunction(x.Relational().Name));`
	`47`	`+ .ForEach(x => x.SetName(namingOptions.ConstraintNamingFunction(x.GetName())));`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ public static class NamingSource`
`13`	`13`	`{`
`14`	`14`	`public static Func<IMutableEntityType, string> ClrType => entity => entity.ClrType.Name;`
`15`	`15`
`16`		`- public static Func<IMutableEntityType, string> DbSet => entity => entity.Relational().TableName;`
	`16`	`+ public static Func<IMutableEntityType, string> DbSet => entity => entity.GetTableName();`
`17`	`17`	`}`
`18`	`18`	`}`