Skip to content

Commit 669266e

Browse files
swapnamol-abrahamswapnamol-abraham
authored
Merge pull request #856 from TechnologyEnhancedLearning/Develop/Fixes/TD-4168-Framework_Upgrade
Develop/fixes/td 4168 framework upgrade
2 parents 0117c8e + 8af244f commit 669266e

File tree

39 files changed

+283
-247
lines changed

39 files changed

+283
-247
lines changed

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

Lines changed: 41 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
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+
<UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
6+
<ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
7+
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
8+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9+
<Platforms>x64</Platforms>
10+
</PropertyGroup>
1511
<ItemGroup>
1612
<Compile Remove="Views\Notification\**" />
1713
<Content Remove="Views\Notification\**" />
@@ -36,7 +32,39 @@
3632
<ItemGroup>
3733
<_ContentIncludedByDefault Remove="bundleconfig.json" />
3834
</ItemGroup>
39-
35+
<ItemGroup>
36+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
37+
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
38+
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
39+
<PackageReference Include="BuildWebCompiler" Version="1.12.405" />
40+
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
41+
<PackageReference Include="FluentValidation" Version="11.11.0" />
42+
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
43+
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
44+
<PackageReference Include="IdentityModel" Version="4.4.0" />
45+
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
46+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
47+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
48+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
49+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
50+
<PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
51+
<PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
52+
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
53+
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
54+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.2.1" />
55+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
56+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
57+
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
58+
<PrivateAssets>all</PrivateAssets>
59+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
60+
</PackageReference>
61+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
62+
<PackageReference Include="MK.IO" Version="1.6.0" />
63+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
64+
<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
65+
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
66+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
67+
</ItemGroup>
4068
<ItemGroup>
4169
<Content Include="node_modules\%40ckeditor\ckeditor5-build-classic\package.json" />
4270
<Content Include="node_modules\%40ckeditor\ckeditor5-core\lang\contexts.json" />
@@ -80,42 +108,6 @@
80108
<Content Include="node_modules\%40ckeditor\ckeditor5-utils\package.json" />
81109
<Content Include="node_modules\%40ckeditor\ckeditor5-vue\package.json" />
82110
</ItemGroup>
83-
84-
<ItemGroup>
85-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
86-
<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
87-
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
88-
<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" />
92-
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
93-
<PackageReference Include="IdentityModel" Version="4.4.0" />
94-
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
95-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
96-
<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" />
101-
<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" />
105-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
106-
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
107-
<PrivateAssets>all</PrivateAssets>
108-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
109-
</PackageReference>
110-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
111-
<PackageReference Include="MK.IO" Version="1.6.0" />
112-
<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" />
116-
</ItemGroup>
117-
118-
119111
<ItemGroup>
120112
<Folder Include="Properties\" />
121113
<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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
56
<AssemblyVersion>1.0.0.0</AssemblyVersion>
67
<FileVersion>1.0.0.0</FileVersion>
78
<Version>1.0.0</Version>
8-
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
99
<UserSecretsId>a2ecb5d2-cf13-4551-9cb6-3d86dfbcf8ef</UserSecretsId>
1010
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -104,10 +104,10 @@
104104

105105

106106
<ItemGroup>
107-
<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
107+
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
108108
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
109-
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
110-
<PackageReference Include="GDS.MultiPageFormData" Version="1.0.5" />
109+
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
110+
<PackageReference Include="GDS.MultiPageFormData" Version="1.0.5" />
111111
<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
112112
<PackageReference Include="IdentityModel" Version="4.3.0" />
113113
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
@@ -133,7 +133,7 @@
133133
<PrivateAssets>all</PrivateAssets>
134134
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
135135
</PackageReference>
136-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0" />
136+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0" />
137137
<PackageReference Include="tusdotnet" Version="2.5.0" />
138138
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
139139
<PrivateAssets>all</PrivateAssets>

‎LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
131131
opt.DefaultExpiryInMinutes = 60;
132132
});
133133

134+
services.AddControllersWithViews().AddNewtonsoftJson();
134135
services.AddControllersWithViews().AddRazorRuntimeCompilation();
135136

136137
services.AddFeatureManagement();

‎OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.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
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<Nullable>enable</Nullable>
77
<Platforms>x64</Platforms>

‎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: 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
<Nullable>enable</Nullable>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<Platforms>x64</Platforms>

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

Lines changed: 3 additions & 3 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>
@@ -22,12 +22,12 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
25+
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
2626
<PackageReference Include="IdentityModel" Version="4.3.0" />
2727
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
2828
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
2929
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
30-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
30+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3131
<PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
3232
</ItemGroup>
3333

0 commit comments

Comments
 (0)