Skip to content

Commit 23cc87f

Browse files
author
Binon
committed
Revering cpm changes
1 parent 03175ed commit 23cc87f

File tree

32 files changed

+1810
-1627
lines changed

32 files changed

+1810
-1627
lines changed

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

Lines changed: 644 additions & 630 deletions
Large diffs are not rendered by default.

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- Enable centralised version control for packages -->
5-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
66
</PropertyGroup>
77

88

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<ImplicitUsings>enable</ImplicitUsings>
5-
<Nullable>enable</Nullable>
6-
<IsPackable>false</IsPackable>
7-
<GenerateDocumentationFile>True</GenerateDocumentationFile>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<PackageReference Include="FluentAssertions" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
13-
<PackageReference Include="Selenium.Axe" />
14-
<PackageReference Include="Selenium.Support" />
15-
<PackageReference Include="Selenium.WebDriver" />
16-
<PackageReference Include="Selenium.WebDriver.ChromeDriver" />
17-
<PackageReference Include="Serilog.AspNetCore" />
18-
<PackageReference Include="xunit" />
19-
<PackageReference Include="xunit.runner.visualstudio">
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
<PrivateAssets>all</PrivateAssets>
22-
</PackageReference>
23-
<PackageReference Include="coverlet.collector">
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25-
<PrivateAssets>all</PrivateAssets>
26-
</PackageReference>
27-
</ItemGroup>
28-
<ItemGroup>
29-
<ProjectReference Include="..\LearningHub.Nhs.WebUI\LearningHub.Nhs.WebUI.csproj" />
30-
</ItemGroup>
31-
</Project>
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
8+
<IsPackable>false</IsPackable>
9+
10+
<GenerateDocumentationFile>True</GenerateDocumentationFile>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
17+
<PackageReference Include="Selenium.Axe" Version="4.0.19" />
18+
<PackageReference Include="Selenium.Support" Version="4.19.0" />
19+
<PackageReference Include="Selenium.WebDriver" Version="4.19.0" />
20+
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="133.0.6943.5300" />
21+
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
22+
<PackageReference Include="xunit" Version="2.4.1" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
24+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25+
<PrivateAssets>all</PrivateAssets>
26+
</PackageReference>
27+
<PackageReference Include="coverlet.collector" Version="1.3.0">
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29+
<PrivateAssets>all</PrivateAssets>
30+
</PackageReference>
31+
</ItemGroup>
32+
33+
<ItemGroup>
34+
<ProjectReference Include="..\LearningHub.Nhs.WebUI\LearningHub.Nhs.WebUI.csproj" />
35+
</ItemGroup>
36+
37+
</Project>

LearningHub.Nhs.WebUI.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
ProjectSection(SolutionItems) = preProject
1010
Directory.Build.props = Directory.Build.props
1111
Directory.Packages.props = Directory.Packages.props
12-
nuget.config = nuget.config
1312
StyleCop.ruleset = StyleCop.ruleset
1413
EndProjectSection
1514
EndProject

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

Lines changed: 255 additions & 241 deletions
Large diffs are not rendered by default.
Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
5-
<Nullable>enable</Nullable>
6-
<Platforms>x64</Platforms>
7-
</PropertyGroup>
8-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9-
<CodeAnalysisRuleSet />
10-
</PropertyGroup>
11-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
12-
<CodeAnalysisRuleSet />
13-
</PropertyGroup>
14-
<ItemGroup>
15-
<PackageReference Include="LearningHub.Nhs.Models" />
16-
<PackageReference Include="NLog.Web.AspNetCore" />
17-
</ItemGroup>
18-
</Project>
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6+
<Nullable>enable</Nullable>
7+
<Platforms>x64</Platforms>
8+
</PropertyGroup>
9+
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
11+
<CodeAnalysisRuleSet />
12+
</PropertyGroup>
13+
14+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
15+
<CodeAnalysisRuleSet />
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
20+
<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
21+
</ItemGroup>
22+
23+
</Project>
Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<RootNamespace>LearningHub.Nhs.OpenApi.Repositories.Interface</RootNamespace>
5-
<Nullable>enable</Nullable>
6-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7-
<Platforms>x64</Platforms>
8-
</PropertyGroup>
9-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
10-
<CodeAnalysisRuleSet />
11-
</PropertyGroup>
12-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
13-
<CodeAnalysisRuleSet />
14-
</PropertyGroup>
15-
<ItemGroup>
16-
<PackageReference Include="Microsoft.EntityFrameworkCore" />
17-
</ItemGroup>
18-
<ItemGroup>
19-
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Models\LearningHub.Nhs.OpenApi.Models.csproj" />
20-
</ItemGroup>
21-
</Project>
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<RootNamespace>LearningHub.Nhs.OpenApi.Repositories.Interface</RootNamespace>
6+
<Nullable>enable</Nullable>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
8+
<Platforms>x64</Platforms>
9+
</PropertyGroup>
10+
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
12+
<CodeAnalysisRuleSet />
13+
</PropertyGroup>
14+
15+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
16+
<CodeAnalysisRuleSet />
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Models\LearningHub.Nhs.OpenApi.Models.csproj" />
25+
</ItemGroup>
26+
27+
</Project>
Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<RootNamespace>LearningHub.Nhs.OpenApi.Repositories</RootNamespace>
5-
<Nullable>enable</Nullable>
6-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7-
<Platforms>x64</Platforms>
8-
</PropertyGroup>
9-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
10-
<CodeAnalysisRuleSet />
11-
</PropertyGroup>
12-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
13-
<CodeAnalysisRuleSet />
14-
</PropertyGroup>
15-
<ItemGroup>
16-
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Repositories.Interface\LearningHub.Nhs.OpenApi.Repositories.Interface.csproj" />
17-
</ItemGroup>
18-
<ItemGroup>
19-
<PackageReference Include="AutoMapper" />
20-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" />
21-
<PackageReference Include="IdentityModel" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
25-
<PackageReference Include="NLog.Web.AspNetCore" />
26-
</ItemGroup>
27-
</Project>
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<RootNamespace>LearningHub.Nhs.OpenApi.Repositories</RootNamespace>
6+
<Nullable>enable</Nullable>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
8+
<Platforms>x64</Platforms>
9+
</PropertyGroup>
10+
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
12+
<CodeAnalysisRuleSet />
13+
</PropertyGroup>
14+
15+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
16+
<CodeAnalysisRuleSet />
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Repositories.Interface\LearningHub.Nhs.OpenApi.Repositories.Interface.csproj" />
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<PackageReference Include="AutoMapper" Version="10.1.1" />
25+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
26+
<PackageReference Include="IdentityModel" Version="4.6.0" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
30+
<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
31+
</ItemGroup>
32+
33+
</Project>
Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<Nullable>enable</Nullable>
5-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6-
<Platforms>x64</Platforms>
7-
</PropertyGroup>
8-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9-
<CodeAnalysisRuleSet />
10-
</PropertyGroup>
11-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
12-
<CodeAnalysisRuleSet />
13-
</PropertyGroup>
14-
<ItemGroup>
15-
<PackageReference Include="elfhHub.Nhs.Models" />
16-
<PackageReference Include="LearningHub.Nhs.Models" />
17-
</ItemGroup>
18-
<ItemGroup>
19-
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Models\LearningHub.Nhs.OpenApi.Models.csproj" />
20-
</ItemGroup>
21-
</Project>
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7+
<Platforms>x64</Platforms>
8+
</PropertyGroup>
9+
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
11+
<CodeAnalysisRuleSet />
12+
</PropertyGroup>
13+
14+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
15+
<CodeAnalysisRuleSet />
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
20+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Models\LearningHub.Nhs.OpenApi.Models.csproj" />
25+
</ItemGroup>
26+
27+
</Project>
Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<RootNamespace>LearningHub.Nhs.OpenApi.Services</RootNamespace>
5-
<Nullable>enable</Nullable>
6-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7-
<Platforms>x64</Platforms>
8-
</PropertyGroup>
9-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
10-
<CodeAnalysisRuleSet />
11-
</PropertyGroup>
12-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
13-
<CodeAnalysisRuleSet />
14-
</PropertyGroup>
15-
<ItemGroup>
16-
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Repositories.Interface\LearningHub.Nhs.OpenApi.Repositories.Interface.csproj" />
17-
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Repositories\LearningHub.Nhs.OpenApi.Repositories.csproj" />
18-
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Services.Interface\LearningHub.Nhs.OpenApi.Services.Interface.csproj" />
19-
</ItemGroup>
20-
<ItemGroup>
21-
<PackageReference Include="Azure.Storage.Queues" />
22-
<PackageReference Include="FluentValidation.AspNetCore" />
23-
<PackageReference Include="IdentityModel" />
24-
<PackageReference Include="Azure.Storage.Blobs" />
25-
<PackageReference Include="Azure.Storage.Files.Shares" />
26-
<PackageReference Include="LearningHub.Nhs.Caching" />
27-
<PackageReference Include="elfhHub.Nhs.Models" />
28-
<PackageReference Include="LearningHub.Nhs.Models" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
30-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
31-
<PackageReference Include="System.Configuration.ConfigurationManager" />
32-
<PackageReference Include="Newtonsoft.Json" />
33-
<PackageReference Include="NLog.Web.AspNetCore" />
34-
</ItemGroup>
35-
</Project>
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<RootNamespace>LearningHub.Nhs.OpenApi.Services</RootNamespace>
6+
<Nullable>enable</Nullable>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
8+
<Platforms>x64</Platforms>
9+
</PropertyGroup>
10+
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
12+
<CodeAnalysisRuleSet />
13+
</PropertyGroup>
14+
15+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
16+
<CodeAnalysisRuleSet />
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Repositories.Interface\LearningHub.Nhs.OpenApi.Repositories.Interface.csproj" />
21+
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Repositories\LearningHub.Nhs.OpenApi.Repositories.csproj" />
22+
<ProjectReference Include="..\LearningHub.Nhs.OpenApi.Services.Interface\LearningHub.Nhs.OpenApi.Services.Interface.csproj" />
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
27+
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
28+
<PackageReference Include="IdentityModel" Version="4.6.0" />
29+
<PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
30+
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
31+
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
32+
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
33+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
35+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
36+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
37+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
38+
<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
39+
</ItemGroup>
40+
41+
</Project>

0 commit comments

Comments
 (0)