From 7fd39ffb3bd5c3194d321c88de968946ab926584 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 20 May 2020 18:39:47 +0000 Subject: [PATCH 1/6] Merge pull request 8037 from darc-internal/release/3.1-19012098-aad9-4f4b-b987-ee829d8cb72d into internal/release/3.1 --- NuGet.config | 3 +++ eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3bcd259e940..881c1aa701b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cf5d22d6a9..f538e3c0cfd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,37 +29,37 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 0c2e69caa609d5164e16df91d6d646eb9ed74640 - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + + https://github.com/dotnet/extensions + 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + + https://github.com/dotnet/extensions + 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + + https://github.com/dotnet/extensions + 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + + https://github.com/dotnet/extensions + 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + + https://github.com/dotnet/extensions + 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 0c2e69caa609d5164e16df91d6d646eb9ed74640 - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + + https://github.com/dotnet/extensions + 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + + https://github.com/dotnet/extensions + 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 5aa56153bbc..14adfd7fc73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,13 +32,13 @@ 1.0.19269.1 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4-servicing.20221.11 - 3.1.4 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5-servicing.20270.1 + 3.1.5 1.1.1 From f5a86a3d247d7c74dd95f2a25aeddeddb6c5bdbc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 20 May 2020 22:56:33 +0000 Subject: [PATCH 2/6] Merge pull request 8078 from darc-internal/release/3.1-b24c605a-4bc0-4871-b6dc-9715d03f365b into internal/release/3.1 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++----- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 881c1aa701b..c4d76c6c55b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f538e3c0cfd..752abaed27e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,49 +25,49 @@ https://github.com/dotnet/corefx 8a3ffed558ddf943c1efa87d693227722d6af094 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + 08b412cdbca480c6784c77b2bee195e0693186d4 - https://github.com/dotnet/extensions - 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 - https://github.com/dotnet/extensions - 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 - https://github.com/dotnet/extensions - 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 - https://github.com/dotnet/extensions - 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 - https://github.com/dotnet/extensions - 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + 08b412cdbca480c6784c77b2bee195e0693186d4 - - https://github.com/dotnet/extensions - 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 - https://github.com/dotnet/extensions - 2d6d07c1529c1ec5603351a4dd2cf622b84abce1 + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + 08b412cdbca480c6784c77b2bee195e0693186d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + 08b412cdbca480c6784c77b2bee195e0693186d4 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index 14adfd7fc73..836a5cb8df6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 3.1.5 3.1.5 3.1.5 - 3.1.5-servicing.20270.1 + 3.1.5-servicing.20270.6 3.1.5 @@ -52,11 +52,11 @@ 4.7.1 - 3.1.4 - 3.1.4 + 3.1.5 + 3.1.5 3.1.0 - 3.1.4 - 3.1.4-servicing.20221.3 + 3.1.5 + 3.1.5-servicing.20270.1 2.1.0 From 5f01ecc8e61350a2f6a5381c5028ba3063be286f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 21 May 2020 02:20:14 +0000 Subject: [PATCH 3/6] Merge pull request 8098 from darc-internal/release/3.1-c581a563-a497-4278-a3ee-05736cec1c50 into internal/release/3.1 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index c4d76c6c55b..0dfeeb42469 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 752abaed27e..692a4afb685 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,47 +27,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 08b412cdbca480c6784c77b2bee195e0693186d4 + 65cd7897774a464b5991c1962f7a0d476bb63101 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 + 877455ff72cbb5834c52c12ce962f1417f5477c8 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 + 877455ff72cbb5834c52c12ce962f1417f5477c8 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 + 877455ff72cbb5834c52c12ce962f1417f5477c8 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 + 877455ff72cbb5834c52c12ce962f1417f5477c8 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 + 877455ff72cbb5834c52c12ce962f1417f5477c8 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 08b412cdbca480c6784c77b2bee195e0693186d4 + 65cd7897774a464b5991c1962f7a0d476bb63101 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 + 877455ff72cbb5834c52c12ce962f1417f5477c8 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 9a2cbbc919167b0ff3f2d25f58a55a18d96e5189 + 877455ff72cbb5834c52c12ce962f1417f5477c8 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 08b412cdbca480c6784c77b2bee195e0693186d4 + 65cd7897774a464b5991c1962f7a0d476bb63101 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 08b412cdbca480c6784c77b2bee195e0693186d4 + 65cd7897774a464b5991c1962f7a0d476bb63101 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index 836a5cb8df6..fd154c84be5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 3.1.5 3.1.5 3.1.5 - 3.1.5-servicing.20270.6 + 3.1.5-servicing.20270.9 3.1.5 @@ -56,7 +56,7 @@ 3.1.5 3.1.0 3.1.5 - 3.1.5-servicing.20270.1 + 3.1.5-servicing.20270.5 2.1.0 From 06053a2a0871a4f63aebee8d750dc65eeb32723b Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 9 Jun 2020 13:01:17 -0700 Subject: [PATCH 4/6] Remove darc-int feeds --- NuGet.config | 3 --- 1 file changed, 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0dfeeb42469..3bcd259e940 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,6 @@ - - - From ba9ff26a1c4340a68e241e56ca7e374d9e5b4a1f Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 9 Jun 2020 13:01:34 -0700 Subject: [PATCH 5/6] Update branding to 3.1.6 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index fd154c84be5..253c81897e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,6 +1,6 @@ - 3.1.5 + 3.1.6 servicing False true From 7b8f6fe227be37ca54fe6be3fd58cb75dea42552 Mon Sep 17 00:00:00 2001 From: Smit Patel Date: Wed, 10 Jun 2020 10:27:44 -0700 Subject: [PATCH 6/6] Use scoped query logger from QueryContext (#21024) (#21025) Resolves #21016 All scoped services used while executing the query comes from QueryContext. All scoped services on QueryCompilationContext should only be used while compiling the query and should not be made part of QueryExecutorLambda. Singleton services comes from QueryCompilationContext and added to the QueryExecutorLambda directly during compilation. Cherry-pick of #21024 on release/3.1 --- ...pedQueryCompilingExpressionVisitor.QueryingEnumerable.cs | 2 +- .../Internal/CosmosShapedQueryCompilingExpressionVisitor.cs | 6 ++++-- ...pedQueryCompilingExpressionVisitor.QueryingEnumerable.cs | 2 +- .../InMemoryShapedQueryCompilingExpressionVisitor.cs | 6 ++++-- src/EFCore.Relational/Query/Internal/QueryingEnumerable.cs | 2 +- .../RelationalShapedQueryCompilingExpressionVisitor.cs | 6 ++++-- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs b/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs index 5b6743565d3..a88a370d3da 100644 --- a/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs +++ b/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs @@ -39,7 +39,7 @@ public QueryingEnumerable( _selectExpression = selectExpression; _shaper = shaper; _contextType = contextType; - _logger = logger; + _logger = logger ?? cosmosQueryContext.QueryLogger; } public IAsyncEnumerator GetAsyncEnumerator(CancellationToken cancellationToken = default) diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.cs index 0fddf13c0a8..b1519b8b8d8 100644 --- a/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.cs +++ b/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.cs @@ -38,7 +38,9 @@ public CosmosShapedQueryCompilingExpressionVisitor( _sqlExpressionFactory = sqlExpressionFactory; _querySqlGeneratorFactory = querySqlGeneratorFactory; _contextType = queryCompilationContext.ContextType; - _logger = queryCompilationContext.Logger; + _logger = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue21016", out var isEnabled) && isEnabled + ? queryCompilationContext.Logger + : null; } /// @@ -73,7 +75,7 @@ protected override Expression VisitShapedQueryExpression(ShapedQueryExpression s Expression.Constant(selectExpression), Expression.Constant(shaperLambda.Compile()), Expression.Constant(_contextType), - Expression.Constant(_logger)); + Expression.Constant(_logger, typeof(IDiagnosticsLogger))); } } } diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs b/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs index 22873738574..10074c31047 100644 --- a/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs +++ b/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs @@ -34,7 +34,7 @@ public QueryingEnumerable( _innerEnumerable = innerEnumerable; _shaper = shaper; _contextType = contextType; - _logger = logger; + _logger = logger ?? queryContext.QueryLogger; } public IAsyncEnumerator GetAsyncEnumerator(CancellationToken cancellationToken = default) diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.cs index 3a77fc27b7d..224aea3ec14 100644 --- a/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.cs +++ b/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.cs @@ -24,7 +24,9 @@ public InMemoryShapedQueryCompilingExpressionVisitor( : base(dependencies, queryCompilationContext) { _contextType = queryCompilationContext.ContextType; - _logger = queryCompilationContext.Logger; + _logger = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue21016", out var isEnabled) && isEnabled + ? queryCompilationContext.Logger + : null; } protected override Expression VisitExtension(Expression extensionExpression) @@ -69,7 +71,7 @@ protected override Expression VisitShapedQueryExpression(ShapedQueryExpression s innerEnumerable, Expression.Constant(shaperLambda.Compile()), Expression.Constant(_contextType), - Expression.Constant(_logger)); + Expression.Constant(_logger, typeof(IDiagnosticsLogger))); } private static readonly MethodInfo _tableMethodInfo diff --git a/src/EFCore.Relational/Query/Internal/QueryingEnumerable.cs b/src/EFCore.Relational/Query/Internal/QueryingEnumerable.cs index 4a58a8c7acb..e8f6c38b06d 100644 --- a/src/EFCore.Relational/Query/Internal/QueryingEnumerable.cs +++ b/src/EFCore.Relational/Query/Internal/QueryingEnumerable.cs @@ -44,7 +44,7 @@ public QueryingEnumerable( _readerColumns = readerColumns; _shaper = shaper; _contextType = contextType; - _logger = logger; + _logger = logger ?? relationalQueryContext.QueryLogger; } public virtual IAsyncEnumerator GetAsyncEnumerator(CancellationToken cancellationToken = default) diff --git a/src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.cs index 0ff1e0f4339..5f4b88fa775 100644 --- a/src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.cs +++ b/src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.cs @@ -30,7 +30,9 @@ public RelationalShapedQueryCompilingExpressionVisitor( RelationalDependencies = relationalDependencies; _contextType = queryCompilationContext.ContextType; - _logger = queryCompilationContext.Logger; + _logger = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue21016", out var isEnabled) && isEnabled + ? queryCompilationContext.Logger + : null; _tags = queryCompilationContext.Tags; _useRelationalNulls = RelationalOptionsExtension.Extract(queryCompilationContext.ContextOptions).UseRelationalNulls; } @@ -90,7 +92,7 @@ protected override Expression VisitShapedQueryExpression(ShapedQueryExpression s Expression.Constant(projectionColumns, typeof(IReadOnlyList)), Expression.Constant(shaperLambda.Compile()), Expression.Constant(_contextType), - Expression.Constant(_logger)); + Expression.Constant(_logger, typeof(IDiagnosticsLogger))); } } }