Skip to content

Commit 217f8f6

Browse files
rshrirohitrshrirohit
authored
Merge pull request #2569 from TechnologyEnhancedLearning/Automatic_version_update_dependabot
TD-1649 Merging dependabot changes to UAT for regression testing
2 parents 3f800dc + 914400e commit 217f8f6

File tree

21 files changed

+2788
-2156
lines changed

21 files changed

+2788
-2156
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
node-version: 20
3333

3434
- name: Typescript install
35-
run: yarn install --frozen-lockfile
35+
run: yarn install --network-timeout 600000 --frozen-lockfile
3636
working-directory: ./DigitalLearningSolutions.Web
3737

3838
- name: Typescript build

‎DigitalLearningSolutions.Data.Migrations/DigitalLearningSolutions.Data.Migrations.csproj‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<None Remove="Resources\CookiePolicy.txt" />
10-
</ItemGroup>
11-
12-
<ItemGroup>
13-
<EmbeddedResource Include="Resources\CookiePolicy.txt">
14-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
15-
</EmbeddedResource>
16-
</ItemGroup>
17-
18-
<ItemGroup>
19-
<PackageReference Include="Dapper" Version="2.0.123" />
20-
<PackageReference Include="FluentMigrator" Version="3.2.9" />
21-
<PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="3.2.9" />
22-
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
23-
</ItemGroup>
24-
25-
<ItemGroup>
26-
<Compile Update="202104220853_FixCustomisationUpdateSPs.cs">
27-
<SubType>Code</SubType>
28-
</Compile>
29-
<Compile Update="Properties\Resources.Designer.cs">
30-
<DesignTime>True</DesignTime>
31-
<AutoGen>True</AutoGen>
32-
<DependentUpon>Resources.resx</DependentUpon>
33-
</Compile>
34-
</ItemGroup>
35-
36-
<ItemGroup>
37-
<EmbeddedResource Update="Properties\Resources.resx">
38-
<Generator>ResXFileCodeGenerator</Generator>
39-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
40-
</EmbeddedResource>
41-
</ItemGroup>
42-
43-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<None Remove="Resources\CookiePolicy.txt" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<EmbeddedResource Include="Resources\CookiePolicy.txt">
14+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
15+
</EmbeddedResource>
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="Dapper" Version="2.1.24" />
20+
<PackageReference Include="FluentMigrator" Version="3.3.2" />
21+
<PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="3.3.2" />
22+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<Compile Update="202104220853_FixCustomisationUpdateSPs.cs">
27+
<SubType>Code</SubType>
28+
</Compile>
29+
<Compile Update="Properties\Resources.Designer.cs">
30+
<DesignTime>True</DesignTime>
31+
<AutoGen>True</AutoGen>
32+
<DependentUpon>Resources.resx</DependentUpon>
33+
</Compile>
34+
</ItemGroup>
35+
36+
<ItemGroup>
37+
<EmbeddedResource Update="Properties\Resources.resx">
38+
<Generator>ResXFileCodeGenerator</Generator>
39+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
40+
</EmbeddedResource>
41+
</ItemGroup>
42+
43+
</Project>

