Skip to content

Commit d434537

Browse files
carlsixsmith-mojcarlsixsmith-moj
authored
Merge pull request #35 from ministryofjustice/develop
Merge develop
2 parents 294dc7e + 4c30e41 commit d434537

36 files changed

+6888
-17
lines changed

‎.github/workflows/run-tests.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Run Tests
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- develop
8+
9+
jobs:
10+
test-linux:
11+
runs-on: ubuntu-latest
12+
container:
13+
image: mcr.microsoft.com/dotnet/sdk:10.0
14+
steps:
15+
- uses: actions/checkout@v5
16+
17+
- name: Restore Dependencies (ubuntu)
18+
run: |
19+
for project in tests/**/*.csproj; do
20+
dotnet restore "$project"
21+
done
22+
23+
- name: Build (ubuntu)
24+
run: |
25+
for project in tests/**/*.csproj; do
26+
dotnet build "$project" --configuration Release --no-restore
27+
done
28+
29+
- name: Test (ubuntu)
30+
run: |
31+
for project in tests/**/*.csproj; do
32+
dotnet test "$project" --configuration Release --no-build
33+
done
34+
35+
test-windows:
36+
runs-on: windows-2022
37+
steps:
38+
- uses: actions/checkout@v5
39+
40+
- name: Setup .NET
41+
uses: actions/setup-dotnet@v5
42+
with:
43+
dotnet-version: 10.0.x
44+
45+
- name: Restore Dependencies (windows)
46+
run: |
47+
Get-ChildItem -Path tests -Filter *.csproj -Recurse | ForEach-Object {
48+
dotnet restore $_.FullName
49+
}
50+
51+
- name: Build (windows)
52+
run: |
53+
Get-ChildItem -Path tests -Filter *.csproj -Recurse | ForEach-Object {
54+
dotnet build $_.FullName --configuration Release --no-restore
55+
}
56+
57+
- name: Test (windows)
58+
run: |
59+
Get-ChildItem -Path tests -Filter *.csproj -Recurse | ForEach-Object {
60+
dotnet test $_.FullName --configuration Release --no-build
61+
}

‎Directory.Packages.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3535
</PackageVersion>
36+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
3637
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
3738
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
3839
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />

‎dms.sln‎

