From 3fdb3c71368c626d52c9ceee60483dea1e29f81b Mon Sep 17 00:00:00 2001 From: binon Date: Mon, 15 Jan 2024 16:58:30 +0000 Subject: [PATCH 01/13] Adding user GUID --- Auth/LearningHub.Nhs.Auth/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Auth/LearningHub.Nhs.Auth/Program.cs b/Auth/LearningHub.Nhs.Auth/Program.cs index b9eef4a..585bfab 100644 --- a/Auth/LearningHub.Nhs.Auth/Program.cs +++ b/Auth/LearningHub.Nhs.Auth/Program.cs @@ -17,7 +17,7 @@ var builder = WebApplication.CreateBuilder(args); -builder.Configuration.AddUserSecrets(string.Empty); +builder.Configuration.AddUserSecrets("a2ecb5d2-cf13-4551-9cb6-3d86dfbcf8ef"); builder.Logging.ClearProviders(); From b71df1c2d6ee31ee73ab4d14e374c5c72d830299 Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 12:30:58 +0000 Subject: [PATCH 02/13] Update Program.cs --- LearningHub.Nhs.UserApi/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LearningHub.Nhs.UserApi/Program.cs b/LearningHub.Nhs.UserApi/Program.cs index eb0be58..fcf27c4 100644 --- a/LearningHub.Nhs.UserApi/Program.cs +++ b/LearningHub.Nhs.UserApi/Program.cs @@ -2,7 +2,7 @@ // Copyright (c) HEE.nhs.uk. // -#pragma warning disable SA1200 // Using directives should be placed correctly +#pragma warning disable SA1200 // Using directives should be placed correctly using System; using LearningHub.Nhs.UserApi; using LearningHub.Nhs.UserApi.Middleware; From c487128b41628e6a3c333b57928f7ec3e2e045ab Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 14:23:32 +0000 Subject: [PATCH 03/13] Update Program.cs --- LearningHub.Nhs.UserApi/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LearningHub.Nhs.UserApi/Program.cs b/LearningHub.Nhs.UserApi/Program.cs index fcf27c4..f404404 100644 --- a/LearningHub.Nhs.UserApi/Program.cs +++ b/LearningHub.Nhs.UserApi/Program.cs @@ -1,5 +1,5 @@ // -// Copyright (c) HEE.nhs.uk. +// Copyright (c) HEE.nhs.uk. // #pragma warning disable SA1200 // Using directives should be placed correctly From 25ea22b3fcdf92e3a7191e380870f9c7a0c30740 Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 14:36:54 +0000 Subject: [PATCH 04/13] Update Program.cs --- LearningHub.Nhs.UserApi/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LearningHub.Nhs.UserApi/Program.cs b/LearningHub.Nhs.UserApi/Program.cs index f404404..fcf27c4 100644 --- a/LearningHub.Nhs.UserApi/Program.cs +++ b/LearningHub.Nhs.UserApi/Program.cs @@ -1,5 +1,5 @@ // -// Copyright (c) HEE.nhs.uk. +// Copyright (c) HEE.nhs.uk. // #pragma warning disable SA1200 // Using directives should be placed correctly From cc0a0c232e6feabc263b8103d8520d4747402814 Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 14:46:25 +0000 Subject: [PATCH 05/13] Update Program.cs --- LearningHub.Nhs.UserApi/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LearningHub.Nhs.UserApi/Program.cs b/LearningHub.Nhs.UserApi/Program.cs index fcf27c4..f404404 100644 --- a/LearningHub.Nhs.UserApi/Program.cs +++ b/LearningHub.Nhs.UserApi/Program.cs @@ -1,5 +1,5 @@ // -// Copyright (c) HEE.nhs.uk. +// Copyright (c) HEE.nhs.uk. // #pragma warning disable SA1200 // Using directives should be placed correctly From f1e9abb4428e597cacd65f605448156878f11911 Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 14:52:51 +0000 Subject: [PATCH 06/13] Update Program.cs --- LearningHub.Nhs.UserApi/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LearningHub.Nhs.UserApi/Program.cs b/LearningHub.Nhs.UserApi/Program.cs index f404404..fcf27c4 100644 --- a/LearningHub.Nhs.UserApi/Program.cs +++ b/LearningHub.Nhs.UserApi/Program.cs @@ -1,5 +1,5 @@ // -// Copyright (c) HEE.nhs.uk. +// Copyright (c) HEE.nhs.uk. // #pragma warning disable SA1200 // Using directives should be placed correctly From 3f21aa0783bb2e6145279a73feb2ff8e39a0ce9b Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 15:03:32 +0000 Subject: [PATCH 07/13] Update Program.cs --- LearningHub.Nhs.UserApi/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LearningHub.Nhs.UserApi/Program.cs b/LearningHub.Nhs.UserApi/Program.cs index fcf27c4..f404404 100644 --- a/LearningHub.Nhs.UserApi/Program.cs +++ b/LearningHub.Nhs.UserApi/Program.cs @@ -1,5 +1,5 @@ // -// Copyright (c) HEE.nhs.uk. +// Copyright (c) HEE.nhs.uk. // #pragma warning disable SA1200 // Using directives should be placed correctly From 77d4a17b4674d30a2098e9456d837f051543e98a Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 15:09:57 +0000 Subject: [PATCH 08/13] Update Program.cs --- LearningHub.Nhs.UserApi/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LearningHub.Nhs.UserApi/Program.cs b/LearningHub.Nhs.UserApi/Program.cs index f404404..fcf27c4 100644 --- a/LearningHub.Nhs.UserApi/Program.cs +++ b/LearningHub.Nhs.UserApi/Program.cs @@ -1,5 +1,5 @@ // -// Copyright (c) HEE.nhs.uk. +// Copyright (c) HEE.nhs.uk. // #pragma warning disable SA1200 // Using directives should be placed correctly From b8fca91b1846b14f5805f892ffa4a770153f90bd Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 16:13:35 +0000 Subject: [PATCH 09/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 65ca487..ee73a38 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The Learning Hub is the national digital learning platform providing easy access The Learning Hub is provided and supported the Technology Enhanced Learning platforms team at [NHS England](https://www.england.nhs.uk/). -# Getting Started +# Getting Started ## Required installs - [Visual Studio Professional 2022](https://visualstudio.microsoft.com/downloads/) or other suitable An IDE that supports the Microsoft Tech Stack @@ -156,4 +156,4 @@ Click the **+** button to create a new package source with name `LHPackages` and # Contribute -If you are interested in contributing to the Learning Hub, please contact [support@learninghub.nhs.uk](mailto:support@learninghub.nhs.uk) \ No newline at end of file +If you are interested in contributing to the Learning Hub, please contact [support@learninghub.nhs.uk](mailto:support@learninghub.nhs.uk) From 933c76f5a5986d50d8e23f6330c267e684cf68fa Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 23:06:27 +0000 Subject: [PATCH 10/13] Create azure-pipelines-ci.yml --- .github/azure-pipelines-ci.yml | 97 ++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 .github/azure-pipelines-ci.yml diff --git a/.github/azure-pipelines-ci.yml b/.github/azure-pipelines-ci.yml new file mode 100644 index 0000000..a9e0ac2 --- /dev/null +++ b/.github/azure-pipelines-ci.yml @@ -0,0 +1,97 @@ +# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software +variables: +- name: BuildParameters.RestoreBuildProjects + value: '**/*.csproj' +- name: BuildParameters.TestProjects + value: '**/*[Tt]ests/*.csproj' +trigger: + - ci +name: $(date:yyyyMMdd)$(rev:.r) +resources: + repositories: + - repository: self + type: git + ref: refs/heads/CI +jobs: +- job: Job_1 + displayName: Agent job + pool: + vmImage: windows-latest + steps: + - checkout: self + clean: true + fetchTags: false + - task: NodeTool@0 + displayName: Use Node 12.19 + inputs: + versionSpec: 12.19 + - task: Npm@1 + displayName: npm custom + inputs: + command: custom + workingDir: Auth/LearningHub.Nhs.Auth + verbose: false + customCommand: install -f + - task: Npm@1 + displayName: run webpack build + inputs: + command: custom + workingDir: Auth/LearningHub.Nhs.Auth + verbose: false + customCommand: run build + - task: NuGetToolInstaller@1 + displayName: Use NuGet 5.8 + inputs: + versionSpec: 5.8 + - task: NuGetCommand@2 + displayName: NuGet restore + inputs: + feedRestore: d99eaf2c-ad74-4a35-876e-f7dc1e45a604 + - task: DotNetCoreCLI@2 + displayName: Restore + inputs: + command: restore + projects: $(BuildParameters.RestoreBuildProjects) + - task: DotNetCoreCLI@2 + displayName: Build + inputs: + projects: $(BuildParameters.RestoreBuildProjects) + arguments: --configuration $(BuildConfiguration) /p:Platform=x64 + - task: DotNetCoreCLI@2 + displayName: Test + enabled: False + inputs: + command: test + projects: $(BuildParameters.TestProjects) + arguments: --configuration $(BuildConfiguration) + - task: DotNetCoreCLI@2 + displayName: Publish Auth + inputs: + command: publish + publishWebProjects: false + projects: '**/*LearningHub.Nhs.Auth.csproj' + arguments: --configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/Auth + zipAfterPublish: True + - task: PublishBuildArtifacts@1 + displayName: Publish Artifact Auth + condition: succeededOrFailed() + inputs: + PathtoPublish: $(build.artifactstagingdirectory)/Auth + ArtifactName: Auth + TargetPath: '\\my\share\$(Build.DefinitionName)\$(Build.BuildNumber)' + - task: DotNetCoreCLI@2 + displayName: Publish UserAPI + inputs: + command: publish + publishWebProjects: false + projects: '**/*LearningHub.Nhs.UserApi.csproj' + arguments: --configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/UserAPI + zipAfterPublish: True + - task: PublishBuildArtifacts@1 + displayName: Publish Artifact UserAPI + condition: succeededOrFailed() + inputs: + PathtoPublish: $(build.artifactstagingdirectory)/UserAPI + ArtifactName: UserAPI + TargetPath: '\\my\share\$(Build.DefinitionName)\$(Build.BuildNumber)' +... From c41500c198b140b010fc38170e43a602fa36332f Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 23:09:18 +0000 Subject: [PATCH 11/13] trigger ci --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee73a38..ccb1a95 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Introduction +# Introduction This is the official open source repository for the [Learning Hub](https://learninghub.nhs.uk/) user profile and authentication service. This repository is used to provide user authentication for the main [Learning Hub repository](https://github.com/TechnologyEnhancedLearning/LearningHub.Nhs.WebUI). From 76328f9277f2e18a64e929264a310a75c95fb817 Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 23:11:23 +0000 Subject: [PATCH 12/13] Update azure-pipelines-ci.yml for Azure Pipelines --- .github/azure-pipelines-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/azure-pipelines-ci.yml b/.github/azure-pipelines-ci.yml index a9e0ac2..ef18a34 100644 --- a/.github/azure-pipelines-ci.yml +++ b/.github/azure-pipelines-ci.yml @@ -5,7 +5,7 @@ variables: - name: BuildParameters.TestProjects value: '**/*[Tt]ests/*.csproj' trigger: - - ci + - CI name: $(date:yyyyMMdd)$(rev:.r) resources: repositories: From c7b854cbc3598f4192781cd7810c99649d089348 Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 16 Jan 2024 23:20:24 +0000 Subject: [PATCH 13/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ccb1a95..df36cce 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The Learning Hub is the national digital learning platform providing easy access The Learning Hub is provided and supported the Technology Enhanced Learning platforms team at [NHS England](https://www.england.nhs.uk/). -# Getting Started +# Getting Started ## Required installs - [Visual Studio Professional 2022](https://visualstudio.microsoft.com/downloads/) or other suitable An IDE that supports the Microsoft Tech Stack