Move some public enums to Microsoft.EntityFrameworkCore.Metadata (#1669)

Fixes #1613
npgsql · Feb 8, 2021 · 926aa41 · 926aa41
1 parent 5d8996f
commit 926aa41
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/src/EFCore.PG/Metadata/NpgsqlValueGenerationStrategy.cs b/src/EFCore.PG/Metadata/NpgsqlValueGenerationStrategy.cs
@@ -1,4 +1,5 @@
-namespace Npgsql.EntityFrameworkCore.PostgreSQL.Metadata
+// ReSharper disable once CheckNamespace
+namespace Microsoft.EntityFrameworkCore.Metadata
 {
     public enum NpgsqlValueGenerationStrategy
     {

diff --git a/src/EFCore.PG/Metadata/NullSortOrder.cs b/src/EFCore.PG/Metadata/NullSortOrder.cs
@@ -1,4 +1,5 @@
-namespace Npgsql.EntityFrameworkCore.PostgreSQL.Metadata
+// ReSharper disable once CheckNamespace
+namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>
     /// Options for modifying sort ordering of <c>NULL</c>-values in indexes.

diff --git a/src/EFCore.PG/Metadata/SortOrder.cs b/src/EFCore.PG/Metadata/SortOrder.cs
@@ -1,4 +1,5 @@
-namespace Npgsql.EntityFrameworkCore.PostgreSQL.Metadata
+// ReSharper disable once CheckNamespace
+namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>
     /// Options for modifying sort ordering of index values.

diff --git a/src/EFCore.PG/Utilities/SortOrderHelper.cs b/src/EFCore.PG/Utilities/SortOrderHelper.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.Utilities
 {

diff --git a/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs
@@ -1,15 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Common;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Internal;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations.Operations;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.TestUtilities;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;
 using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities;
 using Xunit;

diff --git a/test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Scaffolding;
 using Microsoft.EntityFrameworkCore.TestUtilities;