Merge branch 'rel/2.0.0-preview2' into dev

src/EFCore.Design/Design/Internal/DatabaseOperations.cs

@@ -62,7 +62,7 @@ public virtual Task<ReverseEngineerFiles> ScaffoldContextAsync(
             loggerFactory.AddProvider(new LoggerProvider(categoryName => new OperationLogger(categoryName, _reporter)));
 #pragma warning restore CS0618 // Type or member is obsolete
 
-            var generator = services.GetRequiredService<ModelScaffolder>();
+            var generator = services.GetRequiredService<IModelScaffolder>();
 
             return generator.GenerateAsync(
                 connectionString,

src/EFCore.Design/Scaffolding/Internal/CSharpDbContextGenerator.cs

@@ -20,11 +20,11 @@ namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
     ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
     ///     directly from your code. This API may change or be removed in future releases.
     /// </summary>
-    public class CSharpDbContextGenerator
+    public class CSharpDbContextGenerator : ICSharpDbContextGenerator
     {
         private const string EntityLambdaIdentifier = "entity";
 
-        private readonly CSharpUtilities _cSharpUtilities;
+        private readonly ICSharpUtilities _cSharpUtilities;
         private readonly IScaffoldingHelper _scaffoldingHelper;
         private readonly IAnnotationRenderer _annotationRenderer;
         private IndentedStringBuilder _sb;
@@ -37,7 +37,7 @@ public class CSharpDbContextGenerator
         public CSharpDbContextGenerator(
             [NotNull] IScaffoldingHelper scaffoldingHelper,
             [NotNull] IAnnotationRenderer annotationRenderer,
-            [NotNull] CSharpUtilities cSharpUtilities)
+            [NotNull] ICSharpUtilities cSharpUtilities)
         {
             Check.NotNull(scaffoldingHelper, nameof(scaffoldingHelper));
             Check.NotNull(annotationRenderer, nameof(annotationRenderer));
@@ -53,10 +53,10 @@ public CSharpDbContextGenerator(
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         public virtual string WriteCode(
-            [NotNull] IModel model,
-            [NotNull] string @namespace,
-            [NotNull] string contextName,
-            [NotNull] string connectionString,
+            IModel model,
+            string @namespace,
+            string contextName,
+            string connectionString,
             bool useDataAnnotations)
         {
             Check.NotNull(model, nameof(model));

src/EFCore.Design/Scaffolding/Internal/CSharpEntityTypeGenerator.cs

@@ -19,9 +19,9 @@ namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
     ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
     ///     directly from your code. This API may change or be removed in future releases.
     /// </summary>
-    public class CSharpEntityTypeGenerator
+    public class CSharpEntityTypeGenerator : ICSharpEntityTypeGenerator
     {
-        private CSharpUtilities CSharpUtilities { get; }
+        private ICSharpUtilities CSharpUtilities { get; }
 
         private IndentedStringBuilder _sb;
         private bool _useDataAnnotations;
@@ -31,7 +31,7 @@ public class CSharpEntityTypeGenerator
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         public CSharpEntityTypeGenerator(
-            [NotNull] CSharpUtilities cSharpUtilities)
+            [NotNull] ICSharpUtilities cSharpUtilities)
         {
             Check.NotNull(cSharpUtilities, nameof(cSharpUtilities));
 
@@ -42,7 +42,7 @@ public CSharpEntityTypeGenerator(
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string WriteCode([NotNull] IEntityType entityType, [NotNull] string @namespace, bool useDataAnnotations)
+        public virtual string WriteCode(IEntityType entityType, string @namespace, bool useDataAnnotations)
         {
             Check.NotNull(entityType, nameof(entityType));
             Check.NotNull(@namespace, nameof(@namespace));

src/EFCore.Design/Scaffolding/Internal/CSharpNamer.cs

@@ -15,7 +15,7 @@ namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
     public class CSharpNamer<T>
     {
         private readonly Func<T, string> _nameGetter;
-        private readonly CSharpUtilities _cSharpUtilities;
+        private readonly ICSharpUtilities _cSharpUtilities;
 
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
@@ -27,12 +27,13 @@ public class CSharpNamer<T>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public CSharpNamer([NotNull] Func<T, string> nameGetter)
+        public CSharpNamer([NotNull] Func<T, string> nameGetter, [NotNull] ICSharpUtilities cSharpUtilities)
         {
             Check.NotNull(nameGetter, nameof(nameGetter));
+            Check.NotNull(cSharpUtilities, nameof(cSharpUtilities));
 
             _nameGetter = nameGetter;
-            _cSharpUtilities = new CSharpUtilities();
+            _cSharpUtilities = cSharpUtilities;
         }
 
         /// <summary>

src/EFCore.Design/Scaffolding/Internal/CSharpScaffoldingGenerator.cs

@@ -20,22 +20,22 @@ public class CSharpScaffoldingGenerator : ScaffoldingCodeGenerator
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual CSharpDbContextGenerator CSharpDbContextGenerator { get; }
+        public virtual ICSharpDbContextGenerator CSharpDbContextGenerator { get; }
 
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual CSharpEntityTypeGenerator CSharpEntityTypeGenerator { get; }
+        public virtual ICSharpEntityTypeGenerator CSharpEntityTypeGenerator { get; }
 
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         public CSharpScaffoldingGenerator(
             [NotNull] IFileService fileService,
-            [NotNull] CSharpDbContextGenerator cSharpDbContextGenerator,
-            [NotNull] CSharpEntityTypeGenerator cSharpEntityTypeGenerator)
+            [NotNull] ICSharpDbContextGenerator cSharpDbContextGenerator,
+            [NotNull] ICSharpEntityTypeGenerator cSharpEntityTypeGenerator)
             : base(fileService)
         {
             Check.NotNull(cSharpDbContextGenerator, nameof(cSharpDbContextGenerator));

src/EFCore.Design/Scaffolding/Internal/CSharpUniqueNamer.cs

@@ -19,8 +19,8 @@ public class CSharpUniqueNamer<T> : CSharpNamer<T>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public CSharpUniqueNamer([NotNull] Func<T, string> nameGetter)
-            : this(nameGetter, null)
+        public CSharpUniqueNamer([NotNull] Func<T, string> nameGetter, [NotNull] ICSharpUtilities cSharpUtilities)
+            : this(nameGetter, null, cSharpUtilities)
         {
         }
 
@@ -29,8 +29,9 @@ public CSharpUniqueNamer([NotNull] Func<T, string> nameGetter)
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         public CSharpUniqueNamer([NotNull] Func<T, string> nameGetter,
-            [CanBeNull] IEnumerable<string> usedNames)
-            : base(nameGetter)
+            [CanBeNull] IEnumerable<string> usedNames,
+            [NotNull] ICSharpUtilities cSharpUtilities)
+            : base(nameGetter, cSharpUtilities)
         {
             if (usedNames != null)
             {

src/EFCore.Design/Scaffolding/Internal/CSharpUtilities.cs

@@ -16,7 +16,7 @@ namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
     ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
     ///     directly from your code. This API may change or be removed in future releases.
     /// </summary>
-    public class CSharpUtilities
+    public class CSharpUtilities : ICSharpUtilities
     {
         private static readonly HashSet<string> _cSharpKeywords = new HashSet<string>
         {
@@ -108,13 +108,7 @@ private static readonly Regex _invalidCharsRegex
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public static CSharpUtilities Instance { get; } = new CSharpUtilities();
-
-        /// <summary>
-        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
-        ///     directly from your code. This API may change or be removed in future releases.
-        /// </summary>
-        public virtual string DelimitString([NotNull] string value)
+        public virtual string DelimitString(string value)
         {
             Check.NotNull(value, nameof(value));
 
@@ -127,7 +121,7 @@ public virtual string DelimitString([NotNull] string value)
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string EscapeString([NotNull] string str)
+        public virtual string EscapeString(string str)
         {
             Check.NotNull(str, nameof(str));
 
@@ -138,7 +132,7 @@ public virtual string EscapeString([NotNull] string str)
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string EscapeVerbatimString([NotNull] string str)
+        public virtual string EscapeVerbatimString(string str)
         {
             Check.NotEmpty(str, nameof(str));
 
@@ -149,7 +143,7 @@ public virtual string EscapeVerbatimString([NotNull] string str)
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string GenerateLiteral([NotNull] byte[] value)
+        public virtual string GenerateLiteral(byte[] value)
         {
             Check.NotNull(value, nameof(value));
 
@@ -232,7 +226,7 @@ public virtual string GenerateLiteral(Guid value)
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string GenerateLiteral([NotNull] string value)
+        public virtual string GenerateLiteral(string value)
         {
             Check.NotNull(value, nameof(value));
 
@@ -243,7 +237,7 @@ public virtual string GenerateLiteral([NotNull] string value)
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string GenerateVerbatimStringLiteral([NotNull] string value)
+        public virtual string GenerateVerbatimStringLiteral(string value)
         {
             Check.NotNull(value, nameof(value));
 
@@ -254,7 +248,7 @@ public virtual string GenerateVerbatimStringLiteral([NotNull] string value)
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string GenerateLiteral([NotNull] object value)
+        public virtual string GenerateLiteral(object value)
         {
             Check.NotNull(value, nameof(value));
 
@@ -270,24 +264,24 @@ public virtual string GenerateLiteral([NotNull] object value)
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual bool IsCSharpKeyword([NotNull] string identifier)
+        public virtual bool IsCSharpKeyword(string identifier)
             => _cSharpKeywords.Contains(identifier);
 
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         public virtual string GenerateCSharpIdentifier(
-            [NotNull] string identifier, [CanBeNull] ICollection<string> existingIdentifiers)
+            string identifier, [CanBeNull] ICollection<string> existingIdentifiers)
             => GenerateCSharpIdentifier(identifier, existingIdentifiers, Uniquifier);
 
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         public virtual string GenerateCSharpIdentifier(
-            [NotNull] string identifier, [CanBeNull] ICollection<string> existingIdentifiers,
-            [NotNull] Func<string, ICollection<string>, string> uniquifier)
+            string identifier, [CanBeNull] ICollection<string> existingIdentifiers,
+            Func<string, ICollection<string>, string> uniquifier)
         {
             Check.NotNull(identifier, nameof(identifier));
             Check.NotNull(uniquifier, nameof(uniquifier));
@@ -321,7 +315,7 @@ public virtual string GenerateCSharpIdentifier(
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         public virtual string Uniquifier(
-            [NotNull] string proposedIdentifier, [CanBeNull] ICollection<string> existingIdentifiers)
+            string proposedIdentifier, [CanBeNull] ICollection<string> existingIdentifiers)
         {
             Check.NotEmpty(proposedIdentifier, nameof(proposedIdentifier));
 
@@ -364,7 +358,7 @@ public virtual string Uniquifier(
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string GetTypeName([NotNull] Type type)
+        public virtual string GetTypeName(Type type)
         {
             Check.NotNull(type, nameof(type));
 

src/EFCore.Design/Scaffolding/Internal/CandidateNamingService.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -16,13 +15,13 @@ namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
     ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
     ///     directly from your code. This API may change or be removed in future releases.
     /// </summary>
-    public class CandidateNamingService
+    public class CandidateNamingService : ICandidateNamingService
     {
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string GenerateCandidateIdentifier([NotNull] string originalIdentifier)
+        public virtual string GenerateCandidateIdentifier(string originalIdentifier)
         {
             Check.NotEmpty(originalIdentifier, nameof(originalIdentifier));
 
@@ -59,7 +58,7 @@ public virtual string GenerateCandidateIdentifier([NotNull] string originalIdent
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string GetDependentEndCandidateNavigationPropertyName([NotNull] IForeignKey foreignKey)
+        public virtual string GetDependentEndCandidateNavigationPropertyName(IForeignKey foreignKey)
         {
             Check.NotNull(foreignKey, nameof(foreignKey));
 
@@ -78,8 +77,8 @@ public virtual string GetDependentEndCandidateNavigationPropertyName([NotNull] I
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         public virtual string GetPrincipalEndCandidateNavigationPropertyName(
-            [NotNull] IForeignKey foreignKey,
-            [NotNull] string dependentEndNavigationPropertyName)
+            IForeignKey foreignKey,
+            string dependentEndNavigationPropertyName)
         {
             Check.NotNull(foreignKey, nameof(foreignKey));
             Check.NotEmpty(dependentEndNavigationPropertyName, nameof(dependentEndNavigationPropertyName));

src/EFCore.Design/Scaffolding/Internal/ICSharpDbContextGenerator.cs

@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
+{
+    public interface ICSharpDbContextGenerator
+    {
+        string WriteCode(
+            [NotNull] IModel model,
+            [NotNull] string @namespace,
+            [NotNull] string contextName,
+            [NotNull] string connectionString,
+            bool useDataAnnotations);
+    }
+}

src/EFCore.Design/Scaffolding/Internal/ICSharpEntityTypeGenerator.cs

@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
+{
+    public interface ICSharpEntityTypeGenerator
+    {
+        string WriteCode([NotNull] IEntityType entityType, [NotNull] string @namespace, bool useDataAnnotations);
+    }
+}