update to linq2db 4.4.0 and implement remaining net7 migrations (#279)

MaceWindu · web-flow · commit e4d2abcb3cbe · 2022-12-15T16:28:31.000+01:00
* update to linq2db 4.4.0 and implement remaining  net7 migrations

* update
diff --git a/Build/linq2db.Default.props b/Build/linq2db.Default.props
@@ -1,6 +1,6 @@
 ﻿<Project>
 	<PropertyGroup>
-		<Version>7.0.0</Version>
+		<Version>7.1.0</Version>
 
 		<Authors>Svyatoslav Danyliv, Igor Tkachev, Dmitry Lukashenko, Ilya Chudin</Authors>
 		<Product>Linq to DB</Product>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,12 +1,12 @@
 ﻿<Project>
 	<ItemGroup>
 		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-		<PackageVersion Include="NUnit3TestAdapter" Version="4.3.0" />
+		<PackageVersion Include="NUnit3TestAdapter" Version="4.3.1" />
 		<PackageVersion Include="NUnit" Version="3.13.3" />
 		<PackageVersion Include="FluentAssertions" Version="6.8.0" />
 
-		<PackageVersion Include="linq2db" Version="4.3.0" />
-		<PackageVersion Include="linq2db.Tools" Version="4.3.0" />
+		<PackageVersion Include="linq2db" Version="4.4.0" />
+		<PackageVersion Include="linq2db.Tools" Version="4.4.0" />
 
 		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
 
@@ -16,10 +16,10 @@
 		<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
 		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
 
-		<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
+		<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0-silver.1" />
 		<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1" />
 
 		<PackageVersion Include="EntityFrameworkCore.FSharp" Version="6.0.7" />
 		<PackageVersion Include="FSharp.Core" Version="7.0.0" />
diff --git a/NuGet/linq2db.EntityFrameworkCore.nuspec b/NuGet/linq2db.EntityFrameworkCore.nuspec
@@ -16,7 +16,7 @@
 		<dependencies>
 			<group targetFramework="net6.0">
 				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="7.0.0" />
-				<dependency id="linq2db" version="4.3.0" />
+				<dependency id="linq2db" version="4.4.0" />
 			</group>
 		</dependencies>
 	</metadata>
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs
@@ -548,7 +548,7 @@ public virtual MappingSchema GetMappingSchema(
 		/// </summary>
 		/// <param name="ex">Expression.</param>
 		/// <returns>Unwrapped expression.</returns>
-		[return: NotNullIfNotNull("ex")]
+		[return: NotNullIfNotNull(nameof(ex))]
 		public static Expression? Unwrap(Expression? ex)
 		{
 			if (ex == null)
diff --git a/Tests/LinqToDB.EntityFrameworkCore.BaseTests/Models/Northwind/NorthwindData.cs b/Tests/LinqToDB.EntityFrameworkCore.BaseTests/Models/Northwind/NorthwindData.cs
@@ -180,7 +180,7 @@ private static Expression RewriteShadowPropertyAccess(Expression expression)
 
 			private sealed class ShadowStateAccessRewriter : ExpressionVisitor
 			{
-				[return: NotNullIfNotNull("expr")]
+				[return: NotNullIfNotNull(nameof(expr))]
 				static Expression? RemoveConvert(Expression? expr)
 				{
 					while (expr?.NodeType.In(ExpressionType.Convert, ExpressionType.ConvertChecked) == true)
diff --git a/Tests/LinqToDB.EntityFrameworkCore.PomeloMySql.Tests/LinqToDB.EntityFrameworkCore.PomeloMySql.Tests.csproj b/Tests/LinqToDB.EntityFrameworkCore.PomeloMySql.Tests/LinqToDB.EntityFrameworkCore.PomeloMySql.Tests.csproj
@@ -10,10 +10,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
-		<!--TODO: remove after v7 release-->
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational">
-			<NoWarn>NU1107;NU1608</NoWarn>
-		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/SampleTests/StringExtensions.cs b/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/SampleTests/StringExtensions.cs
@@ -9,19 +9,13 @@ public static string ToSnakeCase(this string input)
 			if (string.IsNullOrEmpty(input))
 				return input;
 
-			var startUnderscores = UnderscoresMatcher.Match(input);
-			return startUnderscores + Replacer.Replace(input, "$1_$2").ToLowerInvariant();
+			var startUnderscores = UnderscoresMatcher().Match(input);
+			return startUnderscores + Replacer().Replace(input, "$1_$2").ToLowerInvariant();
 		}
 
-		// TODO: uncomment after azure pipelines updated to 17.4
-		//[GeneratedRegex("^_+")]
-		//private static partial Regex UnderscoresMatcher();
-		//[GeneratedRegex("([a-z0-9])([A-Z])")]
-		//private static partial Regex Replacer();
-
-#pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute'.
-		private static readonly Regex UnderscoresMatcher = new ("^_+", RegexOptions.Compiled);
-		private static readonly Regex Replacer = new ("([a-z0-9])([A-Z])", RegexOptions.Compiled);
-#pragma warning restore SYSLIB1045 // Convert to 'GeneratedRegexAttribute'.
+		[GeneratedRegex("^_+")]
+		private static partial Regex UnderscoresMatcher();
+		[GeneratedRegex("([a-z0-9])([A-Z])")]
+		private static partial Regex Replacer();
 	}
 }
diff --git a/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/SampleTests/TypeExtensions.cs b/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/SampleTests/TypeExtensions.cs
@@ -5,7 +5,7 @@ namespace LinqToDB.EntityFrameworkCore.PostgreSQL.Tests.SampleTests
 {
 	public static class TypeExtensions
 	{
-		[return: NotNullIfNotNull("type")]
+		[return: NotNullIfNotNull(nameof(type))]
 		public static Type? UnwrapNullable(this Type? type)
 			=> type == null ? null : Nullable.GetUnderlyingType(type) ?? type;
 	}
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/QueryableExtensions.cs b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/QueryableExtensions.cs
@@ -132,9 +132,7 @@ public ExpressionReplacer(IDictionary<Expression, Expression> replaceMap)
 				_replaceMap = replaceMap ?? throw new ArgumentNullException(nameof(replaceMap));
 			}
 
-			// TODO: uncomment after azure pipelines updated to 17.4
-			//[return: NotNullIfNotNull(nameof(node))]
-			[return: NotNullIfNotNull("node")]
+			[return: NotNullIfNotNull(nameof(node))]
 			public override Expression? Visit(Expression? node)
 			{
 				if (node != null && _replaceMap.TryGetValue(node, out var replacement))
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ValueConversion/IdValueConverterSelector.cs b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ValueConversion/IdValueConverterSelector.cs
@@ -46,7 +46,7 @@ public override IEnumerable<ValueConverterInfo> Select(Type modelClrType, Type?
 				i => (ValueConverter)Activator.CreateInstance(ct, i.MappingHints)!
 			);
 
-			[return: NotNullIfNotNull("type")]
+			[return: NotNullIfNotNull(nameof(type))]
 			static Type? Unwrap(Type? type) => type == null ? null : Nullable.GetUnderlyingType(type) ?? type;
 		}
 	}}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,8 +1,8 @@
 variables:
   solution: 'linq2db.EFCore.sln'
   build_configuration: 'Release'
