From 96f8092522cff86dca25935d137a4566e0848d25 Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Tue, 7 Nov 2023 16:34:52 +0000
Subject: [PATCH 1/2] namespace fix and moved address out of trust class

---
 .../Dfe.Academies.Contracts/V4/AddressDto.cs  | 22 +++++++++++++++++++
 .../V4/Establishments/EstablishmentDto.cs     |  4 +---
 .../V4/PagedDataResponse.cs                   |  3 +++
 .../V4/Trusts/TrustDto.cs                     | 18 +--------------
 4 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 academiesContracts/Dfe.Academies.Contracts/V4/AddressDto.cs

diff --git a/academiesContracts/Dfe.Academies.Contracts/V4/AddressDto.cs b/academiesContracts/Dfe.Academies.Contracts/V4/AddressDto.cs
new file mode 100644
index 0000000..beb1a8e
--- /dev/null
+++ b/academiesContracts/Dfe.Academies.Contracts/V4/AddressDto.cs
@@ -0,0 +1,22 @@
+namespace Dfe.Academies.Contracts.V4;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+[Serializable]
+public class AddressDto
+{
+    public string Street { get; set; }
+
+    public string Town { get; set; }
+
+    public string County { get; set; }
+
+    public string Postcode { get; set; }
+
+    public string Locality { get; set; }
+
+    public string Additional { get; set; }
+}
\ No newline at end of file
diff --git a/academiesContracts/Dfe.Academies.Contracts/V4/Establishments/EstablishmentDto.cs b/academiesContracts/Dfe.Academies.Contracts/V4/Establishments/EstablishmentDto.cs
index 1623172..aca0496 100644
--- a/academiesContracts/Dfe.Academies.Contracts/V4/Establishments/EstablishmentDto.cs
+++ b/academiesContracts/Dfe.Academies.Contracts/V4/Establishments/EstablishmentDto.cs
@@ -1,6 +1,4 @@
-namespace Dfe.Academies.Contracts.Establishments;
-
-using Dfe.Academies.Contracts.Trusts;
+namespace Dfe.Academies.Contracts.V4.Establishments;
 
 [Serializable]
 public class EstablishmentDto
diff --git a/academiesContracts/Dfe.Academies.Contracts/V4/PagedDataResponse.cs b/academiesContracts/Dfe.Academies.Contracts/V4/PagedDataResponse.cs
index dcb3964..6105899 100644
--- a/academiesContracts/Dfe.Academies.Contracts/V4/PagedDataResponse.cs
+++ b/academiesContracts/Dfe.Academies.Contracts/V4/PagedDataResponse.cs
@@ -1,6 +1,7 @@
 namespace Dfe.Academies.Contracts.V4;
 using System.Collections.Generic;
 
+[Serializable]
 public class PagedDataResponse<TResponse> where TResponse : class
 {
 
@@ -18,6 +19,8 @@ public PagedDataResponse(IEnumerable<TResponse> data, PagingResponse pagingRespo
     public PagedDataResponse(TResponse data) => Data = new List<TResponse> { data };
 
 }
+
+[Serializable]
 public class PagingResponse
 {
     public int Page { get; set; }
diff --git a/academiesContracts/Dfe.Academies.Contracts/V4/Trusts/TrustDto.cs b/academiesContracts/Dfe.Academies.Contracts/V4/Trusts/TrustDto.cs
index 44f233c..1763872 100644
--- a/academiesContracts/Dfe.Academies.Contracts/V4/Trusts/TrustDto.cs
+++ b/academiesContracts/Dfe.Academies.Contracts/V4/Trusts/TrustDto.cs
@@ -1,4 +1,4 @@
-namespace Dfe.Academies.Contracts.Trusts;
+namespace Dfe.Academies.Contracts.V4.Trusts;
 
 [Serializable]
 public class TrustDto
@@ -14,19 +14,3 @@ public class TrustDto
     public AddressDto Address { get; set; }
 
 }
-
-[Serializable]
-public class AddressDto
-{
-    public string Street { get; set; }
-
-    public string Town { get; set; }
-
-    public string County { get; set; }
-
-    public string Postcode { get; set; }
-
-    public string Locality { get; set; }
-
-    public string Additional { get; set; }
-}

From 6c5f23f63ec155ff648fe7b84dcd750e3064ccd5 Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Tue, 7 Nov 2023 16:36:42 +0000
Subject: [PATCH 2/2] version bump

---
 .../Dfe.Academies.Contracts/Dfe.Academies.Contracts.csproj       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/academiesContracts/Dfe.Academies.Contracts/Dfe.Academies.Contracts.csproj b/academiesContracts/Dfe.Academies.Contracts/Dfe.Academies.Contracts.csproj
index 0553c02..f6b7776 100644
--- a/academiesContracts/Dfe.Academies.Contracts/Dfe.Academies.Contracts.csproj
+++ b/academiesContracts/Dfe.Academies.Contracts/Dfe.Academies.Contracts.csproj
@@ -12,6 +12,7 @@
     <RepositoryUrl>https://github.com/DFE-Digital/academisation-nuget-packages</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
 	<Version>1.0.3</Version>
+	<AssemblyVersion>1.0.4</AssemblyVersion>
   </PropertyGroup>
 	
   <ItemGroup>