diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml index 1dca87d..84dc9c3 100644 --- a/.github/workflows/createrelease.yml +++ b/.github/workflows/createrelease.yml @@ -28,11 +28,7 @@ jobs: - name: Run Unit Tests run: | echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}" - dotnet test "EstateReportingAPI.Tests\EstateReportingAPI.Tests.csproj" - - - name: Run Integration Tests - run: | - dotnet test "EstateReportingAPI.IntegrationTests\EstateReportingAPI.IntegrationTests.csproj" + dotnet test "EstateReportingAPI.Tests\EstateReportingAPI.Tests.csproj" - name: Publish Images to Docker Hub - Pre Release if: ${{ github.event.release.prerelease == true }} diff --git a/EstateReportingAPI/Startup.cs b/EstateReportingAPI/Startup.cs index 3491d99..ad8f387 100644 --- a/EstateReportingAPI/Startup.cs +++ b/EstateReportingAPI/Startup.cs @@ -2,7 +2,6 @@ using HealthChecks.UI.Client; using Lamar; using Microsoft.AspNetCore.Diagnostics.HealthChecks; -using NLog.Extensions.Logging; using Shared.Extensions; using Shared.General; using Shared.Logger; @@ -11,7 +10,6 @@ namespace EstateReportingAPI { - using BusinessLogic; using Shared.Middleware; [ExcludeFromCodeCoverage] @@ -19,10 +17,9 @@ public class Startup { public static IConfigurationRoot Configuration { get; set; } public static IWebHostEnvironment WebHostEnvironment { get; set; } - public static IServiceProvider ServiceProvider { get; set; } - public static Container Container; + public Startup(IWebHostEnvironment webHostEnvironment) { IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(webHostEnvironment.ContentRootPath) @@ -49,11 +46,10 @@ public void ConfigureContainer(ServiceRegistry services) public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { - if (env.IsDevelopment()) - { + if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); } - + Microsoft.Extensions.Logging.ILogger logger = loggerFactory.CreateLogger("EstateManagement"); Logger.Initialise(logger);