From 0a0a4554abe4879e535266c6b22f4dd97653cde3 Mon Sep 17 00:00:00 2001 From: lajones Date: Fri, 10 Jul 2020 14:31:40 -0700 Subject: [PATCH] Updating based on API Review. (#21587) --- src/EFCore.Design/Design/DbContextActivator.cs | 6 +++--- src/EFCore.Relational/Migrations/MigrationBuilder.cs | 2 +- .../Migrations/Operations/Builders/CreateTableBuilder.cs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/EFCore.Design/Design/DbContextActivator.cs b/src/EFCore.Design/Design/DbContextActivator.cs index 5b9b37c0f71..7c28b496d37 100644 --- a/src/EFCore.Design/Design/DbContextActivator.cs +++ b/src/EFCore.Design/Design/DbContextActivator.cs @@ -37,13 +37,13 @@ public static class DbContextActivator /// The type to instantiate. /// The application's startup assembly. /// The design-time report handler. - /// Arguments passed to the application. + /// Arguments passed to the application. /// The newly created object. public static DbContext CreateInstance( [NotNull] Type contextType, [CanBeNull] Assembly startupAssembly, [CanBeNull] IOperationReportHandler reportHandler, - [CanBeNull] string[] arguments) + [CanBeNull] string[] args) { Check.NotNull(contextType, nameof(contextType)); @@ -51,7 +51,7 @@ public static class DbContextActivator new OperationReporter(reportHandler), contextType.Assembly, startupAssembly ?? contextType.Assembly, - args: arguments ?? Array.Empty()) + args: args ?? Array.Empty()) .CreateContext(contextType.FullName); } } diff --git a/src/EFCore.Relational/Migrations/MigrationBuilder.cs b/src/EFCore.Relational/Migrations/MigrationBuilder.cs index 742a6463444..2c6644eef57 100644 --- a/src/EFCore.Relational/Migrations/MigrationBuilder.cs +++ b/src/EFCore.Relational/Migrations/MigrationBuilder.cs @@ -771,7 +771,7 @@ public MigrationBuilder([CanBeNull] string activeProvider) var columnsBuilder = new ColumnsBuilder(createTableOperation); var columnsObject = columns(columnsBuilder); - var columnMap = new Dictionary(); + var columnMap = new Dictionary(); foreach (var property in typeof(TColumns).GetTypeInfo().DeclaredProperties) { var addColumnOperation = ((IInfrastructure)property.GetMethod.Invoke(columnsObject, null)).Instance; diff --git a/src/EFCore.Relational/Migrations/Operations/Builders/CreateTableBuilder.cs b/src/EFCore.Relational/Migrations/Operations/Builders/CreateTableBuilder.cs index d4e3cd61626..a7493eb0cb3 100644 --- a/src/EFCore.Relational/Migrations/Operations/Builders/CreateTableBuilder.cs +++ b/src/EFCore.Relational/Migrations/Operations/Builders/CreateTableBuilder.cs @@ -18,7 +18,7 @@ namespace Microsoft.EntityFrameworkCore.Migrations.Operations.Builders /// Type of a typically anonymous type for building columns. public class CreateTableBuilder : OperationBuilder { - private readonly IReadOnlyDictionary _columnMap; + private readonly IReadOnlyDictionary _columnMap; /// /// Constructs a new builder for the given and @@ -28,7 +28,7 @@ public class CreateTableBuilder : OperationBuilder The map of CLR properties to s. public CreateTableBuilder( [NotNull] CreateTableOperation operation, - [NotNull] IReadOnlyDictionary columnMap) + [NotNull] IReadOnlyDictionary columnMap) : base(operation) { Check.NotNull(columnMap, nameof(columnMap)); @@ -191,6 +191,6 @@ public new virtual CreateTableBuilder Annotation([NotNull] string name => (CreateTableBuilder)base.Annotation(name, value); private string[] Map(LambdaExpression columns) - => columns.GetMemberAccessList().Select(c => _columnMap[c].Name).ToArray(); + => columns.GetPropertyAccessList().Select(c => _columnMap[c].Name).ToArray(); } }