Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Suppress internal warnings for DatabaseFacadeDependencies #20399

Merged
merged 1 commit into from
Mar 25, 2020
Merged

Suppress internal warnings for DatabaseFacadeDependencies #20399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/EFCore.Relational/Extensions/RelationalDatabaseFacadeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,10 @@ public static int ExecuteSqlRaw(
Check.NotNull(parameters, nameof(parameters));

var facadeDependencies = GetFacadeDependencies(databaseFacade);
#pragma warning disable EF1001 // Internal EF Core API usage.
var concurrencyDetector = facadeDependencies.ConcurrencyDetector;
var logger = facadeDependencies.CommandLogger;
#pragma warning restore EF1001 // Internal EF Core API usage.

using (concurrencyDetector.EnterCriticalSection())
{
Expand All @@ -218,7 +220,9 @@ public static int ExecuteSqlRaw(
facadeDependencies.RelationalConnection,
rawSqlCommand.ParameterValues,
null,
#pragma warning disable EF1001 // Internal EF Core API usage.
((IDatabaseFacadeDependenciesAccessor)databaseFacade).Context,
#pragma warning restore EF1001 // Internal EF Core API usage.
logger));
}
}
Expand Down Expand Up @@ -356,8 +360,10 @@ public static async Task<int> ExecuteSqlRawAsync(
Check.NotNull(parameters, nameof(parameters));

var facadeDependencies = GetFacadeDependencies(databaseFacade);
#pragma warning disable EF1001 // Internal EF Core API usage.
var concurrencyDetector = facadeDependencies.ConcurrencyDetector;
var logger = facadeDependencies.CommandLogger;
#pragma warning restore EF1001 // Internal EF Core API usage.

using (concurrencyDetector.EnterCriticalSection())
{
Expand All @@ -371,7 +377,9 @@ public static async Task<int> ExecuteSqlRawAsync(
facadeDependencies.RelationalConnection,
rawSqlCommand.ParameterValues,
null,
#pragma warning disable EF1001 // Internal EF Core API usage.
((IDatabaseFacadeDependenciesAccessor)databaseFacade).Context,
#pragma warning restore EF1001 // Internal EF Core API usage.
logger),
cancellationToken);
}
Expand Down Expand Up @@ -612,11 +620,15 @@ public static string GenerateCreateScript([NotNull] this DatabaseFacade database
/// <param name="databaseFacade"> The facade from <see cref="DbContext.Database" />. </param>
/// <returns> True if a relational database provider is being used; false otherwise. </returns>
public static bool IsRelational([NotNull] this DatabaseFacade databaseFacade)
#pragma warning disable EF1001 // Internal EF Core API usage.
=> ((IDatabaseFacadeDependenciesAccessor)Check.NotNull(databaseFacade, nameof(databaseFacade))).Dependencies is IRelationalDatabaseFacadeDependencies;
#pragma warning restore EF1001 // Internal EF Core API usage.

private static IRelationalDatabaseFacadeDependencies GetFacadeDependencies(DatabaseFacade databaseFacade)
{
#pragma warning disable EF1001 // Internal EF Core API usage.
var dependencies = ((IDatabaseFacadeDependenciesAccessor)databaseFacade).Dependencies;
#pragma warning restore EF1001 // Internal EF Core API usage.

if (dependencies is IRelationalDatabaseFacadeDependencies relationalDependencies)
{
Expand All @@ -640,6 +652,8 @@ private static TService GetRelationalService<TService>(this IInfrastructure<ISer
}

private static IDbContextTransactionManager GetTransactionManager([NotNull] this DatabaseFacade databaseFacade)
#pragma warning disable EF1001 // Internal EF Core API usage.
=> ((IDatabaseFacadeDependenciesAccessor)Check.NotNull(databaseFacade, nameof(databaseFacade))).Dependencies.TransactionManager;
#pragma warning restore EF1001 // Internal EF Core API usage.
}
}
2 changes: 2 additions & 0 deletions src/EFCore.Relational/Internal/RelationalDatabaseFacadeDependencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@

namespace Microsoft.EntityFrameworkCore.Internal
{
#pragma warning disable EF1001 // Internal EF Core API usage.
public class RelationalDatabaseFacadeDependencies : DatabaseFacadeDependencies, IRelationalDatabaseFacadeDependencies
#pragma warning restore EF1001 // Internal EF Core API usage.
{
/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
Expand Down