Merge branch 'main' into feature/162020-preferred-trust

Dfe.Academies.Academisation.IService/ServiceModels/TransferProject/AcademyTransferProjectResponse.cs

@@ -3,6 +3,7 @@ namespace Dfe.Academies.Academisation.IService.ServiceModels.TransferProject
 {
 	public class AcademyTransferProjectResponse
     {
+		public int Id { get; set; }
         public string ProjectUrn { get; set; }
 
         public string ProjectReference { get; set; }

Dfe.Academies.Academisation.Service/Mappers/TransferProject/AcademyTransferProjectResponseFactory.cs

@@ -83,6 +83,7 @@ public static AcademyTransferProjectResponse Create(ITransferProject model)
 
 			return new AcademyTransferProjectResponse
 			{
+				Id = model.Id,
 				ProjectUrn = model.Urn.ToString(),
 				ProjectReference = model.ProjectReference,
 				OutgoingTrustUkprn = model.OutgoingTrustUkprn,

Dockerfile

@@ -21,7 +21,7 @@ RUN dotnet restore Dfe.Academies.Academisation.WebApi
 RUN dotnet build Dfe.Academies.Academisation.WebApi
 
 RUN dotnet new tool-manifest
-RUN dotnet tool install dotnet-ef --version 7.0.14
+RUN dotnet tool install dotnet-ef --version 8.0.4
 
 RUN dotnet ef migrations script --output /app/SQL/DbMigrationScript.sql --idempotent -p /build/Dfe.Academies.Academisation.Data -s /build/Dfe.Academies.Academisation.WebApi -c AcademisationContext
 
@@ -33,11 +33,11 @@ ARG ASPNET_IMAGE_TAG
 FROM "mcr.microsoft.com/dotnet/aspnet:${ASPNET_IMAGE_TAG}" AS final
 
 RUN apt-get update
-RUN apt-get install unixodbc curl gnupg -y
+RUN apt-get install curl gnupg -y
 RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
 RUN curl https://packages.microsoft.com/config/debian/11/prod.list | tee /etc/apt/sources.list.d/msprod.list
 RUN apt-get update
-RUN ACCEPT_EULA=Y apt-get install msodbcsql18 mssql-tools18 -y
+RUN ACCEPT_EULA=Y apt-get install msodbcsql18 mssql-tools18 unixodbc-dev -y
 
 COPY --from=build /app /app
 WORKDIR /app