avoid naming types and namespaces with the same identifier - ndepend

.gitignore

@@ -334,4 +334,4 @@ appsettings.development.json
 appsettings.production.json
 src/FilterLists.Agent/appsettings.json
 src/FilterLists.Web/wwwroot/dist
-NDependOut/
+NDependOut*/

src/FilterLists.Agent/Program.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using FilterLists.Services.DependencyInjection.Extensions;
-using FilterLists.Services.SnapshotService;
+using FilterLists.Services.Snapshot;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.Extensions.Configuration;

src/FilterLists.Api/V1/Controllers/ForksController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities.Junctions;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models.Junctions;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models.Junctions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Api/V1/Controllers/LanguagesController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Api/V1/Controllers/LicensesController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Api/V1/Controllers/ListsController.cs

@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.FilterListService;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models;
+using FilterLists.Services.FilterList;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities.Junctions;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models.Junctions;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models.Junctions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities.Junctions;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models.Junctions;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models.Junctions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Api/V1/Controllers/MaintainersController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Api/V1/Controllers/MergesController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities.Junctions;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models.Junctions;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models.Junctions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Api/V1/Controllers/SoftwareController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities.Junctions;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models.Junctions;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models.Junctions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Api/V1/Controllers/SyntaxesController.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using FilterLists.Data.Entities;
-using FilterLists.Services.SeedService;
-using FilterLists.Services.SeedService.Models;
+using FilterLists.Services.Seed;
+using FilterLists.Services.Seed.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FilterLists.Api.V1.Controllers

src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs

@@ -17,9 +17,9 @@ public static void AddFilterListsServices(this IServiceCollection services, ICon
                         options.UseMySql(configuration.GetConnectionString("FilterListsConnection"),
                                    b => b.MigrationsAssembly("FilterLists.Api"))
                                .EnableSensitiveDataLogging());
-            services.TryAddScoped<FilterListService.FilterListService>();
-            services.TryAddScoped<SeedService.SeedService>();
-            services.TryAddScoped<SnapshotService.SnapshotService>();
+            services.TryAddScoped<FilterList.FilterListService>();
+            services.TryAddScoped<Seed.SeedService>();
+            services.TryAddScoped<Snapshot.SnapshotService>();
             services.AddAutoMapper();
         }
     }

src/FilterLists.Services/FilterList/FilterListService.cs

@@ -5,7 +5,7 @@
 using FilterLists.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace FilterLists.Services.FilterListService
