Skip to content

Commit 30969ab

Browse files
rshrirohitrshrirohit
committed
Merge branch 'DLS-Release-v1.2.0' into UAT
2 parents 3b73a62 + 78e0adb commit 30969ab

File tree

11 files changed

+428
-188
lines changed

11 files changed

+428
-188
lines changed

‎.github/workflows/build-and-deploy-production.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121

22-
- name: Setup .NET Core SDK 8.0
22+
- name: Setup .NET Core SDK 6.0
2323
uses: actions/setup-dotnet@v4
2424
with:
25-
dotnet-version: 8.0.x
25+
dotnet-version: 6.0.x
2626
- name: Setup node
2727
uses: actions/setup-node@v4
2828
with:

‎.github/workflows/build-and-deploy-uat.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v4
2424

25-
- name: Setup .NET Core SDK 8.0
25+
- name: Setup .NET Core SDK 6.0
2626
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: 8.0.x
28+
dotnet-version: 6.0.x
2929
- name: Setup node
3030
uses: actions/setup-node@v4
3131
with:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414

15-
- name: Setup .NET Core SDK 8.0
15+
- name: Setup .NET Core SDK 6.0
1616
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 8.0.x
18+
dotnet-version: 6.0.x
1919

2020
- name: Add TechnologyEnhancedLearning as nuget package source
2121
run: dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="Dapper" Version="2.1.35" />
2020
<PackageReference Include="FluentMigrator" Version="6.2.0" />
2121
<PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="6.2.0" />
22-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
22+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="ClosedXML" Version="0.95.4" />
14-
<PackageReference Include="Dapper" Version="2.1.24" />
14+
<PackageReference Include="Dapper" Version="2.1.35" />
1515
<PackageReference Include="Dapper.FluentMap" Version="2.0.0" />
1616
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
1717
<PackageReference Include="Freshdesk.Api" Version="0.17.2" />
1818
<PackageReference Include="FuzzySharp" Version="2.0.2" />
1919
<PackageReference Include="MailKit" Version="4.3.0" />
2020
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.0.0" />
2121
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
22-
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
22+
<PackageReference Include="System.Drawing.Common" Version="9.0.1" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
<ItemGroup>
1010
<PackageReference Include="FluentAssertions" Version="5.10.3" />
1111
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1313
<PackageReference Include="Selenium.Axe" Version="4.0.21" />
1414
<PackageReference Include="Selenium.Support" Version="4.27.0" />
15-
<PackageReference Include="Selenium.WebDriver" Version="4.27.0" />
15+
<PackageReference Include="Selenium.WebDriver" Version="4.29.0" />
1616
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="122.0.6261.11100" />
17-
<PackageReference Include="xunit" Version="2.9.2" />
17+
<PackageReference Include="xunit" Version="2.9.3" />
1818
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>
22-
<PackageReference Include="coverlet.collector" Version="6.0.0">
22+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
<PrivateAssets>all</PrivateAssets>
2525
</PackageReference>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<PackageReference Include="FakeItEasy" Version="7.4.0" />
1111
<PackageReference Include="FluentAssertions.AspNetCore.Mvc" Version="3.2.0" />
1212
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
13-
<PackageReference Include="xunit" Version="2.9.2" />
13+
<PackageReference Include="xunit" Version="2.9.3" />
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="6.0.0">
18+
<PackageReference Include="coverlet.collector" Version="6.0.4">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="NBuilder" Version="6.1.0" />
1515
<PackageReference Include="NUnit" Version="3.14.0" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@
6767
<PackageReference Include="FluentMigrator.Runner.SqlServer" Version="6.2.0" />
6868
<PackageReference Include="FuzzySharp" Version="2.0.2" />
6969
<PackageReference Include="GDS.MultiPageFormData" Version="1.0.6" />
70-
<PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
70+
<PackageReference Include="HtmlAgilityPack" Version="1.11.74" />
7171
<PackageReference Include="HtmlSanitizer" Version="8.0.795" />
72-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.29" />
72+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.13" />
7373
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.24" />
74-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
74+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
7575
<PackageReference Include="Microsoft.FeatureManagement" Version="3.1.0" />
7676
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.5.1" />
7777
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.4.2">
@@ -80,11 +80,11 @@
8080
</PackageReference>
8181
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
8282
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
83-
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.24" />
84-
<PackageReference Include="NodaTime" Version="3.1.11" />
83+
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.29" />
84+
<PackageReference Include="NodaTime" Version="3.2.1" />
8585
<PackageReference Include="Npm" Version="3.5.2" />
8686
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
87-
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
87+
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="8.1.0" />
8888
</ItemGroup>
8989

9090
<ItemGroup>

‎DigitalLearningSolutions.Web/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"dependencies": {
2424
"@types/chartist": "^0.11.1",
2525
"chartist": "^0.11.4",
26-
"core-js": "^3.39.0",
26+
"core-js": "^3.40.0",
2727
"date-fns": "^2.30.0",
28-
"dompurify": "^2.5.4",
28+
"dompurify": "^2.5.8",
2929
"input-range-scss": "^1.5.3",
3030
"jodit": "^3.24.9",
3131
"js-cookie": "^3.0.5",
@@ -35,22 +35,22 @@
3535
"regenerator-runtime": "^0.14.1"
3636
},
3737
"devDependencies": {
38-
"@babel/core": "^7.23.6",
39-
"@babel/preset-env": "^7.23.9",
38+
"@babel/core": "^7.26.9",
39+
"@babel/preset-env": "^7.26.9",
4040
"@babel/preset-typescript": "^7.23.3",
4141
"@types/dompurify": "^2.3.3",
4242
"@types/jest": "^27.5.2",
4343
"@types/js-cookie": "^3.0.6",
4444
"@types/js-search": "^1.4.4",
4545
"@types/jsdom": "^16.2.15",
46-
"@types/lodash": "^4.14.202",
46+
"@types/lodash": "^4.17.16",
4747
"@typescript-eslint/eslint-plugin": "^5.62.0",
4848
"@typescript-eslint/parser": "^5.62.0",
4949
"babel-jest": "^28.1.3",
5050
"babel-loader": "^9.2.1",
5151
"eslint": "^8.57.0",
5252
"eslint-config-airbnb-base": "^15.0.0",
53-
"eslint-import-resolver-webpack": "^0.13.8",
53+
"eslint-import-resolver-webpack": "^0.13.10",
5454
"eslint-plugin-import": "^2.31.0",
5555
"eslint-plugin-jasmine": "^4.2.2",
5656
"fork-ts-checker-webpack-plugin": "^9.0.2",
@@ -62,7 +62,7 @@
6262
"rimraf": "^5.0.10",
6363
"ts-node": "^10.9.2",
6464
"typescript": "^4.9.5",
65-
"webpack": "^5.94.0",
65+
"webpack": "^5.97.1",
6666
"webpack-cli": "^5.1.4"
6767
},
6868
"-vs-binding": {

0 commit comments

Comments
 (0)