Fixes for design provider and tests

Ported to RC3.
Everything looks good except that some Roslyn-related issue is
plaguing the tests.

Author: roji

src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/Npgsql.EntityFrameworkCore.PostgreSQL.Design.csproj

@@ -61,7 +61,6 @@
       <Link>Properties\CommonAssemblyInfo.cs</Link>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Utilities\CodeAnnotations.cs" />
     <Compile Include="Utilities\LoggingExtensions.cs" />
     <Compile Include="Utilities\SharedTypeExtensions.cs" />
   </ItemGroup>
@@ -82,4 +81,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/Npgsql.EntityFrameworkCore.PostgreSQL.Design.project.json

@@ -1,10 +1,10 @@
 {
   "dependencies" : {
-    "Microsoft.EntityFrameworkCore": "1.0.0-rc2-*",
-    "Microsoft.EntityFrameworkCore.Relational": "1.0.0-rc2-*",
-    "Microsoft.EntityFrameworkCore.Relational.Design": "1.0.0-rc2-*",
-    "Microsoft.Extensions.DependencyInjection": "1.0.0-rc2-*",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-*",
+    "Microsoft.EntityFrameworkCore": "1.0.0-*",
+    "Microsoft.EntityFrameworkCore.Relational": "1.0.0-*",
+    "Microsoft.EntityFrameworkCore.Relational.Design": "1.0.0-*",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
     "Npgsql": "3.1.4"
   },
   "frameworks": {

src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/NpgsqlDesignTimeServices.cs

@@ -27,7 +27,7 @@
 using Microsoft.EntityFrameworkCore.Storage.Internal;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.EntityFrameworkCore.Scaffolding
+namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
 {
     public class NpgsqlDesignTimeServices
     {

src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/NpgsqlScaffoldingModelFactory.cs

@@ -22,31 +22,28 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.EntityFrameworkCore.Scaffolding
+namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
 {
     public class NpgsqlScaffoldingModelFactory : RelationalScaffoldingModelFactory
     {
         public NpgsqlScaffoldingModelFactory(
             [NotNull] ILoggerFactory loggerFactory,
             [NotNull] IRelationalTypeMapper typeMapper,
-            [NotNull] IDatabaseModelFactory databaseModelFactory)
-            : base(loggerFactory, typeMapper, databaseModelFactory)
+            [NotNull] IDatabaseModelFactory databaseModelFactory,
+            [NotNull] CandidateNamingService candidateNamingService)
+            : base(loggerFactory, typeMapper, databaseModelFactory, candidateNamingService)
         {
         }
 
-        public override IModel Create(string connectionString, TableSelectionSet tableSelectionSet)
+        public override IModel Create(string connectionString, [CanBeNull] TableSelectionSet tableSelectionSet)
         {
             var model = base.Create(connectionString, tableSelectionSet);
             model.Scaffolding().UseProviderMethodName = nameof(NpgsqlDbContextOptionsExtensions.UseNpgsql);

src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/Utilities/CodeAnnotations.cs

@@ -67,10 +67,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="ReverseEngineering\Expected\ColumnsWithSequences\IDNonSerialSequence.expected">
+    <None Include="ReverseEngineering\Expected\ColumnsWithSequences\IdNonSerialSequence.expected">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="ReverseEngineering\Expected\ColumnsWithSequences\IDSerialSequence.expected">
+    <None Include="ReverseEngineering\Expected\ColumnsWithSequences\IdSerialSequence.expected">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="ReverseEngineering\Expected\AllFluentApi\AllDataTypes.expected">
@@ -188,4 +188,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

test/Npgsql.EntityFrameworkCore.PostgreSQL.Design.FunctionalTests/Npgsql.EntityFrameworkCore.PostgreSQL.Design.FunctionalTests.csproj

@@ -5,24 +5,24 @@ namespace E2ETest.Namespace
 {
     public partial class AllDataTypes
     {
-        public int AllDataTypesID { get; set; }
-        public short smallintColumn { get; set; }
-        public int intColumn { get; set; }
-        public long bigintColumn { get; set; }
-        public float? realColumn { get; set; }
-        public double doubleColumn { get; set; }
-        public decimal decimalColumn { get; set; }
-        public decimal numericColumn { get; set; }
-        public decimal moneyColumn { get; set; }
-        public string charColumn { get; set; }
-        public string textColumn { get; set; }
-        public string varcharColumn { get; set; }
-        public DateTime dateColumn { get; set; }
-        public DateTime? timestampColumn { get; set; }
-        public DateTime? timestampTzColumn { get; set; }
-        public TimeSpan? timeColumn { get; set; }
-        public byte[] byteaColumn { get; set; }
-        public bool boolColumn { get; set; }
-        public Guid? uuidColumn { get; set; }
+        public int AllDataTypesId { get; set; }
+        public short SmallintColumn { get; set; }
+        public int IntColumn { get; set; }
+        public long BigintColumn { get; set; }
+        public float? RealColumn { get; set; }
+        public double DoubleColumn { get; set; }
+        public decimal DecimalColumn { get; set; }
+        public decimal NumericColumn { get; set; }
+        public decimal MoneyColumn { get; set; }
+        public string CharColumn { get; set; }
+        public string TextColumn { get; set; }
+        public string VarcharColumn { get; set; }
+        public DateTime DateColumn { get; set; }
+        public DateTime? TimestampColumn { get; set; }
+        public DateTime? TimestampTzColumn { get; set; }
+        public TimeSpan? TimeColumn { get; set; }
+        public byte[] ByteaColumn { get; set; }
+        public bool BoolColumn { get; set; }
+        public Guid? UuidColumn { get; set; }
     }
 }