mirror of
https://github.com/collinbarrett/FilterLists.git
synced 2026-03-11 09:04:27 +00:00
Revert "some architecture changes per Scott Allen's suggestions"
This reverts commit 280b8a88f3.
This commit is contained in:
parent
9f927daf45
commit
fc2bc87d46
29 changed files with 16 additions and 28 deletions
|
|
@ -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 =>
|
||||
|
|
@ -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"));
|
||||
|
|
@ -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);
|
||||
|
|
@ -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<IListService, ListService>();
|
||||
return services;
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue