Merge pull request #1034 from TechnologyEnhancedLearning/RC

Merge LH Dhalia release  changes to master

Author: AnjuJose011

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

@@ -18,10 +18,10 @@ jobs:
       - name: Add Azure artifact
         run: dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed'  --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text      
 
-      - name: Use Node 12.19 with Yarn
+      - name: Use Node 20 with Yarn
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'npm'
 
       - name: Upgrade npm to the latest version

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

@@ -107,7 +107,7 @@
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.18" />
 		<PackageReference Include="MK.IO" Version="1.6.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
 		<PackageReference Include="System.Drawing.Common" Version="9.0.1" />
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.1" />

AdminUI/LearningHub.Nhs.AdminUI/package-lock.json

@@ -22,13 +22,13 @@
   "dependencies": {
     "@ckeditor/ckeditor5-build-classic": "16.0.0",
     "@ckeditor/ckeditor5-vue": "1.0.3",
-    "@mediakind/mkplayer": "^1.15.0",
+    "@mediakind/mkplayer": "^1.19.0",
     "axios": "^0.19.1",
     "babel-polyfill": "^6.26.0",
     "bootstrap": "^4.6.2",
     "ckeditor4-vue": "^0.2.0",
     "concurrently": "^7.6.0",
-    "core-js": "^3.40.0",
+    "core-js": "^3.41.0",
     "js-cookie": "2.2.1",
     "lodash": "4.17.21",
     "moment": "^2.30.1",
@@ -52,16 +52,16 @@
     "vuex": "^3.6.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.7",
-    "@babel/preset-env": "^7.26.7",
+    "@babel/preset-env": "^7.26.9",
+    "@babel/core": "^7.26.9",
     "@types/axios": "^0.14.0",
     "@types/bootstrap": "4.1.3",
     "@types/ckeditor": "4.9.10",
     "@types/jest": "27.0.0",
     "@types/jquery": "^3.3.32",
     "@types/jquery-match-height": "^0.7.8",
     "@types/js-cookie": "2.2.1",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.16",
     "@types/openseadragon": "^2.4.5",
     "@types/sanitize-html": "^2.13.0",
     "@types/vuelidate": "^0.7.22",
@@ -75,7 +75,7 @@
     "css-loader": "^5.2.4",
     "file-loader": "^6.2.0",
     "jest": "^27.5.1",
-    "sass": "^1.84.0",
+    "sass": "^1.85.1",
     "sass-loader": "^11.0.1",
     "style-loader": "^2.0.0",
     "ts-jest": "^27.1.5",
@@ -84,7 +84,7 @@
     "vue-jest": "^3.0.7",
     "vue-loader": "^15.11.1",
     "vue-template-compiler": "^2.7.16",
-    "webpack": "^5.97.1",
+    "webpack": "^5.98.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^3.11.3"
   }

AdminUI/LearningHub.Nhs.AdminUI/package.json

@@ -141,7 +141,7 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="NLog.Schema" Version="5.3.4" />
-		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
 		<PackageReference Include="UK.NHS.CookieBanner" Version="2.0.7" />
 	</ItemGroup>