-  assemblyVersion: 7.0.0
-  nugetVersion: 7.0.0
+  assemblyVersion: 7.1.0
+  nugetVersion: 7.1.0
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):

Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ public virtual MappingSchema GetMappingSchema(`
`548`	`548`	`/// </summary>`
`549`	`549`	`/// <param name="ex">Expression.</param>`
`550`	`550`	`/// <returns>Unwrapped expression.</returns>`
`551`		`- [return: NotNullIfNotNull("ex")]`
	`551`	`+ [return: NotNullIfNotNull(nameof(ex))]`
`552`	`552`	`public static Expression? Unwrap(Expression? ex)`
`553`	`553`	`{`
`554`	`554`	`if (ex == null)`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ private static Expression RewriteShadowPropertyAccess(Expression expression)`
`180`	`180`
`181`	`181`	`private sealed class ShadowStateAccessRewriter : ExpressionVisitor`
`182`	`182`	`{`
`183`		`- [return: NotNullIfNotNull("expr")]`
	`183`	`+ [return: NotNullIfNotNull(nameof(expr))]`
`184`	`184`	`static Expression? RemoveConvert(Expression? expr)`
`185`	`185`	`{`
`186`	`186`	`while (expr?.NodeType.In(ExpressionType.Convert, ExpressionType.ConvertChecked) == true)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace LinqToDB.EntityFrameworkCore.PostgreSQL.Tests.SampleTests`
`5`	`5`	`{`
`6`	`6`	`public static class TypeExtensions`
`7`	`7`	`{`
`8`		`- [return: NotNullIfNotNull("type")]`
	`8`	`+ [return: NotNullIfNotNull(nameof(type))]`
`9`	`9`	`public static Type? UnwrapNullable(this Type? type)`
`10`	`10`	`=> type == null ? null : Nullable.GetUnderlyingType(type) ?? type;`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,7 @@ public ExpressionReplacer(IDictionary<Expression, Expression> replaceMap)`
`132`	`132`	`_replaceMap = replaceMap ?? throw new ArgumentNullException(nameof(replaceMap));`
`133`	`133`	`}`
`134`	`134`
`135`		`- // TODO: uncomment after azure pipelines updated to 17.4`
`136`		`- //[return: NotNullIfNotNull(nameof(node))]`
`137`		`- [return: NotNullIfNotNull("node")]`
	`135`	`+ [return: NotNullIfNotNull(nameof(node))]`
`138`	`136`	`public override Expression? Visit(Expression? node)`
`139`	`137`	`{`
`140`	`138`	`if (node != null && _replaceMap.TryGetValue(node, out var replacement))`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public override IEnumerable<ValueConverterInfo> Select(Type modelClrType, Type?`
`46`	`46`	`i => (ValueConverter)Activator.CreateInstance(ct, i.MappingHints)!`
`47`	`47`	`);`
`48`	`48`
`49`		`- [return: NotNullIfNotNull("type")]`
	`49`	`+ [return: NotNullIfNotNull(nameof(type))]`
`50`	`50`	`static Type? Unwrap(Type? type) => type == null ? null : Nullable.GetUnderlyingType(type) ?? type;`
`51`	`51`	`}`
`52`	`52`	`}}`