Skip to content

Commit ce007d6

Browse files
AnjuJose011AnjuJose011
committed
conflicts resloved
2 parents e59cc4d + 6fb6e03 commit ce007d6

File tree

55 files changed

+35721
-22712
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+35721
-22712
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,12 @@
44
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
55

66
version: 2
7-
registries:
8-
tel-azure-package-source:
9-
type: nuget-feed
10-
url: "https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json"
11-
username: "kevin.whittaker"
12-
password: ${{ secrets.AZURE_DEVOPS_PAT }}
13-
nuget-package-source:
14-
type: nuget-feed
15-
url: "https://api.nuget.org/v3/index.json"
167
updates:
178
- package-ecosystem: "nuget"
189
directory: "/" # Location of package manifests
1910
schedule:
2011
interval: "daily"
2112
open-pull-requests-limit: 10
22-
registries:
23-
- tel-azure-package-source
24-
- nuget-package-source
2513
target-branch: "Automatic_version_update_dependabot"
2614
ignore:
2715
# Ignore updates to packages that start with 'Wildcards'

‎.github/workflows/auto-merge.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
echo "Checking CI status for PR #$PR_NUMBER"
3737
3838
# Define the maximum wait time (in seconds) and the polling interval (in seconds)
39-
MAX_WAIT_TIME=600 # 10 minutes
39+
MAX_WAIT_TIME=1800 # 30 minutes
4040
POLL_INTERVAL=10 # Check every 10 seconds
4141
4242
# Initialize a timer
@@ -70,6 +70,11 @@ jobs:
7070
continue
7171
fi
7272
73+
# If any check is still queued, set ALL_COMPLETED to false
74+
if [[ "$status" == "QUEUED" ]]; then
75+
ALL_COMPLETED=false
76+
fi
77+
7378
# If any check is still in progress, set ALL_COMPLETED to false
7479
if [[ "$status" == "IN_PROGRESS" ]]; then
7580
ALL_COMPLETED=false

‎.github/workflows/continuous-integration-workflow.yml‎

Lines changed: 76 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,22 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v3
1212

13-
- name: Setup .NET Core SDK 6.0
13+
- name: Setup .NET Core SDK 8.0
1414
uses: actions/setup-dotnet@v3
1515
with:
16-
dotnet-version: 6.0.x
16+
dotnet-version: 8.0.x
1717

1818
- name: Add Azure artifact
1919
run: dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed' --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
2020

2121
- name: Use Node 12.19 with Yarn
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: '18'
24+
node-version: '18'
25+
cache: 'npm'
26+
27+
- name: Upgrade npm to the latest version
28+
run: npm install -g [email protected]
2529

2630
- name: Typescript install WebUI
2731
run: yarn install --network-timeout 600000 --frozen-lockfile
@@ -42,26 +46,80 @@ jobs:
4246
- name: Setup MSBuild
4347
uses: microsoft/[email protected]
4448

45-
- name: Build SQL Server Database project
49+
- name: Build SQL Server Database Project
4650
run: |
47-
# List all .sqlproj files except for .sqlproj
51+
# Enable strict error handling
52+
$ErrorActionPreference = 'Stop'
53+
54+
# Initialize an error collection
55+
$errors = @()
56+
57+
# List all .sqlproj files
4858
$sqlproj_files = Get-ChildItem -Path . -Filter *.sqlproj -Recurse
49-
50-
# Build each .csproj file
51-
foreach ($sqlproj_file in $sqlproj_files) {
52-
Write-Host "Building $($sqlproj_file.FullName)"
53-
msbuild "$($sqlproj_file.FullName)" /p:Configuration=Release
54-
}
55-
- name: Build solution excluding SQL project
59+
60+
if ($sqlproj_files.Count -eq 0) {
61+
$errors += "No .sqlproj files found."
62+
} else {
63+
foreach ($sqlproj_file in $sqlproj_files) {
64+
Write-Host "Building $($sqlproj_file.FullName)"
65+
try {
66+
$output = &msbuild "$($sqlproj_file.FullName)" /p:Configuration=Release /nologo 2>&1
67+
if (!$?) {
68+
$errors += "Failed to build $($csproj_file.FullName): $output"
69+
}
70+
} catch {
71+
# Capture detailed error information
72+
$errorMessage = "Error building $($sqlproj_file.FullName): $($_.Exception.Message)"
73+
Write-Host $errorMessage
74+
$errors += $errorMessage
75+
}
76+
}
77+
}
78+
79+
# Display all accumulated errors
80+
if ($errors.Count -gt 0) {
81+
Write-Host "SQL Project Build Errors:"
82+
$errors | ForEach-Object { Write-Host $_ }
83+
exit 1
84+
}
85+
86+
- name: Build Solution Excluding SQL Project
5687
run: |
57-
# List all .csproj files except for .sqlproj
88+
# Enable strict error handling
89+
$ErrorActionPreference = 'Stop'
90+
91+
# Initialize an error collection
92+
$errors = @()
93+
94+
# List all .csproj files except .sqlproj
5895
$csproj_files = Get-ChildItem -Path . -Filter *.csproj -Recurse | Where-Object { $_.FullName -notmatch '\\.sqlproj$' }
59-
# Build each .csproj file
60-
foreach ($csproj_file in $csproj_files) {
61-
Write-Host "Building $($csproj_file.FullName)"
62-
dotnet build "$($csproj_file.FullName)"
63-
}
96+
97+
if ($csproj_files.Count -eq 0) {
98+
$errors += "No .csproj files found."
99+
} else {
100+
foreach ($csproj_file in $csproj_files) {
101+
Write-Host "Building $($csproj_file.FullName)"
102+
try {
103+
$output = &dotnet build "$($csproj_file.FullName)" --configuration Release 2>&1
104+
if (!$?) {
105+
$errors += "Failed to build $($csproj_file.FullName): $output"
106+
}
107+
} catch {
108+
# Capture detailed error information
109+
$errorMessage = "Error building $($csproj_file.FullName): $($_.Exception.Message)"
110+
Write-Host $errorMessage
111+
$errors += $errorMessage
112+
}
113+
}
114+
}
64115

