Skip to content

merge develop -> main #38

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

Closed
samgibsonmoj wants to merge 6 commits into from
Closed

merge develop -> main #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7325672
Add unit/integrations tests (#30)
samgibsonmoj Nov 27, 2025
2a12933
Use defined en-GB format for date parsing (#32)
samgibsonmoj Nov 27, 2025
845753e
GitHub PR - test workflow (#31)
samgibsonmoj Nov 27, 2025
ec105d5
Improve run-tests.yml performance: only restore/build required projec…
samgibsonmoj Nov 27, 2025
4c30e41
Adds additional integration/unit tests (#34)
samgibsonmoj Nov 27, 2025
b1b98a5
Add workflow-dispatch to build-artifacts.yml workflow (#37)
samgibsonmoj Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- develop
- main
workflow_dispatch:

jobs:
deploy:
Expand Down
61 changes: 61 additions & 0 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Run Tests

on:
pull_request:
branches:
- main
- develop

jobs:
test-linux:
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/dotnet/sdk:10.0
steps:
- uses: actions/checkout@v5

- name: Restore Dependencies (ubuntu)
run: |
for project in tests/**/*.csproj; do
dotnet restore "$project"
done

- name: Build (ubuntu)
run: |
for project in tests/**/*.csproj; do
dotnet build "$project" --configuration Release --no-restore
done

- name: Test (ubuntu)
run: |
for project in tests/**/*.csproj; do
dotnet test "$project" --configuration Release --no-build
done

test-windows:
runs-on: windows-2022
steps:
- uses: actions/checkout@v5

- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: 10.0.x

- name: Restore Dependencies (windows)
run: |
Get-ChildItem -Path tests -Filter *.csproj -Recurse | ForEach-Object {
dotnet restore $_.FullName
}

- name: Build (windows)
run: |
Get-ChildItem -Path tests -Filter *.csproj -Recurse | ForEach-Object {
dotnet build $_.FullName --configuration Release --no-restore
}

- name: Test (windows)
run: |
Get-ChildItem -Path tests -Filter *.csproj -Recurse | ForEach-Object {
dotnet test $_.FullName --configuration Release --no-build
}
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
Expand Down
110 changes: 95 additions & 15 deletions dms.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ Project("{42EA0DBD-9CF1-443E-919E-BE9C484E4577}") = "OfflocRunningPictureDb", "s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "API", "src\API\API.csproj", "{EBFD06D5-A7B3-48B7-8646-3155538BC867}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api.Tests", "tests\Api.Tests\Api.Tests.csproj", "{A4247B60-97A2-4D5A-AE97-53E3D497675A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.AppHost", "src\Aspire\Aspire.AppHost\Aspire.AppHost.csproj", "{F00FE6A0-A6B1-4877-B988-69690D11066B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.ServiceDefaults", "src\Aspire\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{257BF0CC-7E4B-44EF-A01D-54BD003EE089}"
Expand All @@ -86,6 +84,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeDataSeeder", "src\FakeD
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileSync", "src\FileSync\FileSync.csproj", "{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api.Tests", "tests\Api.Tests\Api.Tests.csproj", "{6376162B-BD8C-4FDF-A68C-2409C0227867}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Matching.Engine.Tests", "tests\Matching.Engine.Tests\Matching.Engine.Tests.csproj", "{1F0C2D67-F895-4E73-952D-C7EEE59E403B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{B9D0FD61-3B03-4F77-C813-744B40F67260}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileSync.Tests", "tests\FileSync.Tests\FileSync.Tests.csproj", "{877124DB-D37E-4C2C-A01A-03B76DA6AF56}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Offloc.Parser.Tests", "tests\Offloc.Parser.Tests\Offloc.Parser.Tests.csproj", "{10A645A2-039D-4906-BCB7-DBE12B0EF34D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Offloc.Cleaner.Tests", "tests\Offloc.Cleaner.Tests\Offloc.Cleaner.Tests.csproj", "{199066EA-192B-4126-A1BC-85900CDCA1DD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Delius.Parser.Tests", "tests\Delius.Parser.Tests\Delius.Parser.Tests.csproj", "{841B9B78-5596-46EF-B38D-0E1C18321CDF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -360,18 +374,6 @@ Global
{EBFD06D5-A7B3-48B7-8646-3155538BC867}.Release|x64.Build.0 = Release|Any CPU
{EBFD06D5-A7B3-48B7-8646-3155538BC867}.Release|x86.ActiveCfg = Release|Any CPU
{EBFD06D5-A7B3-48B7-8646-3155538BC867}.Release|x86.Build.0 = Release|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|x64.ActiveCfg = Debug|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|x64.Build.0 = Debug|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|x86.ActiveCfg = Debug|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Debug|x86.Build.0 = Debug|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|Any CPU.Build.0 = Release|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|x64.ActiveCfg = Release|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|x64.Build.0 = Release|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|x86.ActiveCfg = Release|Any CPU
{A4247B60-97A2-4D5A-AE97-53E3D497675A}.Release|x86.Build.0 = Release|Any CPU
{F00FE6A0-A6B1-4877-B988-69690D11066B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F00FE6A0-A6B1-4877-B988-69690D11066B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F00FE6A0-A6B1-4877-B988-69690D11066B}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -474,6 +476,78 @@ Global
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Release|x64.Build.0 = Release|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Release|x86.ActiveCfg = Release|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Release|x86.Build.0 = Release|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|x64.ActiveCfg = Debug|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|x64.Build.0 = Debug|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|x86.ActiveCfg = Debug|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Debug|x86.Build.0 = Debug|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|Any CPU.Build.0 = Release|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|x64.ActiveCfg = Release|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|x64.Build.0 = Release|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|x86.ActiveCfg = Release|Any CPU
{6376162B-BD8C-4FDF-A68C-2409C0227867}.Release|x86.Build.0 = Release|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|x64.ActiveCfg = Debug|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|x64.Build.0 = Debug|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|x86.ActiveCfg = Debug|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Debug|x86.Build.0 = Debug|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|Any CPU.Build.0 = Release|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|x64.ActiveCfg = Release|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|x64.Build.0 = Release|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|x86.ActiveCfg = Release|Any CPU
{1F0C2D67-F895-4E73-952D-C7EEE59E403B}.Release|x86.Build.0 = Release|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|Any CPU.Build.0 = Debug|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|x64.ActiveCfg = Debug|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|x64.Build.0 = Debug|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|x86.ActiveCfg = Debug|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Debug|x86.Build.0 = Debug|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|Any CPU.ActiveCfg = Release|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|Any CPU.Build.0 = Release|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|x64.ActiveCfg = Release|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|x64.Build.0 = Release|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|x86.ActiveCfg = Release|Any CPU
{877124DB-D37E-4C2C-A01A-03B76DA6AF56}.Release|x86.Build.0 = Release|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|x64.ActiveCfg = Debug|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|x64.Build.0 = Debug|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|x86.ActiveCfg = Debug|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Debug|x86.Build.0 = Debug|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|Any CPU.Build.0 = Release|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|x64.ActiveCfg = Release|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|x64.Build.0 = Release|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|x86.ActiveCfg = Release|Any CPU
{10A645A2-039D-4906-BCB7-DBE12B0EF34D}.Release|x86.Build.0 = Release|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|x64.ActiveCfg = Debug|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|x64.Build.0 = Debug|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|x86.ActiveCfg = Debug|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Debug|x86.Build.0 = Debug|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|Any CPU.Build.0 = Release|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|x64.ActiveCfg = Release|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|x64.Build.0 = Release|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|x86.ActiveCfg = Release|Any CPU
{199066EA-192B-4126-A1BC-85900CDCA1DD}.Release|x86.Build.0 = Release|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|x64.ActiveCfg = Debug|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|x64.Build.0 = Debug|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|x86.ActiveCfg = Debug|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Debug|x86.Build.0 = Debug|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|Any CPU.Build.0 = Release|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|x64.ActiveCfg = Release|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|x64.Build.0 = Release|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|x86.ActiveCfg = Release|Any CPU
{841B9B78-5596-46EF-B38D-0E1C18321CDF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -504,7 +578,6 @@ Global
{F9C6ADBE-15FB-409E-BFED-A48EEBF393A7} = {8242D833-6E75-4EAA-9EB1-57B7EC128354}
{A1A8A7ED-D3D2-4916-866A-9AEB510840AC} = {8242D833-6E75-4EAA-9EB1-57B7EC128354}
{EBFD06D5-A7B3-48B7-8646-3155538BC867} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
{A4247B60-97A2-4D5A-AE97-53E3D497675A} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
{F00FE6A0-A6B1-4877-B988-69690D11066B} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
{257BF0CC-7E4B-44EF-A01D-54BD003EE089} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
{F300A5B2-A029-F04C-F6BB-AD41877264E3} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
Expand All @@ -513,6 +586,13 @@ Global
{22A80A04-1AC5-46F1-BE57-DE9B1456B34E} = {8242D833-6E75-4EAA-9EB1-57B7EC128354}
{F7F37423-FFBD-4093-AC69-E1D38B208998} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
{6376162B-BD8C-4FDF-A68C-2409C0227867} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
{1F0C2D67-F895-4E73-952D-C7EEE59E403B} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
{B9D0FD61-3B03-4F77-C813-744B40F67260} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
{877124DB-D37E-4C2C-A01A-03B76DA6AF56} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
{10A645A2-039D-4906-BCB7-DBE12B0EF34D} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
{199066EA-192B-4126-A1BC-85900CDCA1DD} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
{841B9B78-5596-46EF-B38D-0E1C18321CDF} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {39E62751-A441-4DEF-AD24-20CDC6D59FF3}
Expand Down
4 changes: 2 additions & 2 deletions src/Delius.Parser/ParserConfig/Models/Field.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public string Parse(string text)
else
{
var date = ParseDatetime(d);
return date.ToString();
return date.ToString(cultureInfo);
}
case FieldType.ShortDate:
string sd = text.Substring(StartingPoint, Length).Replace("~", "");
Expand All @@ -55,7 +55,7 @@ public string Parse(string text)
else
{
var date = ParseDate(sd);
return date.ToString();
return date.ToString(cultureInfo);
}
}
throw new ApplicationException("Unknown field type: " + Type);
Expand Down
Loading
Loading