Nuke nlog.

fintermobilityas · Jan 27, 2024 · d0a0b58 · d0a0b58
1 parent 09c4442
commit d0a0b58
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 52 deletions.
diff --git a/Digipost.Api.Client.Archive.Tests/Digipost.Api.Client.Archive.Tests.csproj b/Digipost.Api.Client.Archive.Tests/Digipost.Api.Client.Archive.Tests.csproj
@@ -17,7 +17,6 @@
         <ProjectReference Include="..\Digipost.Api.Client.Resources\Digipost.Api.Client.Resources.csproj" />
         <ProjectReference Include="..\Digipost.Api.Client.Tests\Digipost.Api.Client.Tests.csproj"/>
         <ProjectReference Include="..\Digipost.Api.Client\Digipost.Api.Client.csproj" />
-        <ProjectReference Include="..\Digipost.Api.Client.Shared.Tests\Digipost.Api.Client.Shared.Tests.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">

diff --git a/Digipost.Api.Client.Common.Tests/Digipost.Api.Client.Common.Tests.csproj b/Digipost.Api.Client.Common.Tests/Digipost.Api.Client.Common.Tests.csproj
@@ -15,7 +15,6 @@
         <ProjectReference Include="..\Digipost.Api.Client.Common\Digipost.Api.Client.Common.csproj" />
         <ProjectReference Include="..\Digipost.Api.Client.Resources\Digipost.Api.Client.Resources.csproj" />
         <ProjectReference Include="..\Digipost.Api.Client.Tests\Digipost.Api.Client.Tests.csproj" />
-        <ProjectReference Include="..\Digipost.Api.Client.Shared.Tests\Digipost.Api.Client.Shared.Tests.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">

diff --git a/Digipost.Api.Client.Common/Digipost.Api.Client.Common.csproj b/Digipost.Api.Client.Common/Digipost.Api.Client.Common.csproj
@@ -12,7 +12,6 @@
    <ItemGroup>
         <PackageReference Include="Digipost.Api.Client.Shared" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
-        <PackageReference Include="NLog.Extensions.Logging" />
         <PackageReference Include="System.ComponentModel.Annotations" />
         <ProjectReference Include="..\Digipost.Api.Client.Resources\Digipost.Api.Client.Resources.csproj"/>
     </ItemGroup>

diff --git a/Digipost.Api.Client.Common/nlog.config b/Digipost.Api.Client.Common/nlog.config
diff --git a/Digipost.Api.Client.Inbox.Tests/Digipost.Api.Client.Inbox.Tests.csproj b/Digipost.Api.Client.Inbox.Tests/Digipost.Api.Client.Inbox.Tests.csproj
@@ -17,7 +17,6 @@
         <ProjectReference Include="..\Digipost.Api.Client.Resources\Digipost.Api.Client.Resources.csproj" />
         <ProjectReference Include="..\Digipost.Api.Client.Tests\Digipost.Api.Client.Tests.csproj" />
         <ProjectReference Include="..\Digipost.Api.Client\Digipost.Api.Client.csproj" />
-        <ProjectReference Include="..\Digipost.Api.Client.Shared.Tests\Digipost.Api.Client.Shared.Tests.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">

diff --git a/Digipost.Api.Client.Send.Tests/Digipost.Api.Client.Send.Tests.csproj b/Digipost.Api.Client.Send.Tests/Digipost.Api.Client.Send.Tests.csproj
@@ -16,6 +16,5 @@
         <ProjectReference Include="..\Digipost.Api.Client.Resources\Digipost.Api.Client.Resources.csproj" />
         <ProjectReference Include="..\Digipost.Api.Client.Send\Digipost.Api.Client.Send.csproj" />
         <ProjectReference Include="..\Digipost.Api.Client.Tests\Digipost.Api.Client.Tests.csproj" />
-        <ProjectReference Include="..\Digipost.Api.Client.Shared.Tests\Digipost.Api.Client.Shared.Tests.csproj" />
     </ItemGroup>
 </Project>
diff --git a/Digipost.Api.Client.Shared.Tests/Digipost.Api.Client.Shared.Tests.csproj b/Digipost.Api.Client.Shared.Tests/Digipost.Api.Client.Shared.Tests.csproj
@@ -7,7 +7,6 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
-        <PackageReference Include="NLog.Extensions.Logging" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     </ItemGroup>
 

