CON-1721-fix build

SkillsFundingAgency · Apr 29, 2020 · ad5e819 · ad5e819
1 parent c40ac97
commit ad5e819
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/...DAS.EmployerAccounts.ReadStore.UnitTests/Commands/CreateAccountUserCommandHandlerTests.cs b/...DAS.EmployerAccounts.ReadStore.UnitTests/Commands/CreateAccountUserCommandHandlerTests.cs
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
-using NServiceBus.Logging;
 using NUnit.Framework;
 using SFA.DAS.CosmosDb.Testing;
 using SFA.DAS.EmployerAccounts.ReadStore.Application.Commands;
@@ -14,6 +13,7 @@
 using SFA.DAS.EmployerAccounts.Types.Models;
 using SFA.DAS.Testing;
 using SFA.DAS.Testing.Builders;
+using Microsoft.Extensions.Logging;
 
 namespace SFA.DAS.EmployerAccounts.ReadStore.UnitTests.Commands
 {
@@ -118,7 +118,7 @@ public CreateAccountUserCommandHandlerTestsFixture()
             UserRolesRepository = new Mock<IAccountUsersRepository>();
             UserRolesRepository.SetupInMemoryCollection(Users);
 
-            Handler = new CreateAccountUserCommandHandler(UserRolesRepository.Object, Mock.Of<ILog>());
+            Handler = new CreateAccountUserCommandHandler(UserRolesRepository.Object, Mock.Of<ILogger>());
 
             Command = new CreateAccountUserCommand(AccountId, UserRef, NewRole, MessageId, Created);
         }

diff --git a/...FA.DAS.EmployerAccounts.ReadStore/Application/Commands/CreateAccountUserCommandHandler.cs b/...FA.DAS.EmployerAccounts.ReadStore/Application/Commands/CreateAccountUserCommandHandler.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
-using NServiceBus.Logging;
+using Microsoft.Extensions.Logging;
 using SFA.DAS.CosmosDb;
 using SFA.DAS.EmployerAccounts.ReadStore.Data;
 using SFA.DAS.EmployerAccounts.ReadStore.Exceptions;
@@ -13,9 +12,9 @@ namespace SFA.DAS.EmployerAccounts.ReadStore.Application.Commands
     internal class CreateAccountUserCommandHandler : IReadStoreRequestHandler<CreateAccountUserCommand, Unit>
     {
         private readonly IAccountUsersRepository _accountUsersRepository;
-        private readonly ILog _logger;
+        private readonly ILogger _logger;
 
-        public CreateAccountUserCommandHandler(IAccountUsersRepository accountUsersRepository, ILog logger)
+        public CreateAccountUserCommandHandler(IAccountUsersRepository accountUsersRepository, ILogger logger)
         {
             _accountUsersRepository = accountUsersRepository;
             _logger = logger;
@@ -40,7 +39,7 @@ public async Task<Unit> Handle(CreateAccountUserCommand request, CancellationTok
             }
             catch (UserNotRemovedException exception)
             {
-                _logger.Warn("User has not been removed",exception);
+                _logger.LogWarning("User has not been removed", exception);
             }
             return Unit.Value;
         }

diff --git a/...ts.ReadStore/SFA.DAS.EmployerAccounts.ReadStore/SFA.DAS.EmployerAccounts.ReadStore.csproj b/...ts.ReadStore/SFA.DAS.EmployerAccounts.ReadStore/SFA.DAS.EmployerAccounts.ReadStore.csproj
@@ -16,6 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19270-01" PrivateAssets="All" />
     <PackageReference Include="SFA.DAS.CosmosDb" Version="1.0.47" />
     <PackageReference Include="StructureMap" Version="4.6.1" />
@@ -52,11 +53,4 @@
       <_Parameter1>SFA.DAS.EmployerAccounts.MessageHandlers.UnitTests</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="NServiceBus.Core">
-      <HintPath>..\..\..\..\..\..\..\Users\Shoma.Gujjar\.nuget\packages\nservicebus\7.0.1\lib\net452\NServiceBus.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-</Project>
+ </Project>