diff --git a/api/src/FilterLists.Api/Controllers/ListsController.cs b/api/FilterLists.Api/Controllers/ListsController.cs similarity index 100% rename from api/src/FilterLists.Api/Controllers/ListsController.cs rename to api/FilterLists.Api/Controllers/ListsController.cs diff --git a/api/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/api/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs similarity index 84% rename from api/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs rename to api/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs index 492829966..749a4f785 100644 --- a/api/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/api/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -5,7 +5,7 @@ namespace FilterLists.Api.DependencyInjection.Extensions { public static class ConfigureServicesCollection { - public static IServiceCollection AddFilterListsApi(this IServiceCollection services) + public static IServiceCollection RegisterFilterListsApi(this IServiceCollection services) { services.AddMvc() .AddJsonOptions(options => diff --git a/api/src/FilterLists.Api/FilterLists.Api.csproj b/api/FilterLists.Api/FilterLists.Api.csproj similarity index 100% rename from api/src/FilterLists.Api/FilterLists.Api.csproj rename to api/FilterLists.Api/FilterLists.Api.csproj diff --git a/api/src/FilterLists.Api/Program.cs b/api/FilterLists.Api/Program.cs similarity index 100% rename from api/src/FilterLists.Api/Program.cs rename to api/FilterLists.Api/Program.cs diff --git a/api/src/FilterLists.Api/Startup.cs b/api/FilterLists.Api/Startup.cs similarity index 82% rename from api/src/FilterLists.Api/Startup.cs rename to api/FilterLists.Api/Startup.cs index ce44bed80..97beb4b67 100644 --- a/api/src/FilterLists.Api/Startup.cs +++ b/api/FilterLists.Api/Startup.cs @@ -25,13 +25,15 @@ public Startup(IHostingEnvironment env) public void ConfigureServices(IServiceCollection services) { - services.AddFilterListsRepositories(Configuration); - services.AddFilterListsServices(); - services.AddFilterListsApi(); + services.RegisterFilterListsRepositories(Configuration); + services.RegisterFilterListsServices(); + services.RegisterFilterListsApi(); } public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { + loggerFactory.AddConsole(Configuration.GetSection("Logging")); + loggerFactory.AddDebug(); app.UseMvc(); //TODO: maybe move to Startup() per Scott Allen loggerFactory.AddConsole(Configuration.GetSection("Logging")); diff --git a/api/src/FilterLists.Data.Contracts/Contexts/IFilterListsDbContext.cs b/api/FilterLists.Data.Contracts/Contexts/IFilterListsDbContext.cs similarity index 100% rename from api/src/FilterLists.Data.Contracts/Contexts/IFilterListsDbContext.cs rename to api/FilterLists.Data.Contracts/Contexts/IFilterListsDbContext.cs diff --git a/api/src/FilterLists.Data.Contracts/FilterLists.Data.Contracts.csproj b/api/FilterLists.Data.Contracts/FilterLists.Data.Contracts.csproj similarity index 100% rename from api/src/FilterLists.Data.Contracts/FilterLists.Data.Contracts.csproj rename to api/FilterLists.Data.Contracts/FilterLists.Data.Contracts.csproj diff --git a/api/src/FilterLists.Data.Contracts/Repositories/IListRepository.cs b/api/FilterLists.Data.Contracts/Repositories/IListRepository.cs similarity index 100% rename from api/src/FilterLists.Data.Contracts/Repositories/IListRepository.cs rename to api/FilterLists.Data.Contracts/Repositories/IListRepository.cs diff --git a/api/test/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj b/api/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj similarity index 100% rename from api/test/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj rename to api/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj diff --git a/api/test/FilterLists.Data.Tests/UnitTest1.cs b/api/FilterLists.Data.Tests/UnitTest1.cs similarity index 100% rename from api/test/FilterLists.Data.Tests/UnitTest1.cs rename to api/FilterLists.Data.Tests/UnitTest1.cs diff --git a/api/src/FilterLists.Data/Contexts/FilterListsDbContext.cs b/api/FilterLists.Data/Contexts/FilterListsDbContext.cs similarity index 100% rename from api/src/FilterLists.Data/Contexts/FilterListsDbContext.cs rename to api/FilterLists.Data/Contexts/FilterListsDbContext.cs diff --git a/api/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/api/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs similarity index 89% rename from api/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs rename to api/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs index 7f93a959c..b3513d65b 100644 --- a/api/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/api/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -11,7 +11,7 @@ namespace FilterLists.Data.DependencyInjection.Extensions { public static class ConfigureServicesCollection { - public static IServiceCollection AddFilterListsRepositories(this IServiceCollection services, + public static IServiceCollection RegisterFilterListsRepositories(this IServiceCollection services, IConfiguration configuration) { services.AddSingleton(c => configuration); diff --git a/api/src/FilterLists.Data/FilterLists.Data.csproj b/api/FilterLists.Data/FilterLists.Data.csproj similarity index 100% rename from api/src/FilterLists.Data/FilterLists.Data.csproj rename to api/FilterLists.Data/FilterLists.Data.csproj diff --git a/api/src/FilterLists.Data/Migrations/20170410220415_Initial.Designer.cs b/api/FilterLists.Data/Migrations/20170410220415_Initial.Designer.cs similarity index 100% rename from api/src/FilterLists.Data/Migrations/20170410220415_Initial.Designer.cs rename to api/FilterLists.Data/Migrations/20170410220415_Initial.Designer.cs diff --git a/api/src/FilterLists.Data/Migrations/20170410220415_Initial.cs b/api/FilterLists.Data/Migrations/20170410220415_Initial.cs similarity index 100% rename from api/src/FilterLists.Data/Migrations/20170410220415_Initial.cs rename to api/FilterLists.Data/Migrations/20170410220415_Initial.cs diff --git a/api/src/FilterLists.Data/Migrations/FilterListsDbContextModelSnapshot.cs b/api/FilterLists.Data/Migrations/FilterListsDbContextModelSnapshot.cs similarity index 100% rename from api/src/FilterLists.Data/Migrations/FilterListsDbContextModelSnapshot.cs rename to api/FilterLists.Data/Migrations/FilterListsDbContextModelSnapshot.cs diff --git a/api/src/FilterLists.Data/Repositories/ListRepository.cs b/api/FilterLists.Data/Repositories/ListRepository.cs similarity index 100% rename from api/src/FilterLists.Data/Repositories/ListRepository.cs rename to api/FilterLists.Data/Repositories/ListRepository.cs diff --git a/api/src/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql b/api/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql similarity index 100% rename from api/src/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql rename to api/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql diff --git a/api/src/FilterLists.Models/BaseEntity.cs b/api/FilterLists.Models/BaseEntity.cs similarity index 100% rename from api/src/FilterLists.Models/BaseEntity.cs rename to api/FilterLists.Models/BaseEntity.cs diff --git a/api/src/FilterLists.Models/FilterLists.Models.csproj b/api/FilterLists.Models/FilterLists.Models.csproj similarity index 100% rename from api/src/FilterLists.Models/FilterLists.Models.csproj rename to api/FilterLists.Models/FilterLists.Models.csproj diff --git a/api/src/FilterLists.Models/List.cs b/api/FilterLists.Models/List.cs similarity index 100% rename from api/src/FilterLists.Models/List.cs rename to api/FilterLists.Models/List.cs diff --git a/api/src/FilterLists.Services.Contracts/FilterLists.Services.Contracts.csproj b/api/FilterLists.Services.Contracts/FilterLists.Services.Contracts.csproj similarity index 100% rename from api/src/FilterLists.Services.Contracts/FilterLists.Services.Contracts.csproj rename to api/FilterLists.Services.Contracts/FilterLists.Services.Contracts.csproj diff --git a/api/src/FilterLists.Services.Contracts/IListService.cs b/api/FilterLists.Services.Contracts/IListService.cs similarity index 100% rename from api/src/FilterLists.Services.Contracts/IListService.cs rename to api/FilterLists.Services.Contracts/IListService.cs diff --git a/api/test/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj b/api/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj similarity index 100% rename from api/test/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj rename to api/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj diff --git a/api/test/FilterLists.Services.Tests/UnitTest1.cs b/api/FilterLists.Services.Tests/UnitTest1.cs similarity index 100% rename from api/test/FilterLists.Services.Tests/UnitTest1.cs rename to api/FilterLists.Services.Tests/UnitTest1.cs diff --git a/api/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/api/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs similarity index 79% rename from api/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs rename to api/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs index f8922c493..35a31d5fa 100644 --- a/api/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/api/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -6,7 +6,7 @@ namespace FilterLists.Services.DependencyInjection.Extensions { public static class ConfigureServicesCollection { - public static IServiceCollection AddFilterListsServices(this IServiceCollection services) + public static IServiceCollection RegisterFilterListsServices(this IServiceCollection services) { services.TryAddScoped(); return services; diff --git a/api/src/FilterLists.Services/FilterLists.Services.csproj b/api/FilterLists.Services/FilterLists.Services.csproj similarity index 100% rename from api/src/FilterLists.Services/FilterLists.Services.csproj rename to api/FilterLists.Services/FilterLists.Services.csproj diff --git a/api/src/FilterLists.Services/ListService.cs b/api/FilterLists.Services/ListService.cs similarity index 100% rename from api/src/FilterLists.Services/ListService.cs rename to api/FilterLists.Services/ListService.cs diff --git a/api/FilterLists.sln b/api/FilterLists.sln index dd02b2711..8a1c727c2 100644 --- a/api/FilterLists.sln +++ b/api/FilterLists.sln @@ -3,25 +3,21 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26403.3 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Api", "src\FilterLists.API\FilterLists.Api.csproj", "{57E4CE18-41F3-48F6-B142-12947FFBA86C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Api", "FilterLists.API\FilterLists.Api.csproj", "{57E4CE18-41F3-48F6-B142-12947FFBA86C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data", "src\FilterLists.Data\FilterLists.Data.csproj", "{944ADE8F-18E3-4DB8-9098-6A55E026EAC1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data", "FilterLists.Data\FilterLists.Data.csproj", "{944ADE8F-18E3-4DB8-9098-6A55E026EAC1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Models", "src\FilterLists.Models\FilterLists.Models.csproj", "{EBEF0C2E-2631-4AEF-ACAF-F5AE5A568975}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Models", "FilterLists.Models\FilterLists.Models.csproj", "{EBEF0C2E-2631-4AEF-ACAF-F5AE5A568975}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data.Contracts", "src\FilterLists.Data.Contracts\FilterLists.Data.Contracts.csproj", "{07A5064E-1CB9-4990-84F8-25A9A89B1D45}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data.Contracts", "FilterLists.Data.Contracts\FilterLists.Data.Contracts.csproj", "{07A5064E-1CB9-4990-84F8-25A9A89B1D45}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services", "src\FilterLists.Services\FilterLists.Services.csproj", "{9F296ECF-97C9-47E6-A794-5AD900ECFE6C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services", "FilterLists.Services\FilterLists.Services.csproj", "{9F296ECF-97C9-47E6-A794-5AD900ECFE6C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services.Tests", "test\FilterLists.Services.Tests\FilterLists.Services.Tests.csproj", "{39072BBE-268D-408D-878F-1416F9C400A2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services.Tests", "FilterLists.Services.Tests\FilterLists.Services.Tests.csproj", "{39072BBE-268D-408D-878F-1416F9C400A2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data.Tests", "test\FilterLists.Data.Tests\FilterLists.Data.Tests.csproj", "{AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data.Tests", "FilterLists.Data.Tests\FilterLists.Data.Tests.csproj", "{AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services.Contracts", "src\FilterLists.Services.Contracts\FilterLists.Services.Contracts.csproj", "{C001DB46-2DE7-40C1-B0F8-75E831C09E6C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3522D401-71DD-450C-9F05-DB217AA75946}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{820F892B-93A6-48D8-A0D7-338283264E46}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services.Contracts", "FilterLists.Services.Contracts\FilterLists.Services.Contracts.csproj", "{C001DB46-2DE7-40C1-B0F8-75E831C09E6C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -65,14 +61,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {57E4CE18-41F3-48F6-B142-12947FFBA86C} = {3522D401-71DD-450C-9F05-DB217AA75946} - {944ADE8F-18E3-4DB8-9098-6A55E026EAC1} = {3522D401-71DD-450C-9F05-DB217AA75946} - {EBEF0C2E-2631-4AEF-ACAF-F5AE5A568975} = {3522D401-71DD-450C-9F05-DB217AA75946} - {07A5064E-1CB9-4990-84F8-25A9A89B1D45} = {3522D401-71DD-450C-9F05-DB217AA75946} - {9F296ECF-97C9-47E6-A794-5AD900ECFE6C} = {3522D401-71DD-450C-9F05-DB217AA75946} - {39072BBE-268D-408D-878F-1416F9C400A2} = {820F892B-93A6-48D8-A0D7-338283264E46} - {AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC} = {820F892B-93A6-48D8-A0D7-338283264E46} - {C001DB46-2DE7-40C1-B0F8-75E831C09E6C} = {3522D401-71DD-450C-9F05-DB217AA75946} - EndGlobalSection EndGlobal