Changed namespaces

codemunkie15 · Oct 23, 2024 · a365ef7 · a365ef7
1 parent 44ab319
commit a365ef7
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 961 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -2,3 +2,6 @@
 
 # EF1001: Internal EF Core API usage.
 dotnet_diagnostic.EF1001.severity = none
+
+# IDE0130: Namespace does not match folder structure
+dotnet_diagnostic.IDE0130.severity = error
diff --git a/src/EFCore.ChangeTriggers.SqlServer/Extensions/DbContextOptionsBuilderExtensions.cs b/src/EFCore.ChangeTriggers.SqlServer/Extensions/DbContextOptionsBuilderExtensions.cs
@@ -1,10 +1,11 @@
-using EFCore.ChangeTriggers.Extensions;
-using EFCore.ChangeTriggers.SqlServer.Infrastructure;
+using EFCore.ChangeTriggers.SqlServer.Infrastructure;
 using EFCore.ChangeTriggers.SqlServer.Migrations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace EFCore.ChangeTriggers.SqlServer.Extensions
+#pragma warning disable IDE0130 // Namespace does not match folder structure
+namespace EFCore.ChangeTriggers.SqlServer
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 {
     public static class DbContextOptionsBuilderExtensions
     {

diff --git a/src/EFCore.ChangeTriggers/Extensions/DbContextOptionsBuilderExtensions.cs b/src/EFCore.ChangeTriggers/Extensions/DbContextOptionsBuilderExtensions.cs
@@ -3,7 +3,9 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace EFCore.ChangeTriggers.Extensions
+#pragma warning disable IDE0130 // Namespace does not match folder structure
+namespace EFCore.ChangeTriggers
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 {
     internal static class DbContextOptionsBuilderExtensions
     {

diff --git a/src/EFCore.ChangeTriggers/Extensions/ModelBuilderExtensions.cs b/src/EFCore.ChangeTriggers/Extensions/ModelBuilderExtensions.cs
@@ -3,7 +3,9 @@
 using EFCore.ChangeTriggers.Metadata.Builders;
 using Microsoft.EntityFrameworkCore;
 
-namespace EFCore.ChangeTriggers.Extensions
+#pragma warning disable IDE0130 // Namespace does not match folder structure
+namespace EFCore.ChangeTriggers
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 {
     public static class ModelBuilderExtensions
     {

diff --git a/src/EFCore.ChangeTriggers/Infrastructure/ChangeTriggersDbContextOptionsBuilder.cs b/src/EFCore.ChangeTriggers/Infrastructure/ChangeTriggersDbContextOptionsBuilder.cs
@@ -1,5 +1,4 @@
 using EFCore.ChangeTriggers.Abstractions;
-using EFCore.ChangeTriggers.Extensions;
 using Microsoft.EntityFrameworkCore;
 
 namespace EFCore.ChangeTriggers.Infrastructure

diff --git a/src/EFCore.ChangeTriggers/Metadata/Builders/EntityTypeBuilderExtensions.cs b/src/EFCore.ChangeTriggers/Metadata/Builders/EntityTypeBuilderExtensions.cs
@@ -1,9 +1,12 @@
 using EFCore.ChangeTriggers.Configuration;
 using EFCore.ChangeTriggers.Constants;
 using EFCore.ChangeTriggers.Helpers;
+using EFCore.ChangeTriggers.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace EFCore.ChangeTriggers.Metadata.Builders
+#pragma warning disable IDE0130 // Namespace does not match folder structure
+namespace EFCore.ChangeTriggers
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 {
     public static class EntityTypeBuilderExtensions
     {

diff --git a/tests/TestHarness/TestHarness/DbModels/Users/UserChange.cs b/tests/TestHarness/TestHarness/DbModels/Users/UserChange.cs
@@ -3,13 +3,13 @@
 
 namespace TestHarness.DbModels.Users
 {
-    public class UserChange : UserBase, IChange<User>, IHasChangeSource<ChangeSourceType>, IHasChangedBy<User>
+    public class UserChange : UserBase, IChange<User>, IHasChangeSource<string>, IHasChangedBy<User>
     {
         public int ChangeId { get; set; }
 
         public OperationType OperationType { get; set; }
 
-        public ChangeSourceType ChangeSource { get; set; }
+        public string ChangeSource { get; set; }
 
         public DateTimeOffset ChangedAt { get; set; }