am-wd/common
1
0
Fork 0
Code Actions Activity

Removing .NET Core 3.1 support

Browse Source
This commit is contained in:
Andreas Müller
2023-08-01 08:00:45 +02:00
parent cb133aea0c
commit 7469583ed4
13 changed files with 34 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
AMWD.Common.EntityFrameworkCore/Extensions/ModelBuilderExtensions.cs
View File

@@ -3,9 +3,7 @@ using System.Reflection;
using System.Text;
using AMWD.Common.EntityFrameworkCore.Attributes;
using Microsoft.EntityFrameworkCore;
#if NET6_0_OR_GREATER
using Microsoft.EntityFrameworkCore.Metadata;
#endif
namespace AMWD.Common.EntityFrameworkCore.Extensions
{
@@ -35,13 +33,7 @@ namespace AMWD.Common.EntityFrameworkCore.Extensions
index.IsUnique = indexAttribute.IsUnique;
if (!string.IsNullOrWhiteSpace(indexAttribute.Name))
{
#if NET6_0_OR_GREATER
index.SetDatabaseName(indexAttribute.Name.Trim());
#else
index.SetName(indexAttribute.Name.Trim());
#endif
}
}
}
}
@@ -60,28 +52,14 @@ namespace AMWD.Common.EntityFrameworkCore.Extensions
{
// skip conversion when table name is explicitly set
if ((entityType.ClrType.GetCustomAttribute(typeof(TableAttribute), false) as TableAttribute) == null)
{
#if NET6_0_OR_GREATER
entityType.SetTableName(ConvertToSnakeCase(entityType.GetTableName()));
#else
entityType.SetTableName(ConvertToSnakeCase(entityType.GetTableName()));
#endif
}
#if NET6_0_OR_GREATER
var identifier = StoreObjectIdentifier.Table(entityType.GetTableName(), entityType.GetSchema());
#endif
foreach (var property in entityType.GetProperties())
{
// skip conversion when column name is explicitly set
if ((entityType.ClrType.GetProperty(property.Name)?.GetCustomAttribute(typeof(ColumnAttribute), false) as ColumnAttribute) == null)
{
#if NET6_0_OR_GREATER
property.SetColumnName(ConvertToSnakeCase(property.GetColumnName(identifier)));
#else
property.SetColumnName(ConvertToSnakeCase(property.GetColumnName()));
#endif
}
}
}

6
AMWD.Common.EntityFrameworkCore/Extensions/ModelConfigurationBuilderExtensions.cs
View File

@@ -1,6 +1,4 @@
#if NET6_0_OR_GREATER
using System;
using System;
using AMWD.Common.EntityFrameworkCore.Converters;
using Microsoft.EntityFrameworkCore;
@@ -39,5 +37,3 @@ namespace AMWD.Common.EntityFrameworkCore.Extensions
}
}
}
#endif