Merge pull request #196 from linq2db/version3

sdanyliv · web-flow · commit 08d71c536400 · 2021-11-11T22:08:49.000+02:00
Release 3.17.0
diff --git a/Build/linq2db.Default.props b/Build/linq2db.Default.props
@@ -1,6 +1,6 @@
 ﻿<Project>
 	<PropertyGroup>
-		<Version>3.16.0</Version>
+		<Version>3.17.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
@@ -5,15 +5,15 @@
 		<PackageVersion Include="NUnit" Version="3.13.2" />
 		<PackageVersion Include="FluentAssertions" Version="5.10.3" />
 
-		<PackageVersion Include="linq2db" Version="3.5.0" />
-		<PackageVersion Include="linq2db.Tools" Version="3.5.0" />
+		<PackageVersion Include="linq2db" Version="3.5.2" />
+		<PackageVersion Include="linq2db.Tools" Version="3.5.2" />
 
-		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
+		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
 		<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
 
 
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.11" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.11" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.21" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.21" />
 
 		<PackageVersion Include="Microsoft.Extensions.Logging" Version="5.0.0" />
 		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
diff --git a/NuGet/linq2db.EntityFrameworkCore.nuspec b/NuGet/linq2db.EntityFrameworkCore.nuspec
@@ -15,8 +15,8 @@
 		<license type="file">MIT-LICENSE.txt</license>
 		<dependencies>
 			<group targetFramework=".NETStandard2.0">
-				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="3.1.11" />
-				<dependency id="linq2db" version="3.5.0" />
+				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="3.1.21" />
+				<dependency id="linq2db" version="3.5.2" />
 			</group>
 		</dependencies>
 	</metadata>
diff --git a/Source/LinqToDB.EntityFrameworkCore/Internal/EFCoreExpressionAttribute.cs b/Source/LinqToDB.EntityFrameworkCore/Internal/EFCoreExpressionAttribute.cs
@@ -8,7 +8,7 @@
 namespace LinqToDB.EntityFrameworkCore.Internal
 {
 	/// <summary>
-	/// Maps linq2db exression.
+	/// Maps linq2db expression.
 	/// </summary>
 	public class EFCoreExpressionAttribute : Sql.ExpressionAttribute
 	{
@@ -20,12 +20,13 @@ public EFCoreExpressionAttribute(string expression) : base(expression)
 		{
 		}
 
-		/// <inheritdoc cref="Sql.ExpressionAttribute.GetExpression(IDataContext, SelectQuery, System.Linq.Expressions.Expression, Func{Expression, ColumnDescriptor?, ISqlExpression})" />
-		public override ISqlExpression GetExpression(
+		/// <inheritdoc/>
+		public override ISqlExpression? GetExpression<TContext>(
+			TContext context,
 			IDataContext dataContext,
 			SelectQuery query,
 			Expression expression,
-			Func<Expression, ColumnDescriptor?, ISqlExpression> converter)
+			Func<TContext, Expression, ColumnDescriptor?, ISqlExpression> converter)
 		{
 			var knownExpressions = new List<Expression>();
 			if (expression.NodeType == ExpressionType.Call)
@@ -41,20 +42,20 @@ public override ISqlExpression GetExpression(
 				knownExpressions.Add(me.Expression!);
 			}
 
-			var pams = new List<ISqlExpression?>(knownExpressions.Select(_ => (ISqlExpression?) null));
+			var parms = new List<ISqlExpression?>(knownExpressions.Select(_ => (ISqlExpression?) null));
 
-			_ = Sql.ExtensionAttribute.ResolveExpressionValues(Expression!,
-				(v, d) =>
+			_ = ResolveExpressionValues((context, parms, knownExpressions, converter), Expression!,
+				static (ctx, v, d) =>
 				{
 					var idx = int.Parse(v);
 
-					if (pams[idx] == null)
-						pams[idx] = converter(knownExpressions[idx], null);
+					if (ctx.parms[idx] == null)
+						ctx.parms[idx] = ctx.converter(ctx.context, ctx.knownExpressions[idx], null);
 
 					return v;
 				});
 
-			var parameters = pams.Select(p => p ?? new SqlExpression("!!!")).ToArray();
+			var parameters = parms.Select(p => p ?? new SqlExpression("!!!")).ToArray();
 			return new SqlExpression(expression.Type, Expression!, Precedence, parameters);
 		}
 	}
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs
@@ -1101,6 +1101,7 @@ public virtual void LogConnectionTrace(TraceInfo info, ILogger logger)
 				_ => LogLevel.Trace,
 			};
 
+#pragma warning disable CA1848 // Use the LoggerMessage delegates
 			using var _ = logger.BeginScope("TraceInfoStep: {TraceInfoStep}, IsAsync: {IsAsync}", info.TraceInfoStep, info.IsAsync);
 
 			switch (info.TraceInfoStep)
@@ -1139,6 +1140,7 @@ public virtual void LogConnectionTrace(TraceInfo info, ILogger logger)
 					break;
 				}
 			}