‎DigitalLearningSolutions.Data.Tests/DigitalLearningSolutions.Data.Tests.csproj‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
7-
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
9-
10-
<ItemGroup>
11-
<None Remove="TestData\ActivityDataDownloadTest.xlsx" />
12-
<None Remove="TestData\CourseDelegateExportAllDataDownloadTest.xlsx" />
13-
<None Remove="TestData\CourseDelegateExportCurrentDataDownloadTest.xlsx" />
14-
<None Remove="TestData\DelegateUploadTest.xlsx" />
15-
</ItemGroup>
16-
17-
<ItemGroup>
18-
<PackageReference Include="FluentMigrator" Version="3.2.9" />
19-
<PackageReference Include="FluentMigrator.Runner" Version="3.2.9" />
20-
<PackageReference Include="FluentMigrator.Runner.SqlServer" Version="3.2.9" />
21-
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
22-
<PackageReference Include="NBuilder" Version="6.1.0" />
23-
<PackageReference Include="nunit" Version="3.12.0" />
24-
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
26-
<PackageReference Include="FakeItEasy" Version="6.0.1" />
27-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
28-
<PackageReference Include="FluentAssertions.AspNetCore.Mvc" Version="3.2.0" />
29-
</ItemGroup>
30-
31-
<ItemGroup>
32-
<ProjectReference Include="..\DigitalLearningSolutions.Data.Migrations\DigitalLearningSolutions.Data.Migrations.csproj" />
33-
<ProjectReference Include="..\DigitalLearningSolutions.Data\DigitalLearningSolutions.Data.csproj" />
34-
<ProjectReference Include="..\DigitalLearningSolutions.Web\DigitalLearningSolutions.Web.csproj" />
35-
</ItemGroup>
36-
37-
<ItemGroup>
38-
<Folder Include="Services\" />
39-
</ItemGroup>
40-
41-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
7+
<IsPackable>false</IsPackable>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<None Remove="TestData\ActivityDataDownloadTest.xlsx" />
12+
<None Remove="TestData\CourseDelegateExportAllDataDownloadTest.xlsx" />
13+
<None Remove="TestData\CourseDelegateExportCurrentDataDownloadTest.xlsx" />
14+
<None Remove="TestData\DelegateUploadTest.xlsx" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="FluentMigrator" Version="5.0.0" />
19+
<PackageReference Include="FluentMigrator.Runner" Version="5.0.0" />
20+
<PackageReference Include="FluentMigrator.Runner.SqlServer" Version="5.0.0" />
21+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.2" />
22+
<PackageReference Include="NBuilder" Version="6.1.0" />
23+
<PackageReference Include="nunit" Version="3.14.0" />
24+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
26+
<PackageReference Include="FakeItEasy" Version="7.4.0" />
27+
<PackageReference Include="FluentAssertions" Version="5.10.3" />
28+
<PackageReference Include="FluentAssertions.AspNetCore.Mvc" Version="3.2.0" />
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<ProjectReference Include="..\DigitalLearningSolutions.Data.Migrations\DigitalLearningSolutions.Data.Migrations.csproj" />
33+
<ProjectReference Include="..\DigitalLearningSolutions.Data\DigitalLearningSolutions.Data.csproj" />
34+
<ProjectReference Include="..\DigitalLearningSolutions.Web\DigitalLearningSolutions.Web.csproj" />
35+
</ItemGroup>
36+
37+
<ItemGroup>
38+
<Folder Include="Services\" />
39+
</ItemGroup>
40+
41+
</Project>

‎DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<Compile Remove="Models\Certificates\Certificates.cs" />
10-
</ItemGroup>
11-
12-
<ItemGroup>
13-
<PackageReference Include="ClosedXML" Version="0.95.4" />
14-
<PackageReference Include="Dapper" Version="2.0.35" />
15-
<PackageReference Include="Dapper.FluentMap" Version="2.0.0" />
16-
<PackageReference Include="Freshdesk.Api" Version="0.13.6" />
17-
<PackageReference Include="FuzzySharp" Version="2.0.2" />
18-
<PackageReference Include="MailKit" Version="2.8.0" />
19-
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.0.0" />
20-
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
21-
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
22-
</ItemGroup>
23-
24-
<ItemGroup>
25-
<Folder Include="ViewModels\UserCentreAccount\" />
26-
</ItemGroup>
27-
28-
29-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<Compile Remove="Models\Certificates\Certificates.cs" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="ClosedXML" Version="0.95.4" />
14+
<PackageReference Include="Dapper" Version="2.1.24" />
15+
<PackageReference Include="Dapper.FluentMap" Version="2.0.0" />
16+
<PackageReference Include="Freshdesk.Api" Version="0.13.6" />
17+
<PackageReference Include="FuzzySharp" Version="2.0.2" />
18+
<PackageReference Include="MailKit" Version="4.3.0" />
19+
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.0.0" />
20+
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
21+
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<Folder Include="ViewModels\UserCentreAccount\" />
26+
</ItemGroup>
27+
28+
29+
</Project>

‎DigitalLearningSolutions.Web.AutomatedUiTests/DigitalLearningSolutions.Web.AutomatedUiTests.csproj‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<IsPackable>false</IsPackable>
6-
<UserSecretsId>7298e35a-fc38-4595-80ec-abb0846cd5b8</UserSecretsId>
7-
</PropertyGroup>
8-
9-
<ItemGroup>
10-
<PackageReference Include="FluentAssertions" Version="6.12.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.25" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13-
<PackageReference Include="Selenium.Axe" Version="4.0.15" />
14-
<PackageReference Include="Selenium.Support" Version="4.16.2" />
15-
<PackageReference Include="Selenium.WebDriver" Version="4.16.2" />
16-
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="121.0.6167.18400" />
17-
<PackageReference Include="xunit" Version="2.6.4" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20-
<PrivateAssets>all</PrivateAssets>
21-
</PackageReference>
22-
<PackageReference Include="coverlet.collector" Version="6.0.0">
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24-
<PrivateAssets>all</PrivateAssets>
25-
</PackageReference>
26-
</ItemGroup>
27-
28-
<ItemGroup>
29-
<ProjectReference Include="..\DigitalLearningSolutions.Web\DigitalLearningSolutions.Web.csproj" />
30-
</ItemGroup>
31-
32-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<IsPackable>false</IsPackable>
6+
<UserSecretsId>7298e35a-fc38-4595-80ec-abb0846cd5b8</UserSecretsId>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="FluentAssertions" Version="5.10.3" />
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.25" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13+
<PackageReference Include="Selenium.Axe" Version="4.0.14" />
14+
<PackageReference Include="Selenium.Support" Version="4.16.2" />
15+
<PackageReference Include="Selenium.WebDriver" Version="4.16.2" />
16+
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="122.0.6261.11100" />
17+
<PackageReference Include="xunit" Version="2.6.2" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
19+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20+
<PrivateAssets>all</PrivateAssets>
21+
</PackageReference>
22+
<PackageReference Include="coverlet.collector" Version="6.0.0">
23+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24+
<PrivateAssets>all</PrivateAssets>
25+
</PackageReference>
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<ProjectReference Include="..\DigitalLearningSolutions.Web\DigitalLearningSolutions.Web.csproj" />
30+
</ItemGroup>
31+
32+
</Project>

‎DigitalLearningSolutions.Web.IntegrationTests/DigitalLearningSolutions.Web.IntegrationTests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="FakeItEasy" Version="6.0.1" />
10+
<PackageReference Include="FakeItEasy" Version="7.4.0" />
1111
<PackageReference Include="FluentAssertions.AspNetCore.Mvc" Version="3.2.0" />
12-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
13-
<PackageReference Include="xunit" Version="2.4.1" />
12+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.25" />
13+
<PackageReference Include="xunit" Version="2.6.2" />
1414
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
18-
<PackageReference Include="coverlet.collector" Version="1.3.0">
18+
<PackageReference Include="coverlet.collector" Version="6.0.0">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>

‎DigitalLearningSolutions.Web.Tests/DigitalLearningSolutions.Web.Tests.csproj‎

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

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -8,13 +8,13 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="FakeItEasy" Version="6.0.1" />
11+
<PackageReference Include="FakeItEasy" Version="7.4.0" />
1212
<PackageReference Include="FluentAssertions" Version="5.10.3" />
1313
<PackageReference Include="FluentAssertions.AspNetCore.Mvc" Version="3.2.0" />
1414
<PackageReference Include="NBuilder" Version="6.1.0" />
15-
<PackageReference Include="NUnit" Version="3.12.0" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0-beta.1" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0-preview-20200428-01" />
15+
<PackageReference Include="NUnit" Version="3.14.0" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj‎

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

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -61,24 +61,28 @@
6161
</ItemGroup>
6262

6363
<ItemGroup>
64-
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
65-
<PackageReference Include="FluentMigrator" Version="3.2.9" />
66-
<PackageReference Include="FluentMigrator.Runner" Version="3.2.9" />
67-
<PackageReference Include="FluentMigrator.Runner.SqlServer" Version="3.2.9" />
64+
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
65+
<PackageReference Include="FluentMigrator" Version="3.3.2" />
66+
<PackageReference Include="FluentMigrator.Runner" Version="3.3.2" />
67+
<PackageReference Include="FluentMigrator.Runner.SqlServer" Version="3.3.2" />
6868
<PackageReference Include="FuzzySharp" Version="2.0.2" />
6969
<PackageReference Include="GDS.MultiPageFormData" Version="1.0.6" />
70-
<PackageReference Include="HtmlAgilityPack" Version="1.11.28" />
71-
<PackageReference Include="HtmlSanitizer" Version="7.1.542" />
72-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.4" />
73-
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
74-
<PackageReference Include="Microsoft.FeatureManagement" Version="2.5.1" />
70+
<PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
71+
<PackageReference Include="HtmlSanitizer" Version="8.0.795" />
72+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.24" />
73+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
74+
<PackageReference Include="Microsoft.FeatureManagement" Version="3.1.0" />
7575
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.5.1" />
76+
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.4.2">
77+
<PrivateAssets>all</PrivateAssets>
78+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
79+
</PackageReference>
7680
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
77-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.2" />
78-
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.13" />
81+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
82+
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.24" />
7983
<PackageReference Include="Npm" Version="3.5.2" />
80-
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
81-
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="5.5.0" />
84+
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
85+
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
8286
</ItemGroup>
8387

8488
<ItemGroup>

0 commit comments

Comments
 (0)