diff --git a/dfa-public/src/API/Dockerfile b/dfa-public/src/API/Dockerfile index 2f005c172..ed809edba 100644 --- a/dfa-public/src/API/Dockerfile +++ b/dfa-public/src/API/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app EXPOSE 8080 ENV ASPNETCORE_URLS=http://*:8080 @@ -7,7 +7,7 @@ ENV DOTNET_gcServer=1 ARG VERSION ENV VERSION=$VERSION -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build # install diagnostics tools RUN dotnet tool install --tool-path /tools dotnet-trace @@ -15,7 +15,7 @@ RUN dotnet tool install --tool-path /tools dotnet-counters RUN dotnet tool install --tool-path /tools dotnet-dump WORKDIR /src -COPY ["EMBC.DFA.API/EMBC.DFA.API.csproj", "EMBC.DFA.API/"] +COPY ["EMBC.DFA.PUBLIC.API/EMBC.DFA.PUBLIC.API.csproj", "EMBC.DFA.PUBLIC.API/"] COPY ["EMBC.ESS.Shared.Contracts/EMBC.ESS.Shared.Contracts.csproj", "EMBC.ESS.Shared.Contracts/"] COPY ["EMBC.Utilities/EMBC.Utilities.csproj", "EMBC.Utilities/"] COPY ["EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj", "EMBC.Utilities.Hosting/"] @@ -24,7 +24,7 @@ COPY ["EMBC.Utilities.Telemetry/EMBC.Utilities.Telemetry.csproj", "EMBC.Utilitie COPY ["EMBC.Utilities.Messaging/EMBC.Utilities.Messaging.csproj", "EMBC.Utilities.Messaging/"] COPY ["EMBC.Tests.Unit.DFA.API/EMBC.Tests.Unit.DFA.API.csproj", "EMBC.Tests.Unit.DFA.API/"] COPY ["EMBC.BCeID/EMBC.Gov.BCeID.csproj", "EMBC.BCeID/"] -COPY ["EMBC.DFA.sln", ".editorconfig", "./"] +COPY ["EMBC.DFA.PUBLIC.sln", ".editorconfig", "./"] RUN dotnet restore . COPY . . @@ -33,7 +33,7 @@ COPY . . # build FROM build AS publish -RUN dotnet publish "EMBC.DFA.API/EMBC.DFA.API.csproj" -c Release -o /app/publish --runtime linux-musl-x64 --no-self-contained +RUN dotnet publish "EMBC.DFA.PUBLIC.API/EMBC.DFA.PUBLIC.API.csproj" -c Release -o /app/publish --runtime linux-musl-x64 --no-self-contained FROM base AS final # copy diagnostics tools @@ -42,4 +42,4 @@ COPY --from=build /tools . # copy app WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "EMBC.DFA.API.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "EMBC.DFA.PUBLIC.API.dll"] \ No newline at end of file diff --git a/dfa-public/src/API/EMBC.BCeID/EMBC.Gov.BCeID.csproj b/dfa-public/src/API/EMBC.BCeID/EMBC.Gov.BCeID.csproj index 20cb4f518..f7edfa3ab 100644 --- a/dfa-public/src/API/EMBC.BCeID/EMBC.Gov.BCeID.csproj +++ b/dfa-public/src/API/EMBC.BCeID/EMBC.Gov.BCeID.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable enable diff --git a/dfa-public/src/API/EMBC.DFA.API/Authentication/AuthenticationExtensions.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/AuthenticationExtensions.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Authentication/AuthenticationExtensions.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/AuthenticationExtensions.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Authentication/IOAuthApiClient.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/IOAuthApiClient.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Authentication/IOAuthApiClient.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/IOAuthApiClient.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Authentication/ITokenService.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/ITokenService.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Authentication/ITokenService.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/ITokenService.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Authentication/OAuthApiClient.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/OAuthApiClient.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Authentication/OAuthApiClient.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/OAuthApiClient.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Authentication/OAuthAuthorizationException.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/OAuthAuthorizationException.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Authentication/OAuthAuthorizationException.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/OAuthAuthorizationException.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Authentication/OAuthError.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/OAuthError.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Authentication/OAuthError.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/OAuthError.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Authentication/OAuthHandler.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/OAuthHandler.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Authentication/OAuthHandler.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/OAuthHandler.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Authentication/Token.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/Token.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Authentication/Token.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/Token.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Authentication/TokenService.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/TokenService.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Authentication/TokenService.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Authentication/TokenService.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Configuration.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Configuration.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Configuration.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Configuration.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Controllers/ConfigurationTestController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Controllers/ConfigurationTestController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Controllers/ConfigurationTestController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Controllers/ConfigurationTestController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/AuthModels/BceidUserData.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/AuthModels/BceidUserData.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/AuthModels/BceidUserData.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/AuthModels/BceidUserData.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/DynamicsGateway.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/DynamicsGateway.cs similarity index 99% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/DynamicsGateway.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/DynamicsGateway.cs index d097bd1ef..95ab14310 100644 --- a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/DynamicsGateway.cs +++ b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/DynamicsGateway.cs @@ -272,7 +272,7 @@ public async Task GetApplicationMainById(Guid a application.dfa_contactemail = buildingOwnerlist.List.Last().dfa_contactemail; } - var annotationList = await api.GetList("annotations", new CRMGetListOptions + var annotationList = await api.GetList("annotations", new CRMGetListOptions { Select = new[] { @@ -281,7 +281,7 @@ public async Task GetApplicationMainById(Guid a Filter = $"_objectid_value eq {application.dfa_appapplicationid}" }); - foreach (annotation annotation in annotationList.List) + foreach (Annotation annotation in annotationList.List) { if (annotation.subject == "primaryApplicantSignature") { diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/Entities.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/Entities.cs similarity index 99% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/Entities.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/Entities.cs index 0984b1f2a..c29f9eea7 100644 --- a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/Entities.cs +++ b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/Entities.cs @@ -119,7 +119,7 @@ public class dfa_signature public string dfa_appapplicationid { get; set; } } - public class annotation + public class Annotation { public Guid annotationid { get; set; } public string documentbody { get; set; } diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/Handler.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/Handler.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/Handler.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/Handler.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/IDynamicsGateway.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/IDynamicsGateway.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/IDynamicsGateway.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/IDynamicsGateway.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/IListsRepository.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/IListsRepository.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/IListsRepository.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/IListsRepository.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/ListsRepository.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/ListsRepository.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/Dynamics/ListsRepository.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/Dynamics/ListsRepository.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/PDF/Contact.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/PDF/Contact.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/PDF/Contact.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/PDF/Contact.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/PDF/PDFService/PDFServiceHandler.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/PDF/PDFService/PDFServiceHandler.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/PDF/PDFService/PDFServiceHandler.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/PDF/PDFService/PDFServiceHandler.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/PDF/PdfApplicationData.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/PDF/PdfApplicationData.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/PDF/PdfApplicationData.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/PDF/PdfApplicationData.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/ViewModel.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/ViewModel.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/ConfigurationModule/Models/ViewModel.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/ConfigurationModule/Models/ViewModel.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/ApplicationController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ApplicationController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/ApplicationController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ApplicationController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/AttachmentController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/AttachmentController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/AttachmentController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/AttachmentController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/BCeIDLookupController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/BCeIDLookupController.cs similarity index 97% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/BCeIDLookupController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/BCeIDLookupController.cs index 00e68ad0c..71c6f4f60 100644 --- a/dfa-public/src/API/EMBC.DFA.API/Controllers/BCeIDLookupController.cs +++ b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/BCeIDLookupController.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using bceid = EMBC.Gov.BCeID; +using BCeID = EMBC.Gov.BCeID; namespace EMBC.DFA.API.Controllers { @@ -48,7 +48,7 @@ public BCeIDLookupController( [HttpGet("self")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status400BadRequest)] - public async Task> GetBCeIDSelfInfo() + public async Task> GetBCeIDSelfInfo() { try { @@ -88,7 +88,7 @@ public BCeIDLookupController( [HttpGet("other")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status400BadRequest)] - public async Task> GetBCeIDOtherInfo( + public async Task> GetBCeIDOtherInfo( [FromQuery] [Required] string userId) diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/ClaimController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ClaimController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/ClaimController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ClaimController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/CleanupLogItemController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/CleanupLogItemController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/CleanupLogItemController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/CleanupLogItemController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/ConfigurationController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ConfigurationController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/ConfigurationController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ConfigurationController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/ContactController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ContactController.cs similarity index 96% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/ContactController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ContactController.cs index 8c72b2f1a..d328015f1 100644 --- a/dfa-public/src/API/EMBC.DFA.API/Controllers/ContactController.cs +++ b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ContactController.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using bceid = EMBC.Gov.BCeID; +using BCeID = EMBC.Gov.BCeID; namespace EMBC.DFA.API.Controllers { @@ -44,7 +44,7 @@ public ContactController( [AllowAnonymous] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public ActionResult GetDashboardContactInfo() + public ActionResult GetDashboardContactInfo() { if (User.Identity.IsAuthenticated) { @@ -52,7 +52,7 @@ public ContactController( if (userData == null) return NotFound("Authentication missing"); - var bceidData = mapper.Map(userData); + var bceidData = mapper.Map(userData); return Ok(bceidData); } else diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/DamagedRoomController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/DamagedRoomController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/DamagedRoomController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/DamagedRoomController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/EligibilityController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/EligibilityController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/EligibilityController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/EligibilityController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/FullTimeOccupantController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/FullTimeOccupantController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/FullTimeOccupantController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/FullTimeOccupantController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/InvoiceController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/InvoiceController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/InvoiceController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/InvoiceController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/OtherContactController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/OtherContactController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/OtherContactController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/OtherContactController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/ProfileController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ProfileController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/ProfileController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ProfileController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/ProjectController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ProjectController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/ProjectController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/ProjectController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/SecondaryApplicantController.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/SecondaryApplicantController.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/SecondaryApplicantController.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/SecondaryApplicantController.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Controllers/SharedModels.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/SharedModels.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Controllers/SharedModels.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Controllers/SharedModels.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/EMBC.DFA.API.csproj b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/EMBC.DFA.PUBLIC.API.csproj similarity index 75% rename from dfa-public/src/API/EMBC.DFA.API/EMBC.DFA.API.csproj rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/EMBC.DFA.PUBLIC.API.csproj index 3b35548c2..dc1aeea88 100644 --- a/dfa-public/src/API/EMBC.DFA.API/EMBC.DFA.API.csproj +++ b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/EMBC.DFA.PUBLIC.API.csproj @@ -1,20 +1,20 @@  - net6.0 + net8.0 true true annotations Province of British Columbia Quartech Systems Limited - Copyright 2020 Province of British Columbia + Copyright Province of British Columbia LICENSE - https://github.com/bcgov/embc-ess-mod + https://github.com/bcgov/emcr-dfa-portal GIT false false - 78326412-d09d-4d67-964c-b4b680228566 + 78326412-d09d-4d67-964c-b4b680228567 Default True true @@ -38,16 +38,10 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/dfa-public/src/API/EMBC.DFA.API/Mappers/Mappings.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Mappers/Mappings.cs similarity index 99% rename from dfa-public/src/API/EMBC.DFA.API/Mappers/Mappings.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Mappers/Mappings.cs index d1ce0f495..c3ce74ff9 100644 --- a/dfa-public/src/API/EMBC.DFA.API/Mappers/Mappings.cs +++ b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Mappers/Mappings.cs @@ -1,18 +1,14 @@ using System; using System.ComponentModel; -using System.Drawing; using System.Globalization; using System.Linq; using System.Reflection; using System.Runtime.Serialization; -using System.Text.RegularExpressions; -using EMBC.DFA.API.ConfigurationModule.Models; using EMBC.DFA.API.ConfigurationModule.Models.AuthModels; using EMBC.DFA.API.ConfigurationModule.Models.Dynamics; using EMBC.DFA.API.ConfigurationModule.Models.PDF; using EMBC.DFA.API.Controllers; -using Microsoft.IdentityModel.Tokens; -using bceid = EMBC.Gov.BCeID; +using BCeID = EMBC.Gov.BCeID; namespace EMBC.DFA.API.Mappers { @@ -772,7 +768,7 @@ public Mappings() // 2024-07-16 EMCRI-440 waynezen - CreateMap() + CreateMap() .ForMember(d => d.userId, opts => opts.MapFrom(s => s.bceid_username)) .ForMember(d => d.legalName, opts => opts.MapFrom(s => s.bceid_business_name)) .ForMember(d => d.contactEmail, opts => opts.MapFrom(s => s.emailaddress)) diff --git a/dfa-public/src/API/EMBC.DFA.API/Program.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Program.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Program.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Program.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Properties/launchSettings.json b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Properties/launchSettings.json similarity index 95% rename from dfa-public/src/API/EMBC.DFA.API/Properties/launchSettings.json rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Properties/launchSettings.json index f61c16f98..0ff8db6c8 100644 --- a/dfa-public/src/API/EMBC.DFA.API/Properties/launchSettings.json +++ b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Properties/launchSettings.json @@ -12,7 +12,7 @@ }, "distributionName": "" }, - "EMBC.DFA.API": { + "EMBC.DFA.PUBLIC.API": { "commandName": "Project", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", diff --git a/dfa-public/src/API/EMBC.DFA.API/Services/ADFSTokenProvider.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/ADFSTokenProvider.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Services/ADFSTokenProvider.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/ADFSTokenProvider.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Services/BcscUserInfoMapper.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/BcscUserInfoMapper.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Services/BcscUserInfoMapper.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/BcscUserInfoMapper.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Services/EvacuationSearchService.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/EvacuationSearchService.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Services/EvacuationSearchService.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/EvacuationSearchService.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Services/ITokenProvider.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/ITokenProvider.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Services/ITokenProvider.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/ITokenProvider.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Services/ProfileInviteService.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/ProfileInviteService.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Services/ProfileInviteService.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/ProfileInviteService.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Services/ProfilesConflictDetector.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/ProfilesConflictDetector.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Services/ProfilesConflictDetector.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/ProfilesConflictDetector.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/Services/UserService.cs b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/UserService.cs similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/Services/UserService.cs rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/Services/UserService.cs diff --git a/dfa-public/src/API/EMBC.DFA.API/appsettings.Development.json b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/appsettings.Development.json similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/appsettings.Development.json rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/appsettings.Development.json diff --git a/dfa-public/src/API/EMBC.DFA.API/appsettings.json b/dfa-public/src/API/EMBC.DFA.PUBLIC.API/appsettings.json similarity index 100% rename from dfa-public/src/API/EMBC.DFA.API/appsettings.json rename to dfa-public/src/API/EMBC.DFA.PUBLIC.API/appsettings.json diff --git a/dfa-public/src/API/EMBC.DFA.sln b/dfa-public/src/API/EMBC.DFA.PUBLIC.sln similarity index 98% rename from dfa-public/src/API/EMBC.DFA.sln rename to dfa-public/src/API/EMBC.DFA.PUBLIC.sln index 071874746..a618a725f 100644 --- a/dfa-public/src/API/EMBC.DFA.sln +++ b/dfa-public/src/API/EMBC.DFA.PUBLIC.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EMBC.DFA.API", "EMBC.DFA.API\EMBC.DFA.API.csproj", "{EE7D4980-9AEE-4495-8B4E-28CA41B32024}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EMBC.DFA.PUBLIC.API", "EMBC.DFA.PUBLIC.API\EMBC.DFA.PUBLIC.API.csproj", "{EE7D4980-9AEE-4495-8B4E-28CA41B32024}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EMBC.Tests.Unit.DFA.API", "EMBC.Tests.Unit.DFA.API\EMBC.Tests.Unit.DFA.API.csproj", "{A8EEF3EC-A1AE-4C4E-8AB3-4D3BF46DE853}" EndProject diff --git a/dfa-public/src/API/EMBC.ESS.Shared.Contracts/EMBC.ESS.Shared.Contracts.csproj b/dfa-public/src/API/EMBC.ESS.Shared.Contracts/EMBC.ESS.Shared.Contracts.csproj index 28a54e6b6..7404ab147 100644 --- a/dfa-public/src/API/EMBC.ESS.Shared.Contracts/EMBC.ESS.Shared.Contracts.csproj +++ b/dfa-public/src/API/EMBC.ESS.Shared.Contracts/EMBC.ESS.Shared.Contracts.csproj @@ -23,7 +23,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -31,6 +31,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + \ No newline at end of file diff --git a/dfa-public/src/API/EMBC.Tests.Unit.DFA.API/EMBC.Tests.Unit.DFA.API.csproj b/dfa-public/src/API/EMBC.Tests.Unit.DFA.API/EMBC.Tests.Unit.DFA.API.csproj index f9c683b26..5f3bfb0de 100644 --- a/dfa-public/src/API/EMBC.Tests.Unit.DFA.API/EMBC.Tests.Unit.DFA.API.csproj +++ b/dfa-public/src/API/EMBC.Tests.Unit.DFA.API/EMBC.Tests.Unit.DFA.API.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 false true warnings @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/dfa-public/src/API/EMBC.Utilities.Caching/EMBC.Utilities.Caching.csproj b/dfa-public/src/API/EMBC.Utilities.Caching/EMBC.Utilities.Caching.csproj index cebf2d6dd..676b7957f 100644 --- a/dfa-public/src/API/EMBC.Utilities.Caching/EMBC.Utilities.Caching.csproj +++ b/dfa-public/src/API/EMBC.Utilities.Caching/EMBC.Utilities.Caching.csproj @@ -23,10 +23,7 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/dfa-public/src/API/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj b/dfa-public/src/API/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj index dd503b75a..56668cacd 100644 --- a/dfa-public/src/API/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj +++ b/dfa-public/src/API/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 true true Province of British Columbia @@ -29,10 +29,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/dfa-public/src/API/EMBC.Utilities.Hosting/Host.cs b/dfa-public/src/API/EMBC.Utilities.Hosting/Host.cs index e727ae2f8..6ff5c8a18 100644 --- a/dfa-public/src/API/EMBC.Utilities.Hosting/Host.cs +++ b/dfa-public/src/API/EMBC.Utilities.Hosting/Host.cs @@ -105,7 +105,9 @@ protected virtual IHostBuilder CreateHost(params Assembly[] assemblies) => .ConfigureHostConfiguration(opts => { // add secrets json file if exists in the hosting assembly +#pragma warning disable CS8604 // Possible null reference argument. opts.AddUserSecrets(Assembly.GetEntryAssembly(), true, true); +#pragma warning restore CS8604 // Possible null reference argument. }) .UseSerilog((ctx, services, config) => Logging.ConfigureSerilog(ctx, services, config, appName)) .ConfigureWebHostDefaults(webBuilder => diff --git a/dfa-public/src/API/EMBC.Utilities.Telemetry/EMBC.Utilities.Telemetry.csproj b/dfa-public/src/API/EMBC.Utilities.Telemetry/EMBC.Utilities.Telemetry.csproj index cdfdd9589..8915fe275 100644 --- a/dfa-public/src/API/EMBC.Utilities.Telemetry/EMBC.Utilities.Telemetry.csproj +++ b/dfa-public/src/API/EMBC.Utilities.Telemetry/EMBC.Utilities.Telemetry.csproj @@ -23,10 +23,7 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/dfa-public/src/API/EMBC.Utilities/EMBC.Utilities.csproj b/dfa-public/src/API/EMBC.Utilities/EMBC.Utilities.csproj index 4150fc87d..9c51b7002 100644 --- a/dfa-public/src/API/EMBC.Utilities/EMBC.Utilities.csproj +++ b/dfa-public/src/API/EMBC.Utilities/EMBC.Utilities.csproj @@ -33,16 +33,9 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/dfa-public/src/API/global.json b/dfa-public/src/API/global.json index 6c5cf1832..75a80e90b 100644 --- a/dfa-public/src/API/global.json +++ b/dfa-public/src/API/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.425", - "rollForward": "latestMinor" + "version": "8.0.0", + "rollForward": "latestMinor" } } \ No newline at end of file