Merge branch 'master' into DLS-Release-v1.1.1

Author: kevwhitt-hee

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

@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Setup node
         uses: actions/setup-node@v4
         with:

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

@@ -22,10 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Setup node
         uses: actions/setup-node@v4
         with:

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

@@ -12,10 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
 
       - name: Add TechnologyEnhancedLearning as nuget package source
         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/202410071401_UpdateCandidateAssessmentSupervisorsTabl.cs

@@ -189,14 +189,10 @@ public IActionResult AddEditFrameworkCompetency(int frameworkId, FrameworkCompet
                     FrameworkGroupId = frameworkCompetencyGroupId,
                     FrameworkCompetencyId = frameworkCompetencyId,
                     FrameworkConfig = detailFramework?.FrameworkConfig,
-                    Competency = new FrameworkCompetency()
-                    {
-                        Name = frameworkCompetency.Name,
-                        Description = frameworkCompetency.Description
-                    },
+                    Competency = frameworkCompetency,
                     MatchingSearchResults = matchingSearchResults.Count,
                     SameCompetency = similarItems,
-                    selectedFlagIds = selectedFlagIds.Any() ? selectedFlagIds.Select(a => a.ToString()).Aggregate((b, c) => b + "," + c) : string.Empty,
+                    selectedFlagIds = selectedFlagIds != null ? selectedFlagIds.Select(a => a.ToString()).Aggregate((b, c) => b + "," + c) : string.Empty
                 };
                 return View("Developer/SimilarCompetency", model);
             }