diff --git a/Digipost.Api.Client.Tests/Digipost.Api.Client.Tests.csproj b/Digipost.Api.Client.Tests/Digipost.Api.Client.Tests.csproj
@@ -17,7 +17,6 @@
         <ProjectReference Include="..\Digipost.Api.Client.Resources\Digipost.Api.Client.Resources.csproj" />
         <ProjectReference Include="..\Digipost.Api.Client.Send\Digipost.Api.Client.Send.csproj" />
         <ProjectReference Include="..\Digipost.Api.Client\Digipost.Api.Client.csproj" />
-        <ProjectReference Include="..\Digipost.Api.Client.Shared.Tests\Digipost.Api.Client.Shared.Tests.csproj" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Digipost.Api.Client.Tests/Integration/DigipostApiIntegrationTests.cs b/Digipost.Api.Client.Tests/Integration/DigipostApiIntegrationTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Security.Cryptography.X509Certificates;
@@ -15,10 +14,8 @@
 using Digipost.Api.Client.Resources.Certificate;
 using Digipost.Api.Client.Resources.Xml;
 using Digipost.Api.Client.Send;
-using Digipost.Api.Client.Shared.Tests;
 using Digipost.Api.Client.Tests.Fakes;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 using Environment = Digipost.Api.Client.Common.Environment;
 
@@ -45,9 +42,8 @@ internal HttpClient GetHttpClient(
         FakeResponseHandler fakehandler)
     {
         ClientConfig.LogRequestAndResponse = true;
-        var serviceProvider = LoggingUtility.CreateServiceProviderAndSetUpLogging();
 
-        var allDelegationHandlers = new List<DelegatingHandler> { new AuthenticationHandler(ClientConfig, Certificate, serviceProvider.GetService<ILoggerFactory>()) };
+        var allDelegationHandlers = new List<DelegatingHandler> { new AuthenticationHandler(ClientConfig, Certificate, new NullLoggerFactory()) };
 
         var httpClient = HttpClientFactory.Create(
             fakehandler,
@@ -62,10 +58,8 @@ internal HttpClient GetHttpClient(
     SendMessageApi GetDigipostApi(FakeResponseHandler fakeResponseHandler)
     {
         var httpClient = GetHttpClient(fakeResponseHandler);
-
-        var serviceProvider = LoggingUtility.CreateServiceProviderAndSetUpLogging();
-
-        var requestHelper = new RequestHelper(httpClient, serviceProvider.GetService<ILoggerFactory>()) { HttpClient = httpClient };
+
+        var requestHelper = new RequestHelper(httpClient, new NullLoggerFactory()) { HttpClient = httpClient };
 
         var links = new Dictionary<string, Link>
         {
@@ -78,7 +72,7 @@ SendMessageApi GetDigipostApi(FakeResponseHandler fakeResponseHandler)
             Links = links
         };
 
-        var digipostApi = new SendMessageApi(new SendRequestHelper(requestHelper), serviceProvider.GetService<ILoggerFactory>(), root);
+        var digipostApi = new SendMessageApi(new SendRequestHelper(requestHelper), new NullLoggerFactory(), root);
         return digipostApi;
     }
 

diff --git a/digipost-api-client.sln b/digipost-api-client.sln
@@ -24,8 +24,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digipost.Api.Client.Send.Te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digipost.Api.Client.Tests", "Digipost.Api.Client.Tests\Digipost.Api.Client.Tests.csproj", "{966A701B-7E91-4C41-BA28-B5C5E800E63D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digipost.Api.Client.Shared.Tests", "Digipost.Api.Client.Shared.Tests\Digipost.Api.Client.Shared.Tests.csproj", "{A4322FAD-E7DB-4D2D-A1A8-2A7A893A2FAA}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -80,9 +78,5 @@ Global
 		{966A701B-7E91-4C41-BA28-B5C5E800E63D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{966A701B-7E91-4C41-BA28-B5C5E800E63D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{966A701B-7E91-4C41-BA28-B5C5E800E63D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4322FAD-E7DB-4D2D-A1A8-2A7A893A2FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4322FAD-E7DB-4D2D-A1A8-2A7A893A2FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4322FAD-E7DB-4D2D-A1A8-2A7A893A2FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4322FAD-E7DB-4D2D-A1A8-2A7A893A2FAA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal