Skip to content
This repository was archived by the owner on Feb 1, 2025. It is now read-only.

Commit e4d2abc

Browse files
MaceWinduMaceWindu
authored
update to linq2db 4.4.0 and implement remaining net7 migrations (#279)
* update to linq2db 4.4.0 and implement remaining net7 migrations * update
1 parent 7393c62 commit e4d2abc

File tree

11 files changed

+21
-33
lines changed

11 files changed

+21
-33
lines changed

‎Build/linq2db.Default.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>7.0.0</Version>
3+
<Version>7.1.0</Version>
44

55
<Authors>Svyatoslav Danyliv, Igor Tkachev, Dmitry Lukashenko, Ilya Chudin</Authors>
66
<Product>Linq to DB</Product>

‎Directory.Packages.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<ItemGroup>
33
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
4-
<PackageVersion Include="NUnit3TestAdapter" Version="4.3.0" />
4+
<PackageVersion Include="NUnit3TestAdapter" Version="4.3.1" />
55
<PackageVersion Include="NUnit" Version="3.13.3" />
66
<PackageVersion Include="FluentAssertions" Version="6.8.0" />
77

8-
<PackageVersion Include="linq2db" Version="4.3.0" />
9-
<PackageVersion Include="linq2db.Tools" Version="4.3.0" />
8+
<PackageVersion Include="linq2db" Version="4.4.0" />
9+
<PackageVersion Include="linq2db.Tools" Version="4.4.0" />
1010

1111
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
1212

@@ -16,10 +16,10 @@
1616
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
1717
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
1818

19-
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
19+
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0-silver.1" />
2020
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
21-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
22-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
21+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
22+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1" />
2323

2424
<PackageVersion Include="EntityFrameworkCore.FSharp" Version="6.0.7" />
2525
<PackageVersion Include="FSharp.Core" Version="7.0.0" />

‎NuGet/linq2db.EntityFrameworkCore.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<dependencies>
1717
<group targetFramework="net6.0">
1818
<dependency id="Microsoft.EntityFrameworkCore.Relational" version="7.0.0" />
19-
<dependency id="linq2db" version="4.3.0" />
19+
<dependency id="linq2db" version="4.4.0" />
2020
</group>
2121
</dependencies>
2222
</metadata>

‎Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ public virtual MappingSchema GetMappingSchema(
548548
/// </summary>
549549
/// <param name="ex">Expression.</param>
550550
/// <returns>Unwrapped expression.</returns>
551-
[return: NotNullIfNotNull("ex")]
551+
[return: NotNullIfNotNull(nameof(ex))]
552552
public static Expression? Unwrap(Expression? ex)
553553
{
554554
if (ex == null)

‎Tests/LinqToDB.EntityFrameworkCore.BaseTests/Models/Northwind/NorthwindData.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private static Expression RewriteShadowPropertyAccess(Expression expression)
180180

181181
private sealed class ShadowStateAccessRewriter : ExpressionVisitor
182182
{
183-
[return: NotNullIfNotNull("expr")]
183+
[return: NotNullIfNotNull(nameof(expr))]
184184
static Expression? RemoveConvert(Expression? expr)
185185
{
186186
while (expr?.NodeType.In(ExpressionType.Convert, ExpressionType.ConvertChecked) == true)

‎Tests/LinqToDB.EntityFrameworkCore.PomeloMySql.Tests/LinqToDB.EntityFrameworkCore.PomeloMySql.Tests.csproj

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
13-
<!--TODO: remove after v7 release-->
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational">
15-
<NoWarn>NU1107;NU1608</NoWarn>
16-
</PackageReference>
1713
</ItemGroup>
1814

1915
<ItemGroup>

‎Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/SampleTests/StringExtensions.cs

+6-12
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,13 @@ public static string ToSnakeCase(this string input)
99
if (string.IsNullOrEmpty(input))
1010
return input;
1111

12-
var startUnderscores = UnderscoresMatcher.Match(input);
13-
return startUnderscores + Replacer.Replace(input, "$1_$2").ToLowerInvariant();
12+
var startUnderscores = UnderscoresMatcher().Match(input);
13+
return startUnderscores + Replacer().Replace(input, "$1_$2").ToLowerInvariant();
1414
}
1515

16-
// TODO: uncomment after azure pipelines updated to 17.4
17-
//[GeneratedRegex("^_+")]
18-
//private static partial Regex UnderscoresMatcher();
19-
//[GeneratedRegex("([a-z0-9])([A-Z])")]
20-
//private static partial Regex Replacer();
21-
22-
#pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute'.
23-
private static readonly Regex UnderscoresMatcher = new ("^_+", RegexOptions.Compiled);
24-
private static readonly Regex Replacer = new ("([a-z0-9])([A-Z])", RegexOptions.Compiled);
25-
#pragma warning restore SYSLIB1045 // Convert to 'GeneratedRegexAttribute'.
16+
[GeneratedRegex("^_+")]
17+
private static partial Regex UnderscoresMatcher();
18+
[GeneratedRegex("([a-z0-9])([A-Z])")]
19+
private static partial Regex Replacer();
2620
}
2721
}

‎Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/SampleTests/TypeExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace LinqToDB.EntityFrameworkCore.PostgreSQL.Tests.SampleTests
55
{
66
public static class TypeExtensions
77
{
8-
[return: NotNullIfNotNull("type")]
8+
[return: NotNullIfNotNull(nameof(type))]
99
public static Type? UnwrapNullable(this Type? type)
1010
=> type == null ? null : Nullable.GetUnderlyingType(type) ?? type;
1111
}

‎Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/QueryableExtensions.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ public ExpressionReplacer(IDictionary<Expression, Expression> replaceMap)
132132
_replaceMap = replaceMap ?? throw new ArgumentNullException(nameof(replaceMap));
133133
}
134134

135-
// TODO: uncomment after azure pipelines updated to 17.4
136-
//[return: NotNullIfNotNull(nameof(node))]
137-
[return: NotNullIfNotNull("node")]
135+
[return: NotNullIfNotNull(nameof(node))]
138136
public override Expression? Visit(Expression? node)
139137
{
140138
if (node != null && _replaceMap.TryGetValue(node, out var replacement))

‎Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ValueConversion/IdValueConverterSelector.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public override IEnumerable<ValueConverterInfo> Select(Type modelClrType, Type?
4646
i => (ValueConverter)Activator.CreateInstance(ct, i.MappingHints)!
4747
);
4848

49-
[return: NotNullIfNotNull("type")]
49+
[return: NotNullIfNotNull(nameof(type))]
5050
static Type? Unwrap(Type? type) => type == null ? null : Nullable.GetUnderlyingType(type) ?? type;
5151
}
5252
}}

‎azure-pipelines.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
variables:
22
solution: 'linq2db.EFCore.sln'
33
build_configuration: 'Release'
4-
assemblyVersion: 7.0.0
5-
nugetVersion: 7.0.0
4+
assemblyVersion: 7.1.0
5+
nugetVersion: 7.1.0
66
artifact_nugets: 'nugets'
77

88
# build on commits to important branches (master + release branches):

0 commit comments

Comments
 (0)