Skip to content

Commit 9689c3b

Browse files
binonbinon
authored
Merge branch 'Automatic_version_update_dependabot' into dependabot/nuget/Automatic_version_update_dependabot/Microsoft.EntityFrameworkCore-7.0.20
2 parents 04737e5 + b600143 commit 9689c3b

File tree

23 files changed

+8889
-4299
lines changed

23 files changed

+8889
-4299
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
node-version: '18'
2525
npm: '6.14.8'
26-
26+
2727
- name: Typescript install WebUI
2828
run: yarn install --network-timeout 600000 --frozen-lockfile
2929
working-directory: ./LearningHub.Nhs.WebUI

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,36 +83,37 @@
8383

8484
<ItemGroup>
8585
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
86-
<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
86+
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
8787
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
8888
<PackageReference Include="BuildWebCompiler" Version="1.12.405" />
8989
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
90-
<PackageReference Include="FluentValidation" Version="10.3.4" />
90+
<PackageReference Include="FluentValidation" Version="11.11.0" />
9191
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
9292
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
93-
<PackageReference Include="IdentityModel" Version="4.4.0" />
93+
<PackageReference Include="IdentityModel" Version="4.6.0" />
9494
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
9595
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
9696
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
97-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
98-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
97+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
98+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
9999
<PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
100100
<PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
101101
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
102102
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
103-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.14.1" />
104-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
103+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.3.1" />
104+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.3.1" />
105105
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
106106
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
107107
<PrivateAssets>all</PrivateAssets>
108108
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
109109
</PackageReference>
110-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
110+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.18" />
111111
<PackageReference Include="MK.IO" Version="1.6.0" />
112112
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
113113
<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
114114
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
115-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
115+
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
116+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.1" />
116117
</ItemGroup>
117118

118119

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

Lines changed: 4767 additions & 2194 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AdminUI/LearningHub.Nhs.AdminUI/package.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@
2121
],
2222
"dependencies": {
2323
"@ckeditor/ckeditor5-build-classic": "16.0.0",
24-
"@ckeditor/ckeditor5-vue": "1.0.1",
24+
"@ckeditor/ckeditor5-vue": "1.0.3",
2525
"@mediakind/mkplayer": "^1.15.0",
2626
"axios": "^0.19.1",
2727
"babel-polyfill": "^6.26.0",
28-
"bootstrap": "^4.6.1",
28+
"bootstrap": "^4.6.2",
2929
"ckeditor4-vue": "^0.2.0",
30-
"concurrently": "^7.2.0",
31-
"core-js": "^3.6.5",
30+
"concurrently": "^7.6.0",
31+
"core-js": "^3.40.0",
3232
"js-cookie": "2.2.1",
33-
"lodash": "4.17.15",
33+
"lodash": "4.17.21",
3434
"moment": "^2.30.1",
3535
"navigator.sendbeacon": "0.0.20",
3636
"nhsuk-frontend": "^6.1.2",
3737
"openseadragon": "^2.4.2",
3838
"sanitize-html": "^2.14.0",
39-
"save": "^2.4.0",
40-
"ts-debounce": "2.0.1",
41-
"tus-js-client": "^2.2.0",
39+
"save": "^2.9.0",
40+
"ts-debounce": "2.3.0",
41+
"tus-js-client": "^2.3.2",
4242
"vue": "^2.7.14",
4343
"vue-carousel": "^0.18.0",
44-
"vue-clamp": "0.3.1",
45-
"vue-click-outside": "1.0.7",
44+
"vue-clamp": "0.4.1",
45+
"vue-click-outside": "1.1.0",
4646
"vue-ctk-date-time-picker": "^2.5.0",
4747
"vue-router": "^3.6.5",
4848
"vue-simple-progress": "^1.1.1",
@@ -56,35 +56,35 @@
5656
"@babel/preset-env": "^7.14.1",
5757
"@types/axios": "^0.14.0",
5858
"@types/bootstrap": "4.1.3",
59-
"@types/ckeditor": "4.9.8",
59+
"@types/ckeditor": "4.9.10",
6060
"@types/jest": "27.0.0",
6161
"@types/jquery": "^3.3.32",
62-
"@types/jquery-match-height": "^0.7.5",
62+
"@types/jquery-match-height": "^0.7.8",
6363
"@types/js-cookie": "2.2.1",
64-
"@types/lodash": "4.14.149",
64+
"@types/lodash": "4.17.14",
6565
"@types/openseadragon": "^2.4.5",
6666
"@types/sanitize-html": "^2.13.0",
67-
"@types/vuelidate": "^0.7.17",
68-
"@vue/babel-preset-app": "4.5.12",
69-
"@vue/test-utils": "^1.3.5",
67+
"@types/vuelidate": "^0.7.22",
68+
"@vue/babel-preset-app": "4.5.19",
69+
"@vue/test-utils": "^1.3.6",
7070
"babel-core": "^6.26.0",
7171
"babel-loader": "^8.2.2",
7272
"babel-preset-env": "^1.6.0",
7373
"babel-preset-stage-3": "^6.24.1",
7474
"cross-env": "^7.0.3",
7575
"css-loader": "^5.2.4",
7676
"file-loader": "^6.2.0",
77-
"jest": "^27.0.6",
77+
"jest": "^27.5.1",
7878
"sass": "^1.54.0",
7979
"sass-loader": "^11.0.1",
8080
"style-loader": "^2.0.0",
81-
"ts-jest": "^27.0.4",
82-
"ts-loader": "^9.1.1",
83-
"typescript": "^4.2.4",
81+
"ts-jest": "^27.1.5",
82+
"ts-loader": "^9.5.2",
83+
"typescript": "^4.9.5",
8484
"vue-jest": "^3.0.7",
8585
"vue-loader": "^15.11.1",
86-
"vue-template-compiler": "^2.7.14",
87-
"webpack": "^5.79.0",
86+
"vue-template-compiler": "^2.7.16",
87+
"webpack": "^5.97.1",
8888
"webpack-cli": "^4.10.0",
8989
"webpack-dev-server": "^3.11.3"
9090
}

‎LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,42 +104,43 @@
104104

105105

106106
<ItemGroup>
107-
<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
107+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
108+
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
108109
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
109110
<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
110-
<PackageReference Include="GDS.MultiPageFormData" Version="1.0.5" />
111-
<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
112-
<PackageReference Include="IdentityModel" Version="4.3.0" />
111+
<PackageReference Include="GDS.MultiPageFormData" Version="1.0.6" />
112+
<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
113+
<PackageReference Include="IdentityModel" Version="4.6.0" />
113114
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
114115
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
115116
<PackageReference Include="linqtotwitter" Version="6.9.0" />
116117
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
117118
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
118-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
119-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
119+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
120+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
120121
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.11" />
121122

122123
<PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
123124
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
124125
<PackageReference Include="Microsoft.FeatureManagement" Version="3.1.1" />
125126
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.1.1" />
126-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.14.1" />
127+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.35.0" />
127128

128129
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
129-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
130+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.18" />
130131
<PackageReference Include="MK.IO" Version="1.5.0" />
131132
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.28" />
132133
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
133134
<PrivateAssets>all</PrivateAssets>
134135
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
135136
</PackageReference>
136-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0" />
137-
<PackageReference Include="tusdotnet" Version="2.5.0" />
137+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.1" />
138+
<PackageReference Include="tusdotnet" Version="2.8.0" />
138139
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
139140
<PrivateAssets>all</PrivateAssets>
140141
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
141142
</PackageReference>
142-
<PackageReference Include="NLog.Schema" Version="4.7.12" />
143+
<PackageReference Include="NLog.Schema" Version="5.3.4" />
143144
<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
144145
<PackageReference Include="UK.NHS.CookieBanner" Version="2.0.7" />
145146
</ItemGroup>

0 commit comments

Comments
 (0)