Skip to content

Commit 373fbf7

Browse files
binonbinon
committed
Resolving RC conflicts
2 parents 54f44e2 + fc01ec7 commit 373fbf7

File tree

42 files changed

+245
-204
lines changed

Some content is hidden

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

42 files changed

+245
-204
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ 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

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

Lines changed: 14 additions & 19 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,19 +78,18 @@
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" />
8683
<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" />
86+
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
9087
<PackageReference Include="FluentValidation" Version="11.11.0" />
91-
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
88+
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
9289
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
9390
<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" />
9794
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
9895
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
@@ -115,8 +112,6 @@
115112
<PackageReference Include="System.Drawing.Common" Version="9.0.1" />
116113
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.1" />
117114
</ItemGroup>
118-
119-
120115
<ItemGroup>
121116
<Folder Include="Properties\" />
122117
<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();

‎LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyVersion>1.0.0.0</AssemblyVersion>
66
<FileVersion>1.0.0.0</FileVersion>
77
<Version>1.0.0</Version>
@@ -106,13 +106,13 @@
106106
<ItemGroup>
107107
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
108108
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
109-
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
110-
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
109+
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
110+
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
111111
<PackageReference Include="GDS.MultiPageFormData" Version="1.0.6" />
112112
<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
113113
<PackageReference Include="IdentityModel" Version="4.6.0" />
114114
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
115-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
115+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
116116
<PackageReference Include="linqtotwitter" Version="6.9.0" />
117117
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
118118
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />

‎OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<Nullable>enable</Nullable>
77
<Platforms>x64</Platforms>
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
19+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
2020
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
2121
</ItemGroup>
2222

‎OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<RootNamespace>LearningHub.Nhs.OpenApi.Repositories.Interface</RootNamespace>
66
<Nullable>enable</Nullable>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ public static class ServiceMappings
2424
/// <param name="services">The IServiceCollection.</param>
2525
public static void ConfigureAutomapper(this IServiceCollection services)
2626
{
27-
var mappingConfig = new MapperConfiguration(mc => { mc.AddProfile(new MappingProfile()); });
27+
var mappingConfig = new MapperConfiguration(mc =>
28+
{
29+
mc.AllowNullCollections = true;
30+
mc.ShouldMapMethod = m => false;
31+
mc.AddProfile(new MappingProfile());
32+
});
33+
2834
IMapper mapper = mappingConfig.CreateMapper();
2935
services.AddSingleton(mapper);
3036
}

‎OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<RootNamespace>LearningHub.Nhs.OpenApi.Repositories</RootNamespace>
66
<Nullable>enable</Nullable>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<Platforms>x64</Platforms>
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
19+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<RootNamespace>LearningHub.Nhs.OpenApi.Services</RootNamespace>
66
<Nullable>enable</Nullable>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -23,12 +23,12 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
26-
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
26+
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
2727
<PackageReference Include="IdentityModel" Version="4.6.0" />
28-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
28+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
2929
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
3030
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
31-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
31+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3232
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
3333
</ItemGroup>
3434

0 commit comments

Comments
 (0)