116+
# Display all accumulated errors
117+
if ($errors.Count -gt 0) {
118+
Write-Host "Solution Build Errors:"
119+
$errors | ForEach-Object { Write-Host $_ }
120+
exit 1
121+
}
122+
65123
# - name: Test
66124
# run: dotnet test ${{ env.BuildParameters.TestProjects }}
67125

‎AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<AssemblyVersion>1.0.0.0</AssemblyVersion>
6-
<FileVersion>1.0.0.0</FileVersion>
7-
<Version>1.0.0</Version>
8-
<UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
9-
<ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
10-
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
11-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12-
<Platforms>x64</Platforms>
13-
</PropertyGroup>
14-
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
6+
<FileVersion>1.0.0.0</FileVersion>
7+
<Version>1.0.0</Version>
8+
<UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
9+
<ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
10+
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
11+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12+
<Platforms>x64</Platforms>
13+
</PropertyGroup>
1514
<ItemGroup>
1615
<Compile Remove="Views\Notification\**" />
1716
<Content Remove="Views\Notification\**" />
@@ -36,7 +35,6 @@
3635
<ItemGroup>
3736
<_ContentIncludedByDefault Remove="bundleconfig.json" />
3837
</ItemGroup>
39-
4038
<ItemGroup>
4139
<Content Include="node_modules\%40ckeditor\ckeditor5-build-classic\package.json" />
4240
<Content Include="node_modules\%40ckeditor\ckeditor5-core\lang\contexts.json" />
@@ -80,42 +78,40 @@
8078
<Content Include="node_modules\%40ckeditor\ckeditor5-utils\package.json" />
8179
<Content Include="node_modules\%40ckeditor\ckeditor5-vue\package.json" />
8280
</ItemGroup>
83-
8481
<ItemGroup>
8582
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
86-
<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
83+
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
8784
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
8885
<PackageReference Include="BuildWebCompiler" Version="1.12.405" />
89-
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
90-
<PackageReference Include="FluentValidation" Version="10.3.4" />
91-
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
86+
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
87+
<PackageReference Include="FluentValidation" Version="11.11.0" />
88+
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
9289
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
93-
<PackageReference Include="IdentityModel" Version="4.4.0" />
90+
<PackageReference Include="IdentityModel" Version="4.6.0" />
9491
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
95-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
92+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
9693
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
97-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
98-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
99-
<PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
100-
<PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
94+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
95+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
96+
<PackageReference Include="Microsoft.Azure.Management.Media" Version="6.0.0" />
97+
<PackageReference Include="Microsoft.FeatureManagement" Version="4.0.0" />
10198
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
102-
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
103-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.14.1" />
104-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
99+
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
100+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.3.1" />
101+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.3.1" />
105102
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
106-
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
103+
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.7.1">
107104
<PrivateAssets>all</PrivateAssets>
108105
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
109106
</PackageReference>
110-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
107+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.18" />
111108
<PackageReference Include="MK.IO" Version="1.6.0" />
112109
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
113-
<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
114-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
115-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
110+
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
111+
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
112+
<PackageReference Include="System.Drawing.Common" Version="9.0.1" />
113+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.1" />
116114
</ItemGroup>
117-
118-
119115
<ItemGroup>
120116
<Folder Include="Properties\" />
121117
<Folder Include="Scripts\vuesrc\content\upload\" />

‎AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
196196
// Auto Mapper Configurations
197197
var mappingConfig = new MapperConfiguration(mc =>
198198
{
199+
mc.AllowNullCollections = true;
200+
mc.ShouldMapMethod = m => false;
199201
mc.AddProfile(new MappingProfile());
200202
});
201203
IMapper mapper = mappingConfig.CreateMapper();

0 commit comments

Comments
 (0)