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

10
AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj
View File

@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Configurations>Debug;Release;DebugLocal</Configurations> <Configurations>Debug;Release;DebugLocal</Configurations>
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks> <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<LangVersion>10.0</LangVersion> <LangVersion>10.0</LangVersion>
<AssemblyName>AMWD.Common.AspNetCore</AssemblyName> <AssemblyName>AMWD.Common.AspNetCore</AssemblyName>
@@ -30,12 +30,8 @@
<ItemGroup> <ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" /> <FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Unclassified.DeepConvert" Version="1.4.0" /> <PackageReference Include="Unclassified.DeepConvert" Version="1.4.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

22
AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configurations>Debug;Release;DebugLocal</Configurations> <Configurations>Debug;Release;DebugLocal</Configurations>
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks> <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<LangVersion>10.0</LangVersion> <LangVersion>10.0</LangVersion>
<AssemblyName>AMWD.Common.EntityFrameworkCore</AssemblyName> <AssemblyName>AMWD.Common.EntityFrameworkCore</AssemblyName>
@@ -28,24 +28,18 @@
<None Include="../icon.png" Pack="true" PackagePath="/" /> <None Include="../icon.png" Pack="true" PackagePath="/" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.29" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.29" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.29" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'"> <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.20" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3"> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
<PrivateAssets>all</PrivateAssets> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.9" />
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
</PackageReference> <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
AMWD.Common.EntityFrameworkCore/Converters/DateOnlyConverter.cs
View File

@@ -1,6 +1,4 @@
#if NET6_0_OR_GREATER using System;
using System;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace AMWD.Common.EntityFrameworkCore.Converters namespace AMWD.Common.EntityFrameworkCore.Converters
@@ -24,5 +22,3 @@ namespace AMWD.Common.EntityFrameworkCore.Converters
{ } { }
} }
} }
#endif

6
AMWD.Common.EntityFrameworkCore/Converters/NullableDateOnlyConverter.cs
View File

@@ -1,6 +1,4 @@
#if NET6_0_OR_GREATER using System;
using System;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace AMWD.Common.EntityFrameworkCore.Converters namespace AMWD.Common.EntityFrameworkCore.Converters
@@ -24,5 +22,3 @@ namespace AMWD.Common.EntityFrameworkCore.Converters
{ } { }
} }
} }
#endif

6
AMWD.Common.EntityFrameworkCore/Converters/NullableTimeOnlyConverter.cs
View File

@@ -1,6 +1,4 @@
#if NET6_0_OR_GREATER using System;
using System;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace AMWD.Common.EntityFrameworkCore.Converters namespace AMWD.Common.EntityFrameworkCore.Converters
@@ -24,5 +22,3 @@ namespace AMWD.Common.EntityFrameworkCore.Converters
{ } { }
} }
} }
#endif

6
AMWD.Common.EntityFrameworkCore/Converters/TimeOnlyConverter.cs
View File

@@ -1,6 +1,4 @@
#if NET6_0_OR_GREATER using System;
using System;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace AMWD.Common.EntityFrameworkCore.Converters namespace AMWD.Common.EntityFrameworkCore.Converters
@@ -24,5 +22,3 @@ namespace AMWD.Common.EntityFrameworkCore.Converters
{ } { }
} }
} }
#endif

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

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

4
AMWD.Common.Moq/AMWD.Common.Moq.csproj
View File

@@ -30,10 +30,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Moq" Version="4.18.4" /> <PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

8
AMWD.Common/AMWD.Common.csproj
View File

@@ -29,14 +29,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MessagePack" Version="2.4.35" /> <PackageReference Include="MessagePack" Version="2.5.124" />
<PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Unclassified.DeepConvert" Version="1.4.0" /> <PackageReference Include="Unclassified.DeepConvert" Version="1.4.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

14
AMWD.Common/Extensions/StreamExtensions.cs
View File

@@ -20,11 +20,8 @@ namespace System.IO
/// <returns></returns> /// <returns></returns>
public static string ReadLine(this Stream stream, Encoding encoding = null, char? eol = null) public static string ReadLine(this Stream stream, Encoding encoding = null, char? eol = null)
{ {
if (encoding == null) encoding ??= Encoding.Default;
encoding = Encoding.Default; eol ??= Environment.NewLine.Last();
if (eol == null)
eol = Environment.NewLine.Last();
if (!stream.CanRead) if (!stream.CanRead)
return null; return null;
@@ -56,11 +53,8 @@ namespace System.IO
/// <returns></returns> /// <returns></returns>
public static async Task<string> ReadLineAsync(this Stream stream, Encoding encoding = null, char? eol = null, CancellationToken cancellationToken = default) public static async Task<string> ReadLineAsync(this Stream stream, Encoding encoding = null, char? eol = null, CancellationToken cancellationToken = default)
{ {
if (encoding == null) encoding ??= Encoding.Default;
encoding = Encoding.Default; eol ??= Environment.NewLine.Last();
if (eol == null)
eol = Environment.NewLine.Last();
if (!stream.CanRead) if (!stream.CanRead)
return null; return null;

7
Directory.Build.props
View File

@@ -22,4 +22,11 @@
<Copyright>© {copyright:2020-} AM.WD</Copyright> <Copyright>© {copyright:2020-} AM.WD</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression> <PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project> </Project>

10
UnitTests/UnitTests.csproj
View File

@@ -9,16 +9,16 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="3.2.0"> <PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="DNS" Version="7.0.0" /> <PackageReference Include="DNS" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Moq" Version="4.18.4" /> <PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" /> <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" /> <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Include="ReflectionMagic" Version="4.1.0" /> <PackageReference Include="ReflectionMagic" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>