From 1acd3a1da398a8516e0b1db990a23ec7e7b4ecb1 Mon Sep 17 00:00:00 2001 From: FrostyApeOne Date: Mon, 9 Mar 2026 15:56:46 +0000 Subject: [PATCH 1/6] Added multi-framework support for APIClient project --- ...ovUK.Dfe.ExternalApplications.Api.Client.csproj | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj b/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj index cf013970..84c2ed20 100644 --- a/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj +++ b/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj @@ -9,13 +9,9 @@ API Client The API description. DFE-Digital - net10.0 + net8.0;net10.0 - - - - @@ -25,11 +21,17 @@ - + + + + + + + From 1809549b81922b05158877946efb039f0f83540f Mon Sep 17 00:00:00 2001 From: FrostyApeOne Date: Mon, 9 Mar 2026 16:28:55 +0000 Subject: [PATCH 2/6] Installing dotnet8 when building the app --- .github/workflows/build-test-template.yml | 4 +++- .github/workflows/pack-template.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-template.yml b/.github/workflows/build-test-template.yml index 0203b2c2..9e4e8d19 100644 --- a/.github/workflows/build-test-template.yml +++ b/.github/workflows/build-test-template.yml @@ -38,7 +38,9 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNET_VERSION }} + dotnet-version: | + 8.0.x + ${{ env.DOTNET_VERSION }} - name: Setup JDK uses: actions/setup-java@v4 diff --git a/.github/workflows/pack-template.yml b/.github/workflows/pack-template.yml index 121642de..818e788e 100644 --- a/.github/workflows/pack-template.yml +++ b/.github/workflows/pack-template.yml @@ -31,7 +31,9 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: '10.0.x' + dotnet-version: | + 8.0.x + 10.0.x - name: Install GitVersion (v5) uses: gittools/actions/gitversion/setup@v0.9 From d5441aa88d4481c292eec304d23305a0064b0959 Mon Sep 17 00:00:00 2001 From: FrostyApeOne Date: Mon, 9 Mar 2026 16:36:01 +0000 Subject: [PATCH 3/6] Ignore enforced dotnet10 for this project --- .../GovUK.Dfe.ExternalApplications.Api.Client.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj b/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj index 84c2ed20..317b7a99 100644 --- a/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj +++ b/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj @@ -9,6 +9,7 @@ API Client The API description. DFE-Digital + net8.0;net10.0 From cafc89fa909a402cc8b3d7706e8ce1ee128896d3 Mon Sep 17 00:00:00 2001 From: FrostyApeOne Date: Mon, 9 Mar 2026 16:39:43 +0000 Subject: [PATCH 4/6] Removed manual xml path --- .../GovUK.Dfe.ExternalApplications.Api.Client.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj b/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj index 317b7a99..629b6bc6 100644 --- a/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj +++ b/src/GovUK.Dfe.ExternalApplications.Api.Client/GovUK.Dfe.ExternalApplications.Api.Client.csproj @@ -14,7 +14,6 @@ - From 31742e64269ccf4c6f74467ece934785f1632a45 Mon Sep 17 00:00:00 2001 From: FrostyApeOne Date: Tue, 10 Mar 2026 14:05:20 +0000 Subject: [PATCH 5/6] Updated domain names for LSRP --- src/DfE.ExternalApplications.Api/appsettings.Development.json | 4 ++-- src/DfE.ExternalApplications.Api/appsettings.Test.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DfE.ExternalApplications.Api/appsettings.Development.json b/src/DfE.ExternalApplications.Api/appsettings.Development.json index 74db1104..428d4f2c 100644 --- a/src/DfE.ExternalApplications.Api/appsettings.Development.json +++ b/src/DfE.ExternalApplications.Api/appsettings.Development.json @@ -143,7 +143,7 @@ "JwtAudience": "external-applications-api" }, "Frontend": { - "Origin": "https://s184d01-rsd-frontdoor-extapp-lsrp-gqfzg3agadhmg4aj.a03.azurefd.net" + "Origin": "https://dev.submit-send-reform-plans.education.gov.uk/" }, "SkipMassTransit": false, "MassTransit": { @@ -164,7 +164,7 @@ } }, "FrontendSettings": { - "BaseUrl": "https://s184d01-rsd-frontdoor-extapp-lsrp-gqfzg3agadhmg4aj.a03.azurefd.net", + "BaseUrl": "https://dev.submit-send-reform-plans.education.gov.uk/", "PreviewContentSelector": ".govuk-grid-column-full" }, "Email": { diff --git a/src/DfE.ExternalApplications.Api/appsettings.Test.json b/src/DfE.ExternalApplications.Api/appsettings.Test.json index e5d9e1b3..c8b61476 100644 --- a/src/DfE.ExternalApplications.Api/appsettings.Test.json +++ b/src/DfE.ExternalApplications.Api/appsettings.Test.json @@ -142,7 +142,7 @@ "JwtAudience": "external-applications-api" }, "Frontend": { - "Origin": "https://s184t01-rsd-frontdoor-extapp-lsrp-ggc6ehd6h3bhgtg0.a01.azurefd.net/" + "Origin": "https://test.submit-send-reform-plans.education.gov.uk/" }, "CypressAuthentication": { "AllowToggle": true, @@ -166,7 +166,7 @@ } }, "FrontendSettings": { - "BaseUrl": "https://s184t01-rsd-frontdoor-extapp-lsrp-ggc6ehd6h3bhgtg0.a01.azurefd.net/", + "BaseUrl": "https://test.submit-send-reform-plans.education.gov.uk/", "PreviewContentSelector": ".govuk-grid-column-full" }, "Email": { From d83657d7898827716f4594191c24f419ed717c14 Mon Sep 17 00:00:00 2001 From: FrostyApeOne Date: Tue, 10 Mar 2026 14:06:32 +0000 Subject: [PATCH 6/6] Version bump --- CHANGELOG.md | 6 +++++- .../DfE.ExternalApplications.Api.csproj | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d9bc198..018c9e92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,4 +41,8 @@ All notable changes to this service will be documented in this file. ## [1.1.5] – Public Beta ### Notes -- Upgraded to .NET10 \ No newline at end of file +- Upgraded to .NET10 + +## [1.1.6] – Public Beta +### Notes +- Updated domain names fort LSRP Dev and Test. \ No newline at end of file diff --git a/src/DfE.ExternalApplications.Api/DfE.ExternalApplications.Api.csproj b/src/DfE.ExternalApplications.Api/DfE.ExternalApplications.Api.csproj index 76943a0b..de7a047d 100644 --- a/src/DfE.ExternalApplications.Api/DfE.ExternalApplications.Api.csproj +++ b/src/DfE.ExternalApplications.Api/DfE.ExternalApplications.Api.csproj @@ -1,12 +1,12 @@ - + true $(NoWarn);1591 net10.0 f714ca7a-fc08-46ff-b0cc-373d6f04cf4c - 1.1.5 - 1.1.5 + 1.1.6 + 1.1.6