+namespace FilterLists.Services.FilterList
 {
     public class FilterListService
     {

src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace FilterLists.Services.FilterListService
+namespace FilterLists.Services.FilterList
 {
     public static class FilterListServiceExtensions
     {

src/FilterLists.Services/FilterList/ListDetailsDto.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace FilterLists.Services.FilterListService
+namespace FilterLists.Services.FilterList
 {
     public class ListDetailsDto
     {

src/FilterLists.Services/FilterList/ListSummaryDto.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace FilterLists.Services.FilterListService
+namespace FilterLists.Services.FilterList
 {
     public class ListSummaryDto
     {

src/FilterLists.Services/FilterList/MappingProfiles.cs

@@ -2,18 +2,18 @@
 using AutoMapper;
 using FilterLists.Data.Entities;
 
-namespace FilterLists.Services.FilterListService
+namespace FilterLists.Services.FilterList
 {
     public class MappingProfiles : Profile
     {
         public MappingProfiles()
         {
-            CreateMap<FilterList, ListSummaryDto>()
+            CreateMap<Data.Entities.FilterList, ListSummaryDto>()
                 .ForMember(dto => dto.Languages,
                     conf => conf.MapFrom(list =>
                         list.FilterListLanguages.Select(listLangs => listLangs.Language)));
 
-            CreateMap<FilterList, ListDetailsDto>()
+            CreateMap<Data.Entities.FilterList, ListDetailsDto>()
                 .ForMember(dto => dto.Languages,
                     conf => conf.MapFrom(list =>
                         list.FilterListLanguages.Select(listLangs => listLangs.Language.Name)))

src/FilterLists.Services/Seed/Models/FilterListSeedDto.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace FilterLists.Services.SeedService.Models
+namespace FilterLists.Services.Seed.Models
 {
     public class FilterListSeedDto
     {

src/FilterLists.Services/Seed/Models/Junctions/FilterListLanguageSeedDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SeedService.Models.Junctions
+namespace FilterLists.Services.Seed.Models.Junctions
 {
     public class FilterListLanguageSeedDto
     {

src/FilterLists.Services/Seed/Models/Junctions/FilterListMaintainerSeedDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SeedService.Models.Junctions
+namespace FilterLists.Services.Seed.Models.Junctions
 {
     public class FilterListMaintainerSeedDto
     {

src/FilterLists.Services/Seed/Models/Junctions/ForkSeedDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SeedService.Models.Junctions
+namespace FilterLists.Services.Seed.Models.Junctions
 {
     public class ForkSeedDto
     {

src/FilterLists.Services/Seed/Models/Junctions/MergeSeedDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SeedService.Models.Junctions
+namespace FilterLists.Services.Seed.Models.Junctions
 {
     public class MergeSeedDto
     {

src/FilterLists.Services/Seed/Models/Junctions/SoftwareSyntaxSeedDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SeedService.Models.Junctions
+namespace FilterLists.Services.Seed.Models.Junctions
 {
     public class SoftwareSyntaxSeedDto
     {

src/FilterLists.Services/Seed/Models/LanguageSeedDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SeedService.Models
+namespace FilterLists.Services.Seed.Models
 {
     public class LanguageSeedDto
     {

src/FilterLists.Services/Seed/Models/LicenseSeedDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SeedService.Models
+namespace FilterLists.Services.Seed.Models
 {
     public class LicenseSeedDto
     {

src/FilterLists.Services/Seed/Models/MaintainerSeedDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SeedService.Models
+namespace FilterLists.Services.Seed.Models
 {
     public class MaintainerSeedDto
     {

src/FilterLists.Services/Seed/Models/SoftwareSeedDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SeedService.Models
+namespace FilterLists.Services.Seed.Models
 {
     public class SoftwareSeedDto
     {

src/FilterLists.Services/Seed/Models/SyntaxSeedDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SeedService.Models
+namespace FilterLists.Services.Seed.Models
 {
     public class SyntaxSeedDto
     {

src/FilterLists.Services/Seed/SeedService.cs

@@ -6,7 +6,7 @@
 using FilterLists.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace FilterLists.Services.SeedService
+namespace FilterLists.Services.Seed
 {
     public class SeedService
     {

src/FilterLists.Services/Snapshot/FilterListViewUrlDto.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SnapshotService
+namespace FilterLists.Services.Snapshot
 {
     public class FilterListViewUrlDto
     {

src/FilterLists.Services/Snapshot/RawRuleLinterExtensions.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Services.SnapshotService
+namespace FilterLists.Services.Snapshot
 {
     public static class RawRuleLinterExtensions
     {

src/FilterLists.Services/Snapshot/SnapshotBatchDe.cs

@@ -6,16 +6,16 @@
 using FilterLists.Data.Entities.Junctions;
 using FilterLists.Services.Extensions;
 
-namespace FilterLists.Services.SnapshotService
+namespace FilterLists.Services.Snapshot
 {
     public class SnapshotBatchDe
     {
         private readonly FilterListsDbContext dbContext;
         private readonly IEnumerable<string> rawRules;
-        private readonly Snapshot snapshot;
+        private readonly Data.Entities.Snapshot snapshot;
         private IQueryable<Rule> rules;
 
-        public SnapshotBatchDe(FilterListsDbContext dbContext, Snapshot snapshot, IEnumerable<string> rawRules)
+        public SnapshotBatchDe(FilterListsDbContext dbContext, Data.Entities.Snapshot snapshot, IEnumerable<string> rawRules)
         {
             this.dbContext = dbContext;
             this.snapshot = snapshot;

src/FilterLists.Services/Snapshot/SnapshotDe.cs

@@ -9,7 +9,7 @@
 using FilterLists.Data.Entities.Junctions;
 using FilterLists.Services.Extensions;
 
-namespace FilterLists.Services.SnapshotService
+namespace FilterLists.Services.Snapshot
 {
     public class SnapshotDe
     {
@@ -20,7 +20,7 @@ public class SnapshotDe
 
         private readonly FilterListsDbContext dbContext;
         private readonly FilterListViewUrlDto list;
-        private Snapshot snapshot;
+        private Data.Entities.Snapshot snapshot;
 
         public SnapshotDe(FilterListsDbContext dbContext, FilterListViewUrlDto list)
         {
@@ -50,7 +50,7 @@ private async Task<string> CaptureSnapshot()
 
         private async Task AddSnapshot()
         {
-            snapshot = new Snapshot {FilterListId = list.Id};
+            snapshot = new Data.Entities.Snapshot {FilterListId = list.Id};
             await dbContext.Snapshots.AddAsync(snapshot);
         }
 

src/FilterLists.Services/Snapshot/SnapshotService.cs

@@ -6,7 +6,7 @@
 using FilterLists.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace FilterLists.Services.SnapshotService
+namespace FilterLists.Services.Snapshot
 {
     public class SnapshotService
     {