Merge pull request #195 from linq2db/version2

Release 2.4.0
linq2db · Nov 11, 2021 · 0c89973 · 0c89973
2 parents 1e6fec6 + e3b3ac4
commit 0c89973
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 17 deletions.
diff --git a/Build/linq2db.Default.props b/Build/linq2db.Default.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>2.3.0</Version>
+		<Version>2.4.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,10 +5,10 @@
 		<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="System.Interactive.Async" Version="3.2.0"/>
 

diff --git a/NuGet/linq2db.EntityFrameworkCore.nuspec b/NuGet/linq2db.EntityFrameworkCore.nuspec
@@ -16,7 +16,7 @@
 		<dependencies>
 			<group targetFramework=".NETStandard2.0">
 				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="2.2.6" />
-				<dependency id="linq2db" version="3.5.0" />
+				<dependency id="linq2db" version="3.5.2" />
 			</group>
 		</dependencies>
 	</metadata>

diff --git a/Source/.editorconfig b/Source/.editorconfig
@@ -0,0 +1,4 @@
+[*.cs]
+dotnet_diagnostic.CA1827.severity = error # CA1827: Do not use Count/LongCount when Any can be used
+dotnet_diagnostic.CA2007.severity = error # CA2007: Do not directly await a Task
+dotnet_diagnostic.CA1829.severity = error # CA1829: Use Length/Count property instead of Enumerable.Count method
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
@@ -1121,6 +1121,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)
@@ -1159,6 +1160,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
@@ -410,7 +410,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: 2.3.0
-  nugetVersion: 2.3.0
+  assemblyVersion: 2.4.0
+  nugetVersion: 2.4.0
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):