Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PV2-3110 #1176

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

PV2-3110 #1176

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c4752d
Model.Core & Model.Core.UnitTests
owencampbell Dec 17, 2023
5af5a9c
Messages.Common
owencampbell Dec 17, 2023
810364b
Messaging
owencampbell Dec 17, 2023
f3997a7
Payments.Core
owencampbell Dec 17, 2023
4415699
Payments.Application
owencampbell Dec 17, 2023
6ee4455
Updated all Common packages
owencampbell Dec 20, 2023
9dfd4be
All projects updated with latest Common nuget deployments (Full Release)
owencampbell Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions ...s.AcceptanceTests.Components.Core/SFA.DAS.Payments.AcceptanceTests.Components.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
Expand Down
59 changes: 59 additions & 0 deletions src/SFA.DAS.Payments.AcceptanceTests.Components.Core/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.3.2.0" newVersion="9.3.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Azure.ServiceBus" publicKeyToken="7e34167dcc6d6d8c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.2.1.0" newVersion="3.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.1" newVersion="4.0.3.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.19.8.16603" newVersion="3.19.8.16603" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Azure.Services.AppAuthentication" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.3.0" newVersion="1.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.19.8.16603" newVersion="3.19.8.16603" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.ApplicationInsights" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.8.1.0" newVersion="2.8.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion src/SFA.DAS.Payments.AcceptanceTests.Core/Infrastructure/BindingBootstrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
using SFA.DAS.Payments.AcceptanceTests.Services.BespokeHttpClient;
using SFA.DAS.Payments.AcceptanceTests.Services.Configuration;
using SFA.DAS.Payments.AcceptanceTests.Services.Intefaces;
using SFA.DAS.Payments.Messages.Core;
using SFA.DAS.Payments.Messages.Common;
using SFA.DAS.Payments.Monitoring.Jobs.Client;
using TechTalk.SpecFlow;

