Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c33b9c0
WIP: S3 File Sync
samgibsonmoj Nov 5, 2025
5754e17
Remove FileStorage project. Move interface into environment setup
samgibsonmoj Nov 5, 2025
203ae85
Remove redundant if statement
samgibsonmoj Nov 5, 2025
760e430
Enforce patterns for file searches
samgibsonmoj Nov 5, 2025
fe69e14
Removes redundant docker file processing service
samgibsonmoj Nov 5, 2025
52011e7
Cleanup + implementation of S3FileSource service
samgibsonmoj Nov 6, 2025
99dfd9f
Removes Parallel parsing (and other related redundant code) + hooks i…
samgibsonmoj Nov 6, 2025
5ca68c3
Fix for Delius post-parser encoding and line endings
samgibsonmoj Nov 11, 2025
8f777b5
MinIO integration
samgibsonmoj Nov 11, 2025
5541577
Bump packages (excludes Aspire)
samgibsonmoj Nov 11, 2025
4a66f27
Enables S3 file synchronization and processing
samgibsonmoj Nov 19, 2025
350e1fc
Configures dotnet environment
samgibsonmoj Nov 19, 2025
d0ab45c
Configures and initialises MinIO bucket
samgibsonmoj Nov 19, 2025
5465f18
Clarifies Visualiser setup requirement
samgibsonmoj Nov 19, 2025
aaad247
Fixes S3 file source path resolution
samgibsonmoj Nov 19, 2025
aefeb2f
Orders files by date + handles ddMMyyyy and dMMyyyy formats
samgibsonmoj Nov 19, 2025
f412aa4
Ensures `ArchiveFileName` is nullable in queries
samgibsonmoj Nov 19, 2025
5c77d82
Adds AWS Security Token package
samgibsonmoj Nov 19, 2025
5b14bb0
Enables pre-kickoff tasks execution
samgibsonmoj Nov 19, 2025
819735b
Enable periodic file sync
samgibsonmoj Nov 20, 2025
2bb3474
Adds safe guard for file processing in Delius and Offloc
samgibsonmoj Nov 20, 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@ LocalFiles/
*.dat
*~lock.*
*.pubxml
cfoextract*
C_NOMIS_OFFENDER*
**/DMS_STAGING/

# Mac
.DS_STORE
46 changes: 25 additions & 21 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="9.5.2" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.5.2" />
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.5.2" />
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="9.5.2" />
<PackageVersion Include="Aspire.RabbitMQ.Client" Version="9.5.2" />
<PackageVersion Include="AWSSDK.Core" Version="4.0.1.3" />
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.11" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="4.0.4.1" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Minio" Version="9.9.0" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects" Version="9.8.1-beta.424" />
<PackageVersion Include="Autofac" Version="8.4.0" />
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageVersion Include="AWSSDK.S3" Version="4.0.9.1" />
<PackageVersion Include="AWSSDK.S3" Version="4.0.11.1" />
<PackageVersion Include="AutoMapper" Version="12.0.1" />
<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageVersion Include="CommunityToolkit.Aspire.Minio.Client" Version="9.9.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -26,40 +30,40 @@
<PackageVersion Include="FluentValidation" Version="11.8.0" />
<PackageVersion Include="HtmlAgilityPack" Version="1.11.57" />
<PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0-rc.2.25502.107" NoWarn="NU1605" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0-rc.2.25502.107" NoWarn="NU1605" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" NoWarn="NU1605" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" NoWarn="NU1605" />
<PackageVersion Include="Microsoft.AspNetCore.Blazor" Version="9.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.0-preview2.25289.6" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.2.25502.107">
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.0-rc.2.25502.107" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
<PackageVersion Include="Microsoft.Identity.Web" Version="4.0.1" />
<PackageVersion Include="Microsoft.Identity.Web.DownstreamApi" Version="4.0.1" />
<PackageVersion Include="Microsoft.Identity.Web.UI" Version="4.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.5.4" />
<PackageVersion Include="Microsoft.SqlServer.Dac" Version="1.0.1" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0-preview.4" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="17.14.40264" />
<PackageVersion Include="MimeTypes" Version="2.4.1" />
<PackageVersion Include="NSwag.AspNetCore" Version="14.6.1" />
<PackageVersion Include="NSwag.AspNetCore" Version="14.6.2" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0-rc.1" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0-rc.1" />
Expand All @@ -76,7 +80,7 @@
<PackageVersion Include="Sentry.Serilog" Version="6.0.0-preview.2-prerelease" />
<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.1-dev-02307" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.1-dev-02319" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.1-dev-00953" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="SimMetrics.Net" Version="1.0.5" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ Any queries, please contact andrew.grocott@justice.gov.uk or visit our slack cha
# Development Setup and Execution Guide

## Setup (development)
1. From the **project root**, run the setup script. This will automatically create the required folder structure in your devices home directory:
```sh
./setup.sh
```
2. Configure secret(s) for applications in the *src* directory:
1. To use the Visualiser app, you must configure secret(s) for applications in the *src* directory:
- *Visualiser.csproj* → Manage User Secrets
```json
{
Expand Down
8 changes: 0 additions & 8 deletions base.development.env
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
DOTNET_ENVIRONMENT=Development

OFFLOC_USERNAME=
OFFLOC_PASSWORD=
DELIUS_USERNAME=
DELIUS_PASSWORD=
Staging__DownloadOfflocFiles=false
Staging__DownloadDeliusFiles=false

Parallel=false
RedundantOfflocFields=11,20,32,33,34,35,36,37,38,41,43,44,45,46,53,54,55,56,57,58,59,60,61,62,74,75,76,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,142,144
37 changes: 0 additions & 37 deletions development.docker.env

This file was deleted.

17 changes: 2 additions & 15 deletions development.local.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@

DOTNET_ENVIRONMENT=Development

# Core
OFFLOC_USERNAME=
OFFLOC_PASSWORD=
DELIUS_USERNAME=
DELIUS_PASSWORD=
NEXTCLOUD_ADDRESS=
Staging__DownloadOfflocFiles=false
Staging__DownloadDeliusFiles=false

Parallel=false
RedundantOfflocFields= Age, Occupation Description, Check Hold Governor, Check Hold General (to be left blank), Check Hold Discipline (to be left blank), Check Hold Allocation, Check Hold Security, Check Hold Medical, Check Hold Parole, ACCT Status (F2052), Status Rank (to be left blank), Pending Transfers (Full Establishment Name), Received From, Vulnerable Prisoner Alert, Height (metres), Complexion, Hair Colour, Left Eye, Right Eye, Build, Facial Shape, Facial Hair, Physical Mark Head, Physical Mark Body, Rule 45/YOI Rule 49, ACCT (Self Harm) Status, ACCT (Self Harm) Start Date, Remark Type Allocation, Remarks Allocation, Remark Type Security, Remarks Security, Remark Type Medical, Remarks Medical, Remark Type Parole, Remarks Parole, Remark Type Discipline, Remarks Discipline, Remark Type General, Remarks General, Remark Type Reception, Remarks Reception, Remark Type Labour, Remarks Labour, Date Of First Movement, Diary Details

# Rabbit
Expand Down Expand Up @@ -62,8 +52,5 @@ Serilog__Enrich__1=WithMachineName
Serilog__Enrich__2=WithProcessId
Serilog__Enrich__3=WithThreadId

DMSFilesBasePath=~/DMS/
DeliusInputMount=${DMSFilesBasePath}\Delius\Input
DeliusOutputMount=${DMSFilesBasePath}\Delius\Output
OfflocInputMount=${DMSFilesBasePath}\Offloc\Input
OfflocOutputMount=${DMSFilesBasePath}\Offloc\Output
# e.g. /app/
#DMSFilesBasePath=~/DMS/
45 changes: 15 additions & 30 deletions dms.sln
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ Project("{42EA0DBD-9CF1-443E-919E-BE9C484E4577}") = "OfflocStagingDb", "src\Offl
EndProject
Project("{42EA0DBD-9CF1-443E-919E-BE9C484E4577}") = "DeliusStagingDb", "src\DeliusStagingDb\DeliusStagingDb.sqlproj", "{5E86F978-BE47-458C-ADE7-D3B5B47C514A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileStorage", "src\FileStorage\FileStorage.csproj", "{6783146D-6C22-4332-861D-81A1D4DA1CFD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cleanup", "src\Cleanup\Cleanup.csproj", "{4C0C21B2-853F-44FD-A867-66AC42F18665}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Delius", "Delius", "{581C4EBC-8973-4D51-BD8E-F76AA4E16773}"
Expand Down Expand Up @@ -74,8 +72,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "API", "src\API\API.csproj",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api.Tests", "src\Api.Tests\Api.Tests.csproj", "{A4247B60-97A2-4D5A-AE97-53E3D497675A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orchestrator", "src\Orchestrator\Orchestrator.csproj", "{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}"
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 @@ -90,6 +86,8 @@ Project("{42EA0DBD-9CF1-443E-919E-BE9C484E4577}") = "AuditDb", "src\AuditDb\Audi
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeDataSeeder", "src\FakeDataSeeder\FakeDataSeeder.csproj", "{F7F37423-FFBD-4093-AC69-E1D38B208998}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileSync", "src\FileSync\FileSync.csproj", "{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -196,18 +194,6 @@ Global
{5E86F978-BE47-458C-ADE7-D3B5B47C514A}.Release|x86.ActiveCfg = Release|Any CPU
{5E86F978-BE47-458C-ADE7-D3B5B47C514A}.Release|x86.Build.0 = Release|Any CPU
{5E86F978-BE47-458C-ADE7-D3B5B47C514A}.Release|x86.Deploy.0 = Release|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Debug|x64.ActiveCfg = Debug|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Debug|x64.Build.0 = Debug|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Debug|x86.ActiveCfg = Debug|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Debug|x86.Build.0 = Debug|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Release|Any CPU.Build.0 = Release|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Release|x64.ActiveCfg = Release|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Release|x64.Build.0 = Release|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Release|x86.ActiveCfg = Release|Any CPU
{6783146D-6C22-4332-861D-81A1D4DA1CFD}.Release|x86.Build.0 = Release|Any CPU
{4C0C21B2-853F-44FD-A867-66AC42F18665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4C0C21B2-853F-44FD-A867-66AC42F18665}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C0C21B2-853F-44FD-A867-66AC42F18665}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -400,18 +386,6 @@ Global
{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
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Debug|x64.ActiveCfg = Debug|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Debug|x64.Build.0 = Debug|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Debug|x86.ActiveCfg = Debug|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Debug|x86.Build.0 = Debug|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Release|Any CPU.Build.0 = Release|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Release|x64.ActiveCfg = Release|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Release|x64.Build.0 = Release|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.Release|x86.ActiveCfg = Release|Any CPU
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2}.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 @@ -502,6 +476,18 @@ Global
{F7F37423-FFBD-4093-AC69-E1D38B208998}.Release|x64.Build.0 = Release|Any CPU
{F7F37423-FFBD-4093-AC69-E1D38B208998}.Release|x86.ActiveCfg = Release|Any CPU
{F7F37423-FFBD-4093-AC69-E1D38B208998}.Release|x86.Build.0 = Release|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Debug|x64.ActiveCfg = Debug|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Debug|x64.Build.0 = Debug|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Debug|x86.ActiveCfg = Debug|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Debug|x86.Build.0 = Debug|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Release|Any CPU.Build.0 = Release|Any CPU
{74BC61BE-4CAC-4310-8BEA-82135EFE5B07}.Release|x64.ActiveCfg = Release|Any CPU
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -514,7 +500,6 @@ Global
{47A53A37-1E8C-479C-B3B5-276D2D05154E} = {C4AA533A-1A3C-4BBC-BA2B-A678FB784CA2}
{0FA34F76-91ED-4037-883D-5916258BA65A} = {25487F3E-ECA0-4FC3-A61F-13DCC56974D1}
{5E86F978-BE47-458C-ADE7-D3B5B47C514A} = {581C4EBC-8973-4D51-BD8E-F76AA4E16773}
{6783146D-6C22-4332-861D-81A1D4DA1CFD} = {605FBD70-9552-462C-BAC2-90D4655F1A27}
{4C0C21B2-853F-44FD-A867-66AC42F18665} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
{581C4EBC-8973-4D51-BD8E-F76AA4E16773} = {C4AA533A-1A3C-4BBC-BA2B-A678FB784CA2}
{25487F3E-ECA0-4FC3-A61F-13DCC56974D1} = {C4AA533A-1A3C-4BBC-BA2B-A678FB784CA2}
Expand All @@ -535,14 +520,14 @@ Global
{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}
{D0E5214B-119B-4D1B-947F-8A99F7AE65E2} = {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}
{CBE1DCBE-419F-4F3B-ABDE-D1416A4A40F7} = {605FBD70-9552-462C-BAC2-90D4655F1A27}
{C512532D-ADF0-D460-B843-C239A2A093EC} = {D30CBF2D-71E6-43EE-85EC-BF193B03782D}
{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}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {39E62751-A441-4DEF-AD24-20CDC6D59FF3}
Expand Down
Loading