Lines changed: 95 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ Project("{42EA0DBD-9CF1-443E-919E-BE9C484E4577}") = "OfflocRunningPictureDb", "s
6868
EndProject
6969
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "API", "src\API\API.csproj", "{EBFD06D5-A7B3-48B7-8646-3155538BC867}"
7070
EndProject
71-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api.Tests", "tests\Api.Tests\Api.Tests.csproj", "{A4247B60-97A2-4D5A-AE97-53E3D497675A}"
72-
EndProject
7371
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.AppHost", "src\Aspire\Aspire.AppHost\Aspire.AppHost.csproj", "{F00FE6A0-A6B1-4877-B988-69690D11066B}"
7472
EndProject
7573
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.ServiceDefaults", "src\Aspire\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{257BF0CC-7E4B-44EF-A01D-54BD003EE089}"
@@ -86,6 +84,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeDataSeeder", "src\FakeD
8684
EndProject
8785
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileSync", "src\FileSync\FileSync.csproj", "{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}"
8886
EndProject
87+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}"
88+
EndProject
89+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api.Tests", "tests\Api.Tests\Api.Tests.csproj", "{6376162B-BD8C-4FDF-A68C-2409C0227867}"
90+
EndProject
91+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Matching.Engine.Tests", "tests\Matching.Engine.Tests\Matching.Engine.Tests.csproj", "{1F0C2D67-F895-4E73-952D-C7EEE59E403B}"
92+
EndProject
93+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{B9D0FD61-3B03-4F77-C813-744B40F67260}"
94+
EndProject
95+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileSync.Tests", "tests\FileSync.Tests\FileSync.Tests.csproj", "{877124DB-D37E-4C2C-A01A-03B76DA6AF56}"
96+
EndProject
97+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Offloc.Parser.Tests", "tests\Offloc.Parser.Tests\Offloc.Parser.Tests.csproj", "{10A645A2-039D-4906-BCB7-DBE12B0EF34D}"
98+
EndProject
99+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Offloc.Cleaner.Tests", "tests\Offloc.Cleaner.Tests\Offloc.Cleaner.Tests.csproj", "{199066EA-192B-4126-A1BC-85900CDCA1DD}"
100+
EndProject
101+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Delius.Parser.Tests", "tests\Delius.Parser.Tests\Delius.Parser.Tests.csproj", "{841B9B78-5596-46EF-B38D-0E1C18321CDF}"
102+
EndProject
89103
Global
90104
GlobalSection(SolutionConfigurationPlatforms) = preSolution
91105
Debug|Any CPU = Debug|Any CPU
@@ -360,18 +374,6 @@ Global
360374
{EBFD06D5-A7B3-48B7-8646-3155538BC867}.Release|x64.Build.0 = Release|Any CPU
361375
{EBFD06D5-A7B3-48B7-8646-3155538BC867}.Release|x86.ActiveCfg = Release|Any CPU
362376
{EBFD06D5-A7B3-48B7-8646-3155538BC867}.Release|x86.Build.0 = Release|Any CPU
363-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
364-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|Any CPU.Build.0 = Debug|Any CPU
365-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|x64.ActiveCfg = Debug|Any CPU
366-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|x64.Build.0 = Debug|Any CPU
367-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|x86.ActiveCfg = Debug|Any CPU
368-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|x86.Build.0 = Debug|Any CPU
369-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|Any CPU.ActiveCfg = Release|Any CPU
370-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|Any CPU.Build.0 = Release|Any CPU
371-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|x64.ActiveCfg = Release|Any CPU
372-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|x64.Build.0 = Release|Any CPU
373-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|x86.ActiveCfg = Release|Any CPU
374-
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|x86.Build.0 = Release|Any CPU
375377
{F00FE6A0-A6B1-4877-B988-69690D11066B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
376378
{F00FE6A0-A6B1-4877-B988-69690D11066B}.Debug|Any CPU.Build.0 = Debug|Any CPU
377379
{F00FE6A0-A6B1-4877-B988-69690D11066B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -474,6 +476,78 @@ Global
474476
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Release|x64.Build.0 = Release|Any CPU
475477
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Release|x86.ActiveCfg = Release|Any CPU
476478
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Release|x86.Build.0 = Release|Any CPU
479+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
480+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|Any CPU.Build.0 = Debug|Any CPU
481+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|x64.ActiveCfg = Debug|Any CPU
482+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|x64.Build.0 = Debug|Any CPU
483+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|x86.ActiveCfg = Debug|Any CPU
484+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|x86.Build.0 = Debug|Any CPU
485+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|Any CPU.ActiveCfg = Release|Any CPU
486+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|Any CPU.Build.0 = Release|Any CPU
487+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|x64.ActiveCfg = Release|Any CPU
488+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|x64.Build.0 = Release|Any CPU
489+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|x86.ActiveCfg = Release|Any CPU
490+
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|x86.Build.0 = Release|Any CPU
491+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
492+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|Any CPU.Build.0 = Debug|Any CPU
493+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|x64.ActiveCfg = Debug|Any CPU
494+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|x64.Build.0 = Debug|Any CPU
495+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|x86.ActiveCfg = Debug|Any CPU
496+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|x86.Build.0 = Debug|Any CPU
497+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|Any CPU.ActiveCfg = Release|Any CPU
498+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|Any CPU.Build.0 = Release|Any CPU
499+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|x64.ActiveCfg = Release|Any CPU
500+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|x64.Build.0 = Release|Any CPU
501+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|x86.ActiveCfg = Release|Any CPU
502+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|x86.Build.0 = Release|Any CPU
503+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
504+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|Any CPU.Build.0 = Debug|Any CPU
505+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|x64.ActiveCfg = Debug|Any CPU
506+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|x64.Build.0 = Debug|Any CPU
507+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|x86.ActiveCfg = Debug|Any CPU
508+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|x86.Build.0 = Debug|Any CPU
509+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|Any CPU.ActiveCfg = Release|Any CPU
510+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|Any CPU.Build.0 = Release|Any CPU
511+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|x64.ActiveCfg = Release|Any CPU
512+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|x64.Build.0 = Release|Any CPU
513+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|x86.ActiveCfg = Release|Any CPU
514+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|x86.Build.0 = Release|Any CPU
515+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
516+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|Any CPU.Build.0 = Debug|Any CPU
517+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|x64.ActiveCfg = Debug|Any CPU
518+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|x64.Build.0 = Debug|Any CPU
519+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|x86.ActiveCfg = Debug|Any CPU
520+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|x86.Build.0 = Debug|Any CPU
521+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|Any CPU.ActiveCfg = Release|Any CPU
522+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|Any CPU.Build.0 = Release|Any CPU
523+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|x64.ActiveCfg = Release|Any CPU
524+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|x64.Build.0 = Release|Any CPU
525+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|x86.ActiveCfg = Release|Any CPU
526+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|x86.Build.0 = Release|Any CPU
527+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
528+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
529+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|x64.ActiveCfg = Debug|Any CPU
530+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|x64.Build.0 = Debug|Any CPU
531+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|x86.ActiveCfg = Debug|Any CPU
532+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|x86.Build.0 = Debug|Any CPU
533+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
534+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|Any CPU.Build.0 = Release|Any CPU
535+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|x64.ActiveCfg = Release|Any CPU
536+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|x64.Build.0 = Release|Any CPU
537+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|x86.ActiveCfg = Release|Any CPU
538+
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|x86.Build.0 = Release|Any CPU
539+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
540+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
541+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|x64.ActiveCfg = Debug|Any CPU
542+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|x64.Build.0 = Debug|Any CPU
543+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|x86.ActiveCfg = Debug|Any CPU
544+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|x86.Build.0 = Debug|Any CPU
545+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
546+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|Any CPU.Build.0 = Release|Any CPU
547+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|x64.ActiveCfg = Release|Any CPU
548+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|x64.Build.0 = Release|Any CPU
549+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|x86.ActiveCfg = Release|Any CPU
550+
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|x86.Build.0 = Release|Any CPU
477551
EndGlobalSection
478552
GlobalSection(SolutionProperties) = preSolution
479553
HideSolutionNode = FALSE
@@ -504,7 +578,6 @@ Global
504578
{F9C6ADBE-15FB-409E-BFED-A48EEBF393A7} = {8242D833-6E75-4EAA-9EB1-57B7EC128354}
505579
{A1A8A7ED-D3D2-4916-866A-9AEB510840AC} = {8242D833-6E75-4EAA-9EB1-57B7EC128354}
506580
{EBFD06D5-A7B3-48B7-8646-3155538BC867} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
507-
{A4247B60-97A2-4D5A-AE97-53E3D497675A} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
508581
{F00FE6A0-A6B1-4877-B988-69690D11066B} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
509582
{257BF0CC-7E4B-44EF-A01D-54BD003EE089} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
510583
{F300A5B2-A029-F04C-F6BB-AD41877264E3} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
@@ -513,6 +586,13 @@ Global
513586
{22A80A04-1AC5-46F1-BE57-DE9B1456B34E} = {8242D833-6E75-4EAA-9EB1-57B7EC128354}
514587
{F7F37423-FFBD-4093-AC69-E1D38B208998} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
515588
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
589+
{6376162B-BD8C-4FDF-A68C-2409C0227867} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
590+
{1F0C2D67-F895-4E73-952D-C7EEE59E403B} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
591+
{B9D0FD61-3B03-4F77-C813-744B40F67260} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
592+
{877124DB-D37E-4C2C-A01A-03B76DA6AF56} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
593+
{10A645A2-039D-4906-BCB7-DBE12B0EF34D} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
594+
{199066EA-192B-4126-A1BC-85900CDCA1DD} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
595+
{841B9B78-5596-46EF-B38D-0E1C18321CDF} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
516596
EndGlobalSection
517597
GlobalSection(ExtensibilityGlobals) = postSolution
518598
SolutionGuid = {39E62751-A441-4DEF-AD24-20CDC6D59FF3}

‎src/Delius.Parser/ParserConfig/Models/Field.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public string Parse(string text)
4444
else
4545
{
4646
var date = ParseDatetime(d);
47-
return date.ToString();
47+
return date.ToString(cultureInfo);
4848
}
4949
case FieldType.ShortDate:
5050
string sd = text.Substring(StartingPoint, Length).Replace("~", "");
@@ -55,7 +55,7 @@ public string Parse(string text)
5555
else
5656
{
5757
var date = ParseDate(sd);
58-
return date.ToString();
58+
return date.ToString(cultureInfo);
5959
}
6060
}
6161
throw new ApplicationException("Unknown field type: " + Type);

0 commit comments

Comments
 (0)