Expand Down
35 changes: 19 additions & 16 deletions src/SFA.DAS.Payments.AcceptanceTests.Core/SFA.DAS.Payments.AcceptanceTests.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@
<Reference Include="ESFA.DC.Serialization.Json, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ESFA.DC.Serialization.Json.0.1.6-beta0001\lib\netstandard2.0\ESFA.DC.Serialization.Json.dll</HintPath>
</Reference>
<Reference Include="FastMember, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FastMember.1.4.1\lib\net461\FastMember.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationInsights, Version=2.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.ApplicationInsights.2.8.1\lib\net46\Microsoft.ApplicationInsights.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -251,6 +254,9 @@
<Reference Include="Serilog.Enrichers.Thread, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
</Reference>
<Reference Include="Serilog.Sinks.ApplicationInsights, Version=2.6.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Sinks.ApplicationInsights.2.6.0\lib\net45\Serilog.Sinks.ApplicationInsights.dll</HintPath>
</Reference>
<Reference Include="Serilog.Sinks.Console, Version=3.1.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Sinks.Console.3.1.1\lib\net45\Serilog.Sinks.Console.dll</HintPath>
</Reference>
Expand All @@ -260,6 +266,18 @@
<Reference Include="Serilog.Sinks.PeriodicBatching, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Sinks.PeriodicBatching.2.1.1\lib\net45\Serilog.Sinks.PeriodicBatching.dll</HintPath>
</Reference>
<Reference Include="SFA.DAS.Payments.Application, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.Payments.Application.2.1.2-CI-20231220-111647\lib\netstandard2.0\SFA.DAS.Payments.Application.dll</HintPath>
</Reference>
<Reference Include="SFA.DAS.Payments.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.Payments.Core.2.1.2-CI-20231220-111647\lib\netstandard2.0\SFA.DAS.Payments.Core.dll</HintPath>
</Reference>
<Reference Include="SFA.DAS.Payments.Messages.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.Payments.Messages.Common.2.1.2-CI-20231220-111647\lib\netstandard2.0\SFA.DAS.Payments.Messages.Common.dll</HintPath>
</Reference>
<Reference Include="SFA.DAS.Payments.Model.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SFA.DAS.Payments.Model.Core.2.1.2-CI-20231220-111647\lib\netstandard2.0\SFA.DAS.Payments.Model.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
Expand Down Expand Up @@ -423,6 +441,7 @@
<Compile Include="Services\UkprnService.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
Expand All @@ -432,14 +451,6 @@
<Project>{C367DA42-6ED6-4028-B754-F39148F5D2C8}</Project>
<Name>SFA.DAS.Payments.AcceptanceTests.Services</Name>
</ProjectReference>
<ProjectReference Include="..\SFA.DAS.Payments.Application\SFA.DAS.Payments.Application.csproj">
<Project>{23551CD8-7554-4F2C-9B42-A67B9E0C261D}</Project>
<Name>SFA.DAS.Payments.Application</Name>
</ProjectReference>
<ProjectReference Include="..\SFA.DAS.Payments.Core\SFA.DAS.Payments.Core.csproj">
<Project>{F6E38368-C397-488B-B041-D3E8423C1CE1}</Project>
<Name>SFA.DAS.Payments.Core</Name>
</ProjectReference>
<ProjectReference Include="..\SFA.DAS.Payments.EarningEvents.Messages.Internal\SFA.DAS.Payments.EarningEvents.Messages.Internal.csproj">
<Project>{B5FF4D1A-925D-4979-9363-4C8298C483B8}</Project>
<Name>SFA.DAS.Payments.EarningEvents.Messages.Internal</Name>
Expand All @@ -448,14 +459,6 @@
<Project>{95F83345-7AD6-477C-A271-3C7F8CA0529B}</Project>
<Name>SFA.DAS.Payments.FundingSource.Messages.Internal</Name>
</ProjectReference>
<ProjectReference Include="..\SFA.DAS.Payments.Messages.Core\SFA.DAS.Payments.Messages.Core.csproj">
<Project>{678E5D09-C96D-49CC-811F-78DDCB37A474}</Project>
<Name>SFA.DAS.Payments.Messages.Core</Name>
</ProjectReference>
<ProjectReference Include="..\SFA.DAS.Payments.Model.Core\SFA.DAS.Payments.Model.Core.csproj">
<Project>{fafc16fb-316e-4c83-9f35-d0d36ddccaf7}</Project>
<Name>SFA.DAS.Payments.Model.Core</Name>
</ProjectReference>
<ProjectReference Include="..\SFA.DAS.Payments.Monitoring.Jobs.Client\SFA.DAS.Payments.Monitoring.Jobs.Client.csproj">
<Project>{66B42B94-B29B-48EA-9AB6-C96C11C1D9CE}</Project>
<Name>SFA.DAS.Payments.Monitoring.Jobs.Client</Name>
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.Payments.AcceptanceTests.Core/StepsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Linq;
using System.Threading.Tasks;
using Autofac;
using SFA.DAS.Payments.Messages.Core.Events;
using SFA.DAS.Payments.Messages.Common.Events;
using SFA.DAS.Payments.Model.Core.Entities;
using SFA.DAS.Payments.Monitoring.Jobs.Data;
using SFA.DAS.Payments.Monitoring.Jobs.Messages.Commands;
Expand Down
59 changes: 59 additions & 0 deletions src/SFA.DAS.Payments.AcceptanceTests.Core/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.3.2.0" newVersion="9.3.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Azure.ServiceBus" publicKeyToken="7e34167dcc6d6d8c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.2.1.0" newVersion="3.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.1" newVersion="4.0.3.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.19.8.16603" newVersion="3.19.8.16603" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Azure.Services.AppAuthentication" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.3.0" newVersion="1.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.19.8.16603" newVersion="3.19.8.16603" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.ApplicationInsights" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.8.1.0" newVersion="2.8.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
8 changes: 8 additions & 0 deletions src/SFA.DAS.Payments.AcceptanceTests.Core/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<package id="ESFA.DC.Queueing.Interface" version="0.1.14-beta0001" targetFramework="net471" />
<package id="ESFA.DC.Serialization.Interfaces" version="0.1.6-beta0001" targetFramework="net471" />
<package id="ESFA.DC.Serialization.Json" version="0.1.6-beta0001" targetFramework="net471" />
<package id="FastMember" version="1.4.1" targetFramework="net471" />
<package id="Microsoft.ApplicationInsights" version="2.8.1" targetFramework="net471" />
<package id="Microsoft.Azure.Amqp" version="2.3.7" targetFramework="net471" />
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net471" />
Expand Down Expand Up @@ -57,16 +58,22 @@
<package id="NServiceBus.Callbacks" version="3.0.0" targetFramework="net471" />
<package id="NServiceBus.Newtonsoft.Json" version="2.1.0" targetFramework="net471" />
<package id="NServiceBus.Persistence.AzureStorage" version="2.2.0" targetFramework="net471" />
<package id="NServiceBus.Transport.AzureServiceBus" version="1.0.0" targetFramework="net471" />
<package id="NUnit" version="3.11.0" targetFramework="net471" />
<package id="Polly" version="6.1.2" targetFramework="net471" />
<package id="Remotion.Linq" version="2.2.0" targetFramework="net471" />
<package id="Serilog" version="2.6.0" targetFramework="net471" />
<package id="Serilog.Enrichers.Environment" version="2.1.2" targetFramework="net471" />
<package id="Serilog.Enrichers.Process" version="2.0.1" targetFramework="net471" />
<package id="Serilog.Enrichers.Thread" version="3.0.0" targetFramework="net471" />
<package id="Serilog.Sinks.ApplicationInsights" version="2.6.0" targetFramework="net471" />
<package id="Serilog.Sinks.Console" version="3.1.1" targetFramework="net471" />
<package id="Serilog.Sinks.MSSqlServer" version="5.1.1" targetFramework="net471" />
<package id="Serilog.Sinks.PeriodicBatching" version="2.1.1" targetFramework="net471" />
<package id="SFA.DAS.Payments.Application" version="2.1.2-CI-20231220-111647" targetFramework="net471" />
<package id="SFA.DAS.Payments.Core" version="2.1.2-CI-20231220-111647" targetFramework="net471" />
<package id="SFA.DAS.Payments.Messages.Common" version="2.1.2-CI-20231220-111647" targetFramework="net471" />
<package id="SFA.DAS.Payments.Model.Core" version="2.1.2-CI-20231220-111647" targetFramework="net471" />
<package id="SpecFlow" version="2.4.1" targetFramework="net471" />
<package id="System.Buffers" version="4.4.0" targetFramework="net471" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net471" />
Expand All @@ -87,6 +94,7 @@
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net471" />
<package id="System.Runtime" version="4.1.0" targetFramework="net471" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net471" />
<package id="System.Runtime.Loader" version="4.3.0" targetFramework="net471" />
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net471" />
<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net471" />
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net471" />
Expand Down
Loading