+#pragma warning restore CA1848 // Use the LoggerMessage delegates
 		}
 
 		/// <summary>
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs
@@ -407,7 +407,9 @@ public async Task TestAsyncMethods([Values(true, false)] bool enableFilter)
 		{
 			using (var ctx = CreateContext(enableFilter))
 			{
+#pragma warning disable CA1847 // Use char literal for a single character lookup
 				var query = ctx.Products.AsQueryable().Where(p => p.ProductName.Contains("a"));
+#pragma warning restore CA1847 // Use char literal for a single character lookup
 
 				var expectedArray = await query.ToArrayAsync();
 				var expectedDictionary = await query.ToDictionaryAsync(p => p.ProductId);
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,8 +1,8 @@
 variables:
   solution: 'linq2db.EFCore.sln'
   build_configuration: 'Release'
-  assemblyVersion: 3.16.0
-  nugetVersion: 3.16.0
+  assemblyVersion: 3.17.0
+  nugetVersion: 3.17.0
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace LinqToDB.EntityFrameworkCore.Internal`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`		`- /// Maps linq2db exression.`
	`11`	`+ /// Maps linq2db expression.`
`12`	`12`	`/// </summary>`
`13`	`13`	`public class EFCoreExpressionAttribute : Sql.ExpressionAttribute`
`14`	`14`	`{`
`@@ -20,12 +20,13 @@ public EFCoreExpressionAttribute(string expression) : base(expression)`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
`23`		`- /// <inheritdoc cref="Sql.ExpressionAttribute.GetExpression(IDataContext, SelectQuery, System.Linq.Expressions.Expression, Func{Expression, ColumnDescriptor?, ISqlExpression})" />`
`24`		`- public override ISqlExpression GetExpression(`
	`23`	`+ /// <inheritdoc/>`
	`24`	`+ public override ISqlExpression? GetExpression<TContext>(`
	`25`	`+ TContext context,`
`25`	`26`	`IDataContext dataContext,`
`26`	`27`	`SelectQuery query,`
`27`	`28`	`Expression expression,`
`28`		`- Func<Expression, ColumnDescriptor?, ISqlExpression> converter)`
	`29`	`+ Func<TContext, Expression, ColumnDescriptor?, ISqlExpression> converter)`
`29`	`30`	`{`
`30`	`31`	`var knownExpressions = new List<Expression>();`
`31`	`32`	`if (expression.NodeType == ExpressionType.Call)`
`@@ -41,20 +42,20 @@ public override ISqlExpression GetExpression(`
`41`	`42`	`knownExpressions.Add(me.Expression!);`
`42`	`43`	`}`
`43`	`44`
`44`		`- var pams = new List<ISqlExpression?>(knownExpressions.Select(_ => (ISqlExpression?) null));`
	`45`	`+ var parms = new List<ISqlExpression?>(knownExpressions.Select(_ => (ISqlExpression?) null));`
`45`	`46`
`46`		`- _ = Sql.ExtensionAttribute.ResolveExpressionValues(Expression!,`
`47`		`- (v, d) =>`
	`47`	`+ _ = ResolveExpressionValues((context, parms, knownExpressions, converter), Expression!,`
	`48`	`+ static (ctx, v, d) =>`
`48`	`49`	`{`
`49`	`50`	`var idx = int.Parse(v);`
`50`	`51`
`51`		`- if (pams[idx] == null)`
`52`		`- pams[idx] = converter(knownExpressions[idx], null);`
	`52`	`+ if (ctx.parms[idx] == null)`
	`53`	`+ ctx.parms[idx] = ctx.converter(ctx.context, ctx.knownExpressions[idx], null);`
`53`	`54`
`54`	`55`	`return v;`
`55`	`56`	`});`
`56`	`57`
`57`		`- var parameters = pams.Select(p => p ?? new SqlExpression("!!!")).ToArray();`
	`58`	`+ var parameters = parms.Select(p => p ?? new SqlExpression("!!!")).ToArray();`
`58`	`59`	`return new SqlExpression(expression.Type, Expression!, Precedence, parameters);`
`59`	`60`	`}`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1101,6 +1101,7 @@ public virtual void LogConnectionTrace(TraceInfo info, ILogger logger)`
`1101`	`1101`	`_ => LogLevel.Trace,`
`1102`	`1102`	`};`
`1103`	`1103`
	`1104`	`+#pragma warning disable CA1848 // Use the LoggerMessage delegates`
`1104`	`1105`	`using var _ = logger.BeginScope("TraceInfoStep: {TraceInfoStep}, IsAsync: {IsAsync}", info.TraceInfoStep, info.IsAsync);`
`1105`	`1106`
`1106`	`1107`	`switch (info.TraceInfoStep)`
`@@ -1139,6 +1140,7 @@ public virtual void LogConnectionTrace(TraceInfo info, ILogger logger)`
`1139`	`1140`	`break;`
`1140`	`1141`	`}`
`1141`	`1142`	`}`
	`1143`	`+#pragma warning restore CA1848 // Use the LoggerMessage delegates`
`1142`	`1144`	`}`
`1143`	`1145`
`1144`	`1146`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,9 @@ public async Task TestAsyncMethods([Values(true, false)] bool enableFilter)`
`407`	`407`	`{`
`408`	`408`	`using (var ctx = CreateContext(enableFilter))`
`409`	`409`	`{`
	`410`	`+#pragma warning disable CA1847 // Use char literal for a single character lookup`
`410`	`411`	`var query = ctx.Products.AsQueryable().Where(p => p.ProductName.Contains("a"));`
	`412`	`+#pragma warning restore CA1847 // Use char literal for a single character lookup`
`411`	`413`
`412`	`414`	`var expectedArray = await query.ToArrayAsync();`
`413`	`415`	`var expectedDictionary = await query.ToDictionaryAsync(p => p.ProductId);`