From 821e5c5791041b93a2aa83082e529358017f020a Mon Sep 17 00:00:00 2001
From: James Gunn <james@gunn.io>
Date: Wed, 25 Oct 2023 09:01:55 +0100
Subject: [PATCH] Update dependencies (#748)

---
 .../ServiceCollectionExtensions.cs            | 10 ++--
 .../TeacherIdentity.AuthServer.csproj         | 50 +++++++++----------
 .../TeacherIdentity.SampleApi.csproj          |  2 +-
 .../TeacherIdentity.TestClient.csproj         |  4 +-
 .../Register.cs                               |  2 +-
 ...erIdentity.AuthServer.EndToEndTests.csproj | 16 +++---
 .../TrnTokenSignInJourney.cs                  |  2 +-
 ...acherIdentity.AuthServer.SmokeTests.csproj |  8 +--
 ...acherIdentity.AuthServer.TestCommon.csproj |  2 +-
 .../TeacherIdentity.AuthServer.Tests.csproj   | 16 +++---
 10 files changed, 52 insertions(+), 60 deletions(-)

diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/BackgroundJobs/ServiceCollectionExtensions.cs b/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/BackgroundJobs/ServiceCollectionExtensions.cs
index 1b7a9eb67..fa20ac6ea 100644
--- a/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/BackgroundJobs/ServiceCollectionExtensions.cs
+++ b/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/BackgroundJobs/ServiceCollectionExtensions.cs
@@ -13,11 +13,11 @@ public static IServiceCollection AddBackgroundJobs(
     {
         if (!environment.IsUnitTests() && !environment.IsEndToEndTests())
         {
-            services.AddHangfire(configuration => configuration
-                .SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
-                .UseSimpleAssemblyNameTypeSerializer()
-                .UseRecommendedSerializerSettings()
-                .UsePostgreSqlStorage(postgresConnectionString));
+            services.AddHangfire(config =>
+                config.UsePostgreSqlStorage(o => o.UseNpgsqlConnection(postgresConnectionString))
+                    .SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
+                    .UseSimpleAssemblyNameTypeSerializer()
+                    .UseRecommendedSerializerSettings());
 
             services.AddHangfireServer();
 
diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/TeacherIdentity.AuthServer.csproj b/dotnet-authserver/src/TeacherIdentity.AuthServer/TeacherIdentity.AuthServer.csproj
index c9304f1f2..d60b5e6ce 100644
--- a/dotnet-authserver/src/TeacherIdentity.AuthServer/TeacherIdentity.AuthServer.csproj
+++ b/dotnet-authserver/src/TeacherIdentity.AuthServer/TeacherIdentity.AuthServer.csproj
@@ -10,50 +10,50 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.2" />
-    <PackageReference Include="AspNetCore.HealthChecks.Redis" Version="6.0.4" />
+    <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="7.1.0" />
+    <PackageReference Include="AspNetCore.HealthChecks.Redis" Version="7.0.1" />
     <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.2" />
-    <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.13.1" />
+    <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.16.2" />
     <PackageReference Include="CsvHelper" Version="30.0.1" />
     <PackageReference Include="Dfe.Analytics.AspNetCore" Version="0.1.0" />
     <PackageReference Include="EFCore.NamingConventions" Version="7.0.2" />
-    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.5.1" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.8.0" />
     <PackageReference Include="Flurl" Version="3.0.7" />
-    <PackageReference Include="GovUk.Frontend.AspNetCore" Version="1.3.0" />
+    <PackageReference Include="GovUk.Frontend.AspNetCore" Version="1.4.0" />
     <PackageReference Include="GovukNotify" Version="6.1.0" />
-    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.33" />
-    <PackageReference Include="Hangfire.Core" Version="1.7.33" />
-    <PackageReference Include="Hangfire.PostgreSql" Version="1.19.12" />
-    <PackageReference Include="Joonasw.AspNetCore.SecurityHeaders" Version="4.0.1" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.8.6" />
+    <PackageReference Include="Hangfire.Core" Version="1.8.6" />
+    <PackageReference Include="Hangfire.PostgreSql" Version="1.20.4" />
+    <PackageReference Include="Joonasw.AspNetCore.SecurityHeaders" Version="5.0.0" />
     <PackageReference Include="LinqKit" Version="1.2.4" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" Version="7.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.6.3" />
-    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.4" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="All" Version="7.0.13" />
+    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.13" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.10" />
     <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
-    <PackageReference Include="MiniValidation" Version="0.7.4" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3" />
+    <PackageReference Include="MiniValidation" Version="0.9.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
     <PackageReference Include="OpenIddict.AspNetCore" Version="4.9.0" />
     <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.9.0" />
     <PackageReference Include="Optional" Version="4.0.0" />
-    <PackageReference Include="Polly" Version="7.2.4" />
-    <PackageReference Include="RedisRateLimiting.AspNetCore" Version="1.0.7" />
-    <PackageReference Include="Scrutor" Version="4.2.1" />
-    <PackageReference Include="Sentry.AspNetCore" Version="3.34.0" />
-    <PackageReference Include="Sentry.Serilog" Version="3.34.0" />
+    <PackageReference Include="Polly" Version="8.0.0" />
+    <PackageReference Include="RedisRateLimiting.AspNetCore" Version="1.0.9" />
+    <PackageReference Include="Scrutor" Version="4.2.2" />
+    <PackageReference Include="Sentry.AspNetCore" Version="3.40.1" />
+    <PackageReference Include="Sentry.Serilog" Version="3.40.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
     <PackageReference Include="Serilog.Sinks.Network" Version="2.0.2.68" />
     <PackageReference Include="SerilogTimings" Version="3.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" />
-    <PackageReference Include="ZendeskApi.Client" Version="4.0.1-alpha-696" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.12" />
+    <PackageReference Include="ZendeskApi.Client" Version="7.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/dotnet-authserver/src/TeacherIdentity.SampleApi/TeacherIdentity.SampleApi.csproj b/dotnet-authserver/src/TeacherIdentity.SampleApi/TeacherIdentity.SampleApi.csproj
index be70217b0..073fb1bcd 100644
--- a/dotnet-authserver/src/TeacherIdentity.SampleApi/TeacherIdentity.SampleApi.csproj
+++ b/dotnet-authserver/src/TeacherIdentity.SampleApi/TeacherIdentity.SampleApi.csproj
@@ -6,7 +6,7 @@
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'ResourceServer' " />
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.13" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnet-authserver/src/TeacherIdentity.TestClient/TeacherIdentity.TestClient.csproj b/dotnet-authserver/src/TeacherIdentity.TestClient/TeacherIdentity.TestClient.csproj
index e8a0af385..2ac68ac81 100644
--- a/dotnet-authserver/src/TeacherIdentity.TestClient/TeacherIdentity.TestClient.csproj
+++ b/dotnet-authserver/src/TeacherIdentity.TestClient/TeacherIdentity.TestClient.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GovUk.Frontend.AspNetCore" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.4" />
+    <PackageReference Include="GovUk.Frontend.AspNetCore" Version="1.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.13" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/Register.cs b/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/Register.cs
index cf71dec16..8eae18ee5 100644
--- a/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/Register.cs
+++ b/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/Register.cs
@@ -620,7 +620,7 @@ public async Task NewUser_WithInstitutionEmail_CanRegister(bool useInstitutionEm
         var invalidEmailSuffix = "invalid.sch.uk";
         await _hostFixture.TestData.EnsureEstablishmentDomain(invalidEmailSuffix);
 
-        var institutionEmail = $"james@{invalidEmailSuffix}";
+        var institutionEmail = $"{Faker.Internet.Email().Split('@')[0]}@{invalidEmailSuffix}";
         var personalEmail = Faker.Internet.Email();
         var expectedEmail = useInstitutionEmail ? institutionEmail : personalEmail;
 
diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/TeacherIdentity.AuthServer.EndToEndTests.csproj b/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/TeacherIdentity.AuthServer.EndToEndTests.csproj
index 14db59918..2db85f298 100644
--- a/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/TeacherIdentity.AuthServer.EndToEndTests.csproj
+++ b/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/TeacherIdentity.AuthServer.EndToEndTests.csproj
@@ -9,16 +9,12 @@
 
   <ItemGroup>
     <PackageReference Include="Faker.Net" Version="2.0.154" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="Microsoft.Playwright" Version="1.31.1" />
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.13" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.Playwright" Version="1.39.0" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/TrnTokenSignInJourney.cs b/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/TrnTokenSignInJourney.cs
index 0355d1e67..ba19e180b 100644
--- a/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/TrnTokenSignInJourney.cs
+++ b/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/TrnTokenSignInJourney.cs
@@ -775,7 +775,7 @@ public async Task NewTeacherUser_WithTrnTokenChangesToInstitutionEmail_CreatesUs
         var invalidEmailSuffix = "invalid.sch.uk";
         await _hostFixture.TestData.EnsureEstablishmentDomain(invalidEmailSuffix);
 
-        var newInstitutionEmail = $"james@{invalidEmailSuffix}";
+        var newInstitutionEmail = $"{Faker.Internet.Email().Split('@')[0]}@{invalidEmailSuffix}";
         var newPersonalEmail = Faker.Internet.Email();
         var newExpectedEmail = useInstitutionEmail ? newInstitutionEmail : newPersonalEmail;
 
diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.SmokeTests/TeacherIdentity.AuthServer.SmokeTests.csproj b/dotnet-authserver/tests/TeacherIdentity.AuthServer.SmokeTests/TeacherIdentity.AuthServer.SmokeTests.csproj
index a8d79e220..616758419 100644
--- a/dotnet-authserver/tests/TeacherIdentity.AuthServer.SmokeTests/TeacherIdentity.AuthServer.SmokeTests.csproj
+++ b/dotnet-authserver/tests/TeacherIdentity.AuthServer.SmokeTests/TeacherIdentity.AuthServer.SmokeTests.csproj
@@ -12,10 +12,10 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="Xunit.DependencyInjection" Version="8.7.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="Xunit.DependencyInjection" Version="8.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.TestCommon/TeacherIdentity.AuthServer.TestCommon.csproj b/dotnet-authserver/tests/TeacherIdentity.AuthServer.TestCommon/TeacherIdentity.AuthServer.TestCommon.csproj
index 3dff4c3cb..c189f0ddc 100644
--- a/dotnet-authserver/tests/TeacherIdentity.AuthServer.TestCommon/TeacherIdentity.AuthServer.TestCommon.csproj
+++ b/dotnet-authserver/tests/TeacherIdentity.AuthServer.TestCommon/TeacherIdentity.AuthServer.TestCommon.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Faker.Net" Version="2.0.154" />
-    <PackageReference Include="Respawn" Version="6.0.0" />
+    <PackageReference Include="Respawn" Version="6.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.Tests/TeacherIdentity.AuthServer.Tests.csproj b/dotnet-authserver/tests/TeacherIdentity.AuthServer.Tests/TeacherIdentity.AuthServer.Tests.csproj
index 7a082b868..33742d9f2 100644
--- a/dotnet-authserver/tests/TeacherIdentity.AuthServer.Tests/TeacherIdentity.AuthServer.Tests.csproj
+++ b/dotnet-authserver/tests/TeacherIdentity.AuthServer.Tests/TeacherIdentity.AuthServer.Tests.csproj
@@ -9,17 +9,13 @@
 
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="0.17.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.13" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="Xunit.DependencyInjection" Version="8.7.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="Xunit.DependencyInjection" Version="8.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>