Skip to content

Commit

Permalink
CODE RUB: Updated Namespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
cjdutoit committed May 2, 2024
1 parent 931d038 commit e3e6015
Show file tree
Hide file tree
Showing 74 changed files with 196 additions and 98 deletions.
21 changes: 0 additions & 21 deletions LICENSE

This file was deleted.

8 changes: 4 additions & 4 deletions NEL.LibPostalClient.sln → LibPostalClient.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34202.233
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEL.LibPostalClient", "NEL.LibPostalClient\NEL.LibPostalClient.csproj", "{8F716F8C-89E2-4B11-8220-234499B00A33}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHSISL.LibPostalClient", "NHSISL.LibPostalClient\NHSISL.LibPostalClient.csproj", "{8F716F8C-89E2-4B11-8220-234499B00A33}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEL.LibPostalClient.Infrastructure", "NEL.LibPostalClient.Infrastructure\NEL.LibPostalClient.Infrastructure.csproj", "{B99B5798-18E4-4DD9-8CDB-A08F6B89CA19}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHSISL.LibPostalClient.Infrastructure", "NHSISL.LibPostalClient.Infrastructure\NHSISL.LibPostalClient.Infrastructure.csproj", "{B99B5798-18E4-4DD9-8CDB-A08F6B89CA19}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEL.LibPostalClient.Tests.Unit", "NEL.LibPostalClient.Tests.Unit\NEL.LibPostalClient.Tests.Unit.csproj", "{7184373C-6377-4A12-8C05-95C2B87D56F5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHSISL.LibPostalClient.Tests.Unit", "NHSISL.LibPostalClient.Tests.Unit\NHSISL.LibPostalClient.Tests.Unit.csproj", "{7184373C-6377-4A12-8C05-95C2B87D56F5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEL.LibPostalClient.Tests.Acceptance", "NEL.LibPostalClient.Tests.Acceptance\NEL.LibPostalClient.Tests.Acceptance.csproj", "{AB0D7591-3461-4E2B-BA6B-08A0063F9D50}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHSISL.LibPostalClient.Tests.Acceptance", "NHSISL.LibPostalClient.Tests.Acceptance\NHSISL.LibPostalClient.Tests.Acceptance.csproj", "{AB0D7591-3461-4E2B-BA6B-08A0063F9D50}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Copyright (c) North East London ICB. All rights reserved.
// ---------------------------------------------------------------

using NEL.LibPostalClient.Infrastructure.Services;
using NHSISL.LibPostalClient.Infrastructure.Services;

namespace NEL.LibPostalClient.Infrastructure
namespace NHSISL.LibPostalClient.Infrastructure
{
internal class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using ADotNet.Models.Pipelines.GithubPipelines.DotNets.Tasks;
using ADotNet.Models.Pipelines.GithubPipelines.DotNets.Tasks.SetupDotNetTaskV3s;

namespace NEL.LibPostalClient.Infrastructure.Services
namespace NHSISL.LibPostalClient.Infrastructure.Services
{
internal class ScriptGenerationService
{
Expand All @@ -22,7 +22,7 @@ public void GenerateBuildScript()

var githubPipeline = new GithubPipeline
{
Name = "NEL.LibPostalClient Build",
Name = "Build",

OnEvents = new Events
{
Expand Down Expand Up @@ -91,7 +91,7 @@ public void GenerateBuildScript()
new TagJob(
runsOn: BuildMachines.UbuntuLatest,
dependsOn: "build",
projectRelativePath: "NEL.LibPostalClient/NEL.LibPostalClient.csproj",
projectRelativePath: "NHSISL.LibPostalClient/NHSISL.LibPostalClient.csproj",
githubToken: "${{ secrets.PAT_FOR_TAGGING }}",
branchName: branchName)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using FluentAssertions;
using Xunit;

namespace NEL.LibPostalClient.Tests.Acceptance
namespace NHSISL.LibPostalClient.Tests.Acceptance
{
public partial class LibPostalTest
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using FluentAssertions;
using Xunit;

namespace NEL.LibPostalClient.Tests.Acceptance
namespace NHSISL.LibPostalClient.Tests.Acceptance
{
public partial class LibPostalTest
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

using System.IO;
using System.Reflection;
using NEL.LibPostalClient.Clients;
using NEL.LibPostalClient.Models.Brokers.LibPostal;
using NHSISL.LibPostalClient.Clients;
using NHSISL.LibPostalClient.Models.Brokers.LibPostal;

namespace NEL.LibPostalClient.Tests.Acceptance
namespace NHSISL.LibPostalClient.Tests.Acceptance
{
public partial class LibPostalTest
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NEL.LibPostalClient\NEL.LibPostalClient.csproj" />
<ProjectReference Include="..\NHSISL.LibPostalClient\NHSISL.LibPostalClient.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<Configurations>Debug;Release;Test;Acceptance</Configurations>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CompareNETObjects" Version="4.82.0" />
<PackageReference Include="DeepCloner" Version="0.10.4" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="Tynamix.ObjectFiller" Version="1.5.8" />
<PackageReference Include="Xeption" Version="2.6.0" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NHSISL.LibPostalClient\NHSISL.LibPostalClient.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="local.appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

<Target Name="CleanLibPostal" AfterTargets="Clean">
<RemoveDir Directories="$(TargetDir)Data\libpostal"></RemoveDir>
<Delete Files="$(TargetDir)LibpostalData.zip" />
<Delete Files="$(TargetDir)libpostal-1.dll" Condition="'$(OS)' == 'Windows_NT'" />
<Delete Files="$(TargetDir)libpostal-1.so" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'" />
</Target>

<Target Name="PrepLibPostal" BeforeTargets="Build">
<Message Importance="high" Text="Checking for LibpostalData.zip" />

<DownloadFile SourceUrl="https://github.com/NHSISL/LibPostalClient/releases/download/LibPostalData/LibpostalData.zip" DestinationFolder="$(TargetDir)" Condition="!Exists('$(TargetDir)\LibpostalData.zip') == 'True'" />

</Target>

<Target Name="UnzipLibPostal" AfterTargets="PrepLibPostal">
<Message Importance="high" Text="Unzipping LibpostalData.zip" />

<Unzip SourceFiles="$(TargetDir)\LibpostalData.zip" DestinationFolder="$(TargetDir)\Data" OverwriteReadOnlyFiles="true" Condition="Exists('$(TargetDir)\LibpostalData.zip') == 'True'" />

<Message Importance="high" Text="Unzipped LibpostalData.zip" />

</Target>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NEL.LibPostalClient\NEL.LibPostalClient.csproj" />
<ProjectReference Include="..\NHSISL.LibPostalClient\NHSISL.LibPostalClient.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<Configurations>Debug;Release;Test;Acceptance</Configurations>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CompareNETObjects" Version="4.82.0" />
<PackageReference Include="DeepCloner" Version="0.10.4" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="Tynamix.ObjectFiller" Version="1.5.8" />
<PackageReference Include="Xeption" Version="2.6.0" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NHSISL.LibPostalClient\NHSISL.LibPostalClient.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="local.appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
using NEL.MESH.Models.Foundations.LibPostal.Exceptions;
using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
using NHSISL.MESH.Models.Foundations.LibPostal.Exceptions;
using Xunit;

namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
{
public partial class LibPostalServiceTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
using Xunit;

namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
{
public partial class LibPostalServiceTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
using Xunit;

namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
{
public partial class LibPostalServiceTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Moq;
using Xunit;

namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
{
public partial class LibPostalServiceTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Moq;
using Xunit;

namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
{
public partial class LibPostalServiceTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
using NEL.MESH.Models.Foundations.LibPostal.Exceptions;
using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
using NHSISL.MESH.Models.Foundations.LibPostal.Exceptions;
using Xunit;

namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
{
public partial class LibPostalServiceTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
using System;
using System.Linq.Expressions;
using Moq;
using NEL.LibPostalClient.Brokers.LibPostal;
using NEL.LibPostalClient.Services.LibPostal;
using NHSISL.LibPostalClient.Brokers.LibPostal;
using NHSISL.LibPostalClient.Services.LibPostal;
using Tynamix.ObjectFiller;
using Xeptions;

namespace NEL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
namespace NHSISL.LibPostalClient.Tests.Unit.Services.Foundations.LibPostals
{
public partial class LibPostalServiceTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using System.Collections.Generic;

namespace NEL.LibPostalClient.Brokers.LibPostal
namespace NHSISL.LibPostalClient.Brokers.LibPostal
{
internal interface ILibPostalBroker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

using System.Collections.Generic;
using LibPostalNet;
using NEL.LibPostalClient.Models.Brokers.LibPostal;
using NHSISL.LibPostalClient.Models.Brokers.LibPostal;

namespace NEL.LibPostalClient.Brokers.LibPostal
namespace NHSISL.LibPostalClient.Brokers.LibPostal
{
internal class LibPostalBroker : ILibPostalBroker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Threading.Tasks;

namespace NEL.LibPostalClient.Clients
namespace NHSISL.LibPostalClient.Clients
{
public interface ILibPostalClient
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using NEL.LibPostalClient.Brokers.LibPostal;
using NEL.LibPostalClient.Models.Brokers.LibPostal;
using NEL.LibPostalClient.Models.Clients.LibPostal.Exceptions;
using NEL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
using NEL.LibPostalClient.Services.LibPostal;
using NEL.MESH.Models.Foundations.LibPostal.Exceptions;
using NHSISL.LibPostalClient.Brokers.LibPostal;
using NHSISL.LibPostalClient.Models.Brokers.LibPostal;
using NHSISL.LibPostalClient.Models.Clients.LibPostal.Exceptions;
using NHSISL.LibPostalClient.Models.Foundations.LibPostal.Exceptions;
using NHSISL.LibPostalClient.Services.LibPostal;
using NHSISL.MESH.Models.Foundations.LibPostal.Exceptions;
using Xeptions;

namespace NEL.LibPostalClient.Clients
namespace NHSISL.LibPostalClient.Clients
{
public class LibPostalClient : ILibPostalClient
{
Expand Down
File renamed without changes.
Loading

0 comments on commit e3e6015

Please sign in to comment.