Skip to content

Commit 37353fe

Browse files
AnjuJose011AnjuJose011
authored
Merge pull request #206 from TechnologyEnhancedLearning/Reverting-CPM-Chnages
Revert CPM from RC
2 parents 25f997d + 0b2189b commit 37353fe

File tree

12 files changed

+273
-225
lines changed

12 files changed

+273
-225
lines changed

‎Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<TargetFramework>net8.0</TargetFramework>
45
<GenerateDocumentationFile>true</GenerateDocumentationFile>
56
<IsPackable>false</IsPackable>
6-
<Platforms>x64</Platforms>
7+
<Platforms>x64</Platforms>
78
</PropertyGroup>
9+
10+
811
<ItemGroup>
9-
<PackageReference Include="elfhHub.Nhs.Models" />
10-
<PackageReference Include="LearningHub.Nhs.Models" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
12-
<PackageReference Include="Microsoft.TestPlatform.TestHost" />
13-
<PackageReference Include="Moq" />
14-
<PackageReference Include="StyleCop.Analyzers">
12+
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
13+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
15+
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.12.0" />
16+
<PackageReference Include="Moq" Version="4.20.72" />
17+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1518
<PrivateAssets>all</PrivateAssets>
1619
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1720
</PackageReference>
18-
<PackageReference Include="xunit" />
19-
<PackageReference Include="xunit.runner.visualstudio">
21+
<PackageReference Include="xunit" Version="2.9.3" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
2023
<PrivateAssets>all</PrivateAssets>
2124
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2225
</PackageReference>
2326
</ItemGroup>
27+
2428
<ItemGroup>
2529
<ProjectReference Include="..\LearningHub.Nhs.Auth\LearningHub.Nhs.Auth.csproj" />
2630
</ItemGroup>
27-
</Project>
31+
32+
</Project>

‎Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj‎

Lines changed: 145 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,145 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<UserSecretsId>00EF27C2-ECB6-4E37-A6B6-58E4E6189D0E</UserSecretsId>
5-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6-
<Platforms>x64</Platforms>
7-
</PropertyGroup>
8-
<ItemGroup>
9-
<Content Remove="compilerconfig.json" />
10-
</ItemGroup>
11-
<ItemGroup>
12-
<None Remove="CustomDictionary.xml" />
13-
<None Remove="Styles\auth.disability-matters.scss" />
14-
<None Remove="Styles\auth.eintegrity.scss" />
15-
<None Remove="Styles\auth.elfhHub.scss" />
16-
<None Remove="Styles\auth.etft.scss" />
17-
<None Remove="Styles\auth.minded.scss" />
18-
<None Remove="Styles\auth.population-wellbeing.scss" />
19-
<None Remove="Styles\auth.scss" />
20-
<None Remove="Styles\auth.vlp.scss" />
21-
<None Remove="Styles\site.scss" />
22-
<None Remove="Styles\sso.scss" />
23-
<None Remove="Styles\temp.css" />
24-
<None Remove="Styles\_mixins.scss" />
25-
<None Remove="Styles\_variables.scss" />
26-
</ItemGroup>
27-
<ItemGroup>
28-
<CodeAnalysisDictionary Include="CustomDictionary.xml">
29-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
30-
</CodeAnalysisDictionary>
31-
</ItemGroup>
32-
<ItemGroup>
33-
<Content Include="Styles\auth.disability-matters.scss">
34-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
35-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
36-
</Content>
37-
<Content Include="Styles\auth.eintegrity.scss">
38-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
39-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
40-
</Content>
41-
<Content Include="Styles\auth.elfhHub.scss">
42-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
43-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
44-
</Content>
45-
<Content Include="Styles\auth.etft.scss">
46-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
47-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
48-
</Content>
49-
<Content Include="Styles\auth.minded.scss">
50-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
51-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
52-
</Content>
53-
<Content Include="Styles\auth.population-wellbeing.scss">
54-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
55-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
56-
</Content>
57-
<Content Include="Styles\auth.scss">
58-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
59-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
60-
</Content>
61-
<Content Include="Styles\auth.vlp.scss">
62-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
63-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
64-
</Content>
65-
<Content Include="Styles\site.scss">
66-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
67-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
68-
</Content>
69-
<Content Include="Styles\sso.scss">
70-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
71-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
72-
</Content>
73-
<Content Include="Styles\temp.css">
74-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
75-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
76-
</Content>
77-
<Content Include="Styles\_mixins.scss">
78-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
79-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
80-
</Content>
81-
<Content Include="Styles\_variables.scss">
82-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
83-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
84-
</Content>
85-
</ItemGroup>
86-
<ItemGroup>
87-
<None Include="..\.editorconfig" Link=".editorconfig" />
88-
<None Include="compilerconfig.json" />
89-
</ItemGroup>
90-
<ItemGroup>
91-
<PackageReference Include="AutoMapper" />
92-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" />
93-
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" />
94-
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" />
95-
<PackageReference Include="Azure.Identity" />
96-
<PackageReference Include="elfhHub.Nhs.Models" />
97-
<PackageReference Include="FluentValidation" />
98-
<PackageReference Include="IdentityServer4" />
99-
<PackageReference Include="IdentityServer4.Contrib.RedisStore" />
100-
<PackageReference Include="LearningHub.Nhs.Caching" />
101-
<PackageReference Include="LearningHub.Nhs.Models" />
102-
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
103-
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
104-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
105-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
106-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
107-
<PackageReference Include="NHSUKViewComponents.Web" />
108-
<PackageReference Include="NLog.Web.AspNetCore" />
109-
<PackageReference Include="StyleCop.Analyzers">
110-
<PrivateAssets>all</PrivateAssets>
111-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
112-
</PackageReference>
113-
<PackageReference Include="System.Data.SqlClient" />
114-
<PackageReference Include="UAParser" />
115-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
116-
</ItemGroup>
117-
<ItemGroup>
118-
<Content Update="appsettings.json">
119-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
120-
</Content>
121-
<Content Update="NLog.config">
122-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
123-
</Content>
124-
</ItemGroup>
125-
<ItemGroup>
126-
<Folder Include="wwwroot\images\client-logos\" />
127-
</ItemGroup>
128-
<ProjectExtensions>
129-
<VisualStudio>
130-
<UserProperties appsettings_1json__JsonSchema="" />
131-
</VisualStudio>
132-
</ProjectExtensions>
133-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<UserSecretsId>00EF27C2-ECB6-4E37-A6B6-58E4E6189D0E</UserSecretsId>
6+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7+
<Platforms>x64</Platforms>
8+
</PropertyGroup>
9+
10+
11+
<ItemGroup>
12+
<Content Remove="compilerconfig.json" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<None Remove="CustomDictionary.xml" />
17+
<None Remove="Styles\auth.disability-matters.scss" />
18+
<None Remove="Styles\auth.eintegrity.scss" />
19+
<None Remove="Styles\auth.elfhHub.scss" />
20+
<None Remove="Styles\auth.etft.scss" />
21+
<None Remove="Styles\auth.minded.scss" />
22+
<None Remove="Styles\auth.population-wellbeing.scss" />
23+
<None Remove="Styles\auth.scss" />
24+
<None Remove="Styles\auth.vlp.scss" />
25+
<None Remove="Styles\site.scss" />
26+
<None Remove="Styles\sso.scss" />
27+
<None Remove="Styles\temp.css" />
28+
<None Remove="Styles\_mixins.scss" />
29+
<None Remove="Styles\_variables.scss" />
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<CodeAnalysisDictionary Include="CustomDictionary.xml">
34+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
35+
</CodeAnalysisDictionary>
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
<Content Include="Styles\auth.disability-matters.scss">
40+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
41+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
42+
</Content>
43+
<Content Include="Styles\auth.eintegrity.scss">
44+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
45+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
46+
</Content>
47+
<Content Include="Styles\auth.elfhHub.scss">
48+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
49+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
50+
</Content>
51+
<Content Include="Styles\auth.etft.scss">
52+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
53+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
54+
</Content>
55+
<Content Include="Styles\auth.minded.scss">
56+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
57+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
58+
</Content>
59+
<Content Include="Styles\auth.population-wellbeing.scss">
60+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
61+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
62+
</Content>
63+
<Content Include="Styles\auth.scss">
64+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
65+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
66+
</Content>
67+
<Content Include="Styles\auth.vlp.scss">
68+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
69+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
70+
</Content>
71+
<Content Include="Styles\site.scss">
72+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
73+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
74+
</Content>
75+
<Content Include="Styles\sso.scss">
76+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
77+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
78+
</Content>
79+
<Content Include="Styles\temp.css">
80+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
81+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
82+
</Content>
83+
<Content Include="Styles\_mixins.scss">
84+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
85+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
86+
</Content>
87+
<Content Include="Styles\_variables.scss">
88+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
89+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
90+
</Content>
91+
</ItemGroup>
92+
93+
<ItemGroup>
94+
<None Include="..\.editorconfig" Link=".editorconfig" />
95+
<None Include="compilerconfig.json" />
96+
</ItemGroup>
97+
98+
<ItemGroup>
99+
<PackageReference Include="AutoMapper" Version="10.1.1" />
100+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
101+
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.4.0" />
102+
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.3.0" />
103+
<PackageReference Include="Azure.Identity" Version="1.13.2" />
104+
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
105+
<PackageReference Include="FluentValidation" Version="11.11.0" />
106+
<PackageReference Include="IdentityServer4" Version="4.1.2" />
107+
<PackageReference Include="IdentityServer4.Contrib.RedisStore" Version="4.0.0" />
108+
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
109+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
110+
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.0" />
111+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
112+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
113+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
114+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
115+
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.27" />
116+
<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
117+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
118+
<PrivateAssets>all</PrivateAssets>
119+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
120+
</PackageReference>
121+
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
122+
<PackageReference Include="UAParser" Version="3.1.47" />
123+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
124+
</ItemGroup>
125+
126+
<ItemGroup>
127+
<Content Update="appsettings.json">
128+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
129+
</Content>
130+
<Content Update="NLog.config">
131+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
132+
</Content>
133+
</ItemGroup>
134+
135+
<ItemGroup>
136+
<Folder Include="wwwroot\images\client-logos\" />
137+
</ItemGroup>
138+
139+
<ProjectExtensions>
140+
<VisualStudio>
141+
<UserProperties appsettings_1json__JsonSchema="" />
142+
</VisualStudio>
143+
</ProjectExtensions>
144+
145+
</Project>

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<CodeAnalysisRuleSet>$(SolutionDir)StyleCop.ruleset</CodeAnalysisRuleSet>
55
</PropertyGroup>
66
<ItemGroup>
7-
<!--<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />-->
7+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
88
<AdditionalFiles Include="$(SolutionDir)StyleCop.json" Link="StyleCop.json" />
99
</ItemGroup>
1010
</Project>

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<!-- Enable centralised version control for packages -->
4-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
55
</PropertyGroup>
66

77
<ItemGroup>

‎LearningHub.Nhs.UserApi.Repository.Interface/LearningHub.Nhs.UserApi.Repository.Interface.csproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<TargetFramework>net8.0</TargetFramework>
45
<GenerateDocumentationFile>true</GenerateDocumentationFile>
56
<IsPackable>false</IsPackable>
6-
<Platforms>x64</Platforms>
7+
<Platforms>x64</Platforms>
78
</PropertyGroup>
9+
810
<ItemGroup>
9-
<PackageReference Include="elfhHub.Nhs.Models" />
10-
<PackageReference Include="LearningHub.Nhs.Models" />
11-
<PackageReference Include="StyleCop.Analyzers">
11+
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
12+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
13+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1214
<PrivateAssets>all</PrivateAssets>
1315
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1416
</PackageReference>
1517
</ItemGroup>
18+
1619
<ItemGroup>
1720
<ProjectReference Include="..\LearningHub.Nhs.UserApi.Shared\LearningHub.Nhs.UserApi.Shared.csproj" />
1821
</ItemGroup>
19-
</Project>
22+
23+
</Project>

0 commit comments

Comments
 (0)