Skip to content

Merge RC changes to CI #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Ci
merged 27 commits into from
Jul 8, 2025
Merged

Merge RC changes to CI #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8e6c810
Bump @babel/core from 7.27.3 to 7.27.4 in /Auth/LearningHub.Nhs.Auth
dependabot[bot] Jun 2, 2025
d82e9aa
Bump sass from 1.89.0 to 1.89.1 in /Auth/LearningHub.Nhs.Auth (#185)
dependabot[bot] Jun 2, 2025
9d3aee1
Enabled central package management
Jun 3, 2025
03ea146
Added nuget.config file
Jun 6, 2025
7ab67b0
Bump core-js from 3.42.0 to 3.43.0 in /Auth/LearningHub.Nhs.Auth (#187)
dependabot[bot] Jun 10, 2025
871b86e
Bump sass from 1.89.1 to 1.89.2 in /Auth/LearningHub.Nhs.Auth (#188)
dependabot[bot] Jun 10, 2025
8e3adf0
Update continuous-integration-workflow.yml
binon Jun 12, 2025
0b6c5c3
Merge pull request #192 from TechnologyEnhancedLearning/Develop/Featu…
binon Jun 17, 2025
63a8b3e
Bump AutoMapper and 19 others
dependabot[bot] Jun 17, 2025
43de1f0
upgrading database proj version
Jun 17, 2025
99311fb
Merge branch 'Automatic_version_update_dependabot' of https://github.…
Jun 17, 2025
ff92ec7
Merge pull request #193 from TechnologyEnhancedLearning/dependabot/nu…
binon Jun 17, 2025
6662c01
Bump AutoMapper and 7 others
dependabot[bot] Jun 17, 2025
89c6c1a
Merge pull request #194 from TechnologyEnhancedLearning/dependabot/nu…
binon Jun 17, 2025
7de18de
Adding solution file
Jun 17, 2025
c609933
Bump AutoMapper and 4 others
dependabot[bot] Jun 17, 2025
c21d59d
Merge pull request #195 from TechnologyEnhancedLearning/dependabot/nu…
binon Jun 17, 2025
32b7e78
Merge pull request #196 from TechnologyEnhancedLearning/Automatic_ver…
binon Jun 17, 2025
8f19031
Merge pull request #184 from TechnologyEnhancedLearning/dependabot/np…
AnjuJose011 Jun 17, 2025
ea05df7
Merge pull request #197 from TechnologyEnhancedLearning/Automatic_ver…
AnjuJose011 Jun 17, 2025
9b0e3e7
Update Directory.Packages.props -Automapper
AnjuJose011 Jun 18, 2025
f56f1bd
Added client config section for moodlepgvle
ColinBeebyHEE Jun 18, 2025
434f9d7
Merge pull request #199 from TechnologyEnhancedLearning/Develop/Fixes…
AnjuJose011 Jun 18, 2025
d9e214f
Revert "Automatic version update dependabot To RC"
AnjuJose011 Jul 2, 2025
25f997d
Merge pull request #205 from TechnologyEnhancedLearning/revert-197-Au…
AnjuJose011 Jul 2, 2025
0b2189b
Fixes
AnjuJose011 Jul 2, 2025
37353fe
Merge pull request #206 from TechnologyEnhancedLearning/Reverting-CPM…
AnjuJose011 Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/continuous-integration-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ jobs:
dotnet-version: 8.0.x

- 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
run: |
dotnet nuget remove source LearningHubFeed || true
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 NuGet 5.8
uses: nuget/setup-nuget@v1
Expand Down
17 changes: 17 additions & 0 deletions Auth/LearningHub.Nhs.Auth/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,23 @@
"RequireConsent": false,
"RequirePkce": false,
"AllowOfflineAccess": true
},
"moodlepgvle": {
"BaseUrl": "",
"ClientName": "",
"ClientSecret": "",
"AllowedGrantTypes": [ "authorization_code" ],
"RedirectUris": [ "/auth/oidc/" ],
"PostLogoutUris": [ "/login/logout.php" ],
"AllowedScopes": [ "openid", "profile", "learninghubapi", "userapi", "roles", "learningcredentialsapi" ],
"BackChannelLogoutSessionRequired": true,
"BackChannelLogoutUri": "/login/logout.php",
"FrontChannelLogoutSessionRequired": true,
"FrontChannelLogoutUri": "/login/logout.php",
"UpdateAccessTokenClaimsOnRefresh": true,
"RequireConsent": false,
"RequirePkce": false,
"AllowOfflineAccess": true
}
},
"IdsClients": {
Expand Down
16 changes: 8 additions & 8 deletions Auth/LearningHub.Nhs.Auth/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Auth/LearningHub.Nhs.Auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dependencies": {
"babel-polyfill": "^6.26.0",
"concurrently": "^7.2.0",
"core-js": "^3.42.0",
"core-js": "^3.43.0",
"nhsuk-frontend": "^7.0.0",
"node": "^22"
},
Expand All @@ -35,7 +35,7 @@
"cross-env": "^7.0.3",
"css-loader": "^5.2.4",
"file-loader": "^6.2.0",
"sass": "^1.89.0",
"sass": "^1.89.2",
"sass-loader": "^11.0.1",
"style-loader": "^2.0.0",
"ts-loader": "^9.5.2",
Expand Down
49 changes: 49 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<Project>
<PropertyGroup>
<!-- Enable centralised version control for packages -->
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<!-- Our own package versions -->
<PackageVersion Include="elfhHub.Nhs.Models" Version="3.0.10" />
<PackageVersion Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageVersion Include="LearningHub.Nhs.Models" Version="3.0.33" />
<PackageVersion Include="NHSUKViewComponents.Web" Version="1.0.27" />

<!-- Other package versions -->
<PackageVersion Include="AutoMapper" Version="10.1.1" />
<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.5.0" />
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.6.0" />
<PackageVersion Include="Azure.Identity" Version="1.14.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="EntityFrameworkCore.Testing.Moq" Version="9.0.1" />
<PackageVersion Include="FluentValidation" Version="12.0.0" />
<PackageVersion Include="IdentityServer4" Version="4.1.2" />
<PackageVersion Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageVersion Include="IdentityServer4.Contrib.RedisStore" Version="4.0.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.23.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.17" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.17" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.17" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
<PackageVersion Include="Microsoft.Extensions.Caching.Redis" Version="2.3.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.6" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.6" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="Microsoft.TestPlatform.TestHost" Version="17.14.1" />
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
<PackageVersion Include="MockQueryable.Core" Version="7.0.3" />
<PackageVersion Include="MockQueryable.Moq" Version="5.0.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NLog.Web.AspNetCore" Version="5.5.0" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.1" />
<PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
<PackageVersion Include="UAParser" Version="3.1.47" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions LearningHub.Nhs.UserApi.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{683CA47A-9041-4CB9-B436-CD20BD40EB34}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
StyleCop.json = StyleCop.json
StyleCop.ruleset = StyleCop.ruleset
EndProjectSection
Expand Down
18 changes: 18 additions & 0 deletions nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="LearningHubFeed" value="https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json" />
</packageSources>

<packageSourceMapping>
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
<packageSource key="LearningHubFeed">
<package pattern="elfhHub.Nhs.*" />
<package pattern="LearningHub.*" />
<package pattern="NHSUKViewComponents.*"/>
</packageSource>
</packageSourceMapping>
</configuration>
Loading