diff --git a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json index 8c22aac980..0f1a8e47ad 100644 --- a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json +++ b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json @@ -2783,7 +2783,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", diff --git a/bitwarden_license/src/Scim/packages.lock.json b/bitwarden_license/src/Scim/packages.lock.json index e53e007446..79daea5128 100644 --- a/bitwarden_license/src/Scim/packages.lock.json +++ b/bitwarden_license/src/Scim/packages.lock.json @@ -2786,7 +2786,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2794,7 +2794,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -2806,9 +2806,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/bitwarden_license/src/Sso/packages.lock.json b/bitwarden_license/src/Sso/packages.lock.json index 750a13b70d..c2f6bc6a67 100644 --- a/bitwarden_license/src/Sso/packages.lock.json +++ b/bitwarden_license/src/Sso/packages.lock.json @@ -2945,7 +2945,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2953,7 +2953,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -2965,9 +2965,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/bitwarden_license/test/Commercial.Core.Test/packages.lock.json b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json index ce3b26f847..daa76ebc37 100644 --- a/bitwarden_license/test/Commercial.Core.Test/packages.lock.json +++ b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json @@ -2818,7 +2818,7 @@ "commercial.core": { "type": "Project", "dependencies": { - "Core": "2023.3.0" + "Core": "2023.4.3" } }, "common": { @@ -2826,7 +2826,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -2880,8 +2880,8 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Common": "2023.3.0", - "Core": "2023.3.0", + "Common": "2023.4.3", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "Moq": "4.17.2", diff --git a/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json b/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json index 4a1d7324fb..3e5ff59a26 100644 --- a/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json +++ b/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json @@ -3144,7 +3144,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -3196,15 +3196,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "SharedWeb": "2023.3.0", + "Core": "2023.4.3", + "SharedWeb": "2023.4.3", "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -3212,7 +3212,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -3224,8 +3224,8 @@ "integrationtestcommon": { "type": "Project", "dependencies": { - "Common": "2023.3.0", - "Identity": "2023.3.0", + "Common": "2023.4.3", + "Identity": "2023.4.3", "Microsoft.AspNetCore.Mvc.Testing": "6.0.5", "Microsoft.EntityFrameworkCore.InMemory": "6.0.5", "Microsoft.Extensions.Configuration": "6.0.1" @@ -3234,16 +3234,16 @@ "scim": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "SharedWeb": "2023.3.0" + "Core": "2023.4.3", + "SharedWeb": "2023.4.3" } }, "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/bitwarden_license/test/Scim.Test/packages.lock.json b/bitwarden_license/test/Scim.Test/packages.lock.json index 9b4e5e1a8f..20d19ac81b 100644 --- a/bitwarden_license/test/Scim.Test/packages.lock.json +++ b/bitwarden_license/test/Scim.Test/packages.lock.json @@ -2989,7 +2989,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -3041,7 +3041,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -3049,7 +3049,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -3061,16 +3061,16 @@ "scim": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "SharedWeb": "2023.3.0" + "Core": "2023.4.3", + "SharedWeb": "2023.4.3" } }, "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/src/Admin/packages.lock.json b/src/Admin/packages.lock.json index 5b57e3b372..bd8b7ae705 100644 --- a/src/Admin/packages.lock.json +++ b/src/Admin/packages.lock.json @@ -2834,7 +2834,7 @@ "commercial.core": { "type": "Project", "dependencies": { - "Core": "2023.3.0" + "Core": "2023.4.3" } }, "core": { @@ -2882,7 +2882,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2890,7 +2890,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -2902,7 +2902,7 @@ "migrator": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.Extensions.Logging": "6.0.0", "dbup-sqlserver": "5.0.8" } @@ -2910,30 +2910,30 @@ "mysqlmigrations": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } }, "postgresmigrations": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } }, "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } }, "sqlitemigrations": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj index ea37ffb593..c659ec52d6 100644 --- a/src/Api/Api.csproj +++ b/src/Api/Api.csproj @@ -32,8 +32,15 @@ + + + + + + + - + diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs index c114a96819..c73175d01a 100644 --- a/src/Api/Startup.cs +++ b/src/Api/Startup.cs @@ -8,9 +8,11 @@ using Bit.Core.Utilities; using IdentityModel; using System.Globalization; using Bit.Core.IdentityServer; +using Bit.SharedWeb.Health; using Microsoft.IdentityModel.Logging; using Microsoft.OpenApi.Models; using Bit.SharedWeb.Utilities; +using Microsoft.AspNetCore.Diagnostics.HealthChecks; using Microsoft.Extensions.DependencyInjection.Extensions; using Bit.Core.Auth.Identity; @@ -133,6 +135,9 @@ public class Startup services.AddDefaultServices(globalSettings); services.AddCoreLocalizationServices(); + //health check + services.AddHealthChecks(globalSettings); + #if OSS services.AddOosServices(); #else @@ -206,7 +211,17 @@ public class Startup app.UseMiddleware(); // Add endpoints to the request pipeline. - app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); + app.UseEndpoints(endpoints => + { + endpoints.MapDefaultControllerRoute(); + + endpoints.MapHealthChecks("/healthz"); + + endpoints.MapHealthChecks("/healthz/extended", new HealthCheckOptions + { + ResponseWriter = HealthCheckServiceExtensions.WriteResponse + }); + }); // Add Swagger if (Environment.IsDevelopment() || globalSettings.SelfHosted) diff --git a/src/Api/Utilities/ServiceCollectionExtensions.cs b/src/Api/Utilities/ServiceCollectionExtensions.cs index cf3f890922..1be9d54e19 100644 --- a/src/Api/Utilities/ServiceCollectionExtensions.cs +++ b/src/Api/Utilities/ServiceCollectionExtensions.cs @@ -1,5 +1,6 @@ using Bit.Core.IdentityServer; using Bit.Core.Settings; +using Bit.SharedWeb.Health; using Microsoft.OpenApi.Models; namespace Bit.Api.Utilities; @@ -69,4 +70,48 @@ public static class ServiceCollectionExtensions config.IncludeXmlComments(coreFilePath); }); } + + public static void AddHealthChecks(this IServiceCollection services, GlobalSettings globalSettings) + { + services.AddHealthCheckServices(globalSettings, builder => + { + var identityUri = new Uri(globalSettings.BaseServiceUri.Identity + + "/.well-known/openid-configuration"); + + builder.AddUrlGroup(identityUri, "identity"); + + if (!string.IsNullOrEmpty(globalSettings.SqlServer.ConnectionString)) + { + builder.AddSqlServer(globalSettings.SqlServer.ConnectionString); + } + + if (!string.IsNullOrEmpty(globalSettings.Redis.ConnectionString)) + { + builder.AddRedis(globalSettings.Redis.ConnectionString); + } + + if (!string.IsNullOrEmpty(globalSettings.Storage.ConnectionString)) + { + builder.AddAzureQueueStorage(globalSettings.Storage.ConnectionString, name: "storage_queue") + .AddAzureQueueStorage(globalSettings.Events.ConnectionString, name: "events_queue"); + } + + if (!string.IsNullOrEmpty(globalSettings.Notifications.ConnectionString)) + { + builder.AddAzureQueueStorage(globalSettings.Notifications.ConnectionString, + name: "notifications_queue"); + } + + if (!string.IsNullOrEmpty(globalSettings.ServiceBus.ConnectionString)) + { + builder.AddAzureServiceBusTopic(_ => globalSettings.ServiceBus.ConnectionString, + _ => globalSettings.ServiceBus.ApplicationCacheTopicName, name: "service_bus"); + } + + if (!string.IsNullOrEmpty(globalSettings.Mail.SendGridApiKey)) + { + builder.AddSendGrid(globalSettings.Mail.SendGridApiKey); + } + }); + } } diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json index 265ff8d618..10b16441c0 100644 --- a/src/Api/packages.lock.json +++ b/src/Api/packages.lock.json @@ -2,6 +2,81 @@ "version": 1, "dependencies": { "net6.0": { + "AspNetCore.HealthChecks.AzureServiceBus": { + "type": "Direct", + "requested": "[6.1.0, )", + "resolved": "6.1.0", + "contentHash": "LepLE6NO4bLBVDzlx/730pD6jnfkV6zaaRUrbN1LqnNk4m1hROsv7wOpgbKgVDgYIfeLzdiVnBviEevSxWFKMQ==", + "dependencies": { + "Azure.Messaging.EventHubs": "5.7.4", + "Azure.Messaging.ServiceBus": "7.11.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.10" + } + }, + "AspNetCore.HealthChecks.AzureStorage": { + "type": "Direct", + "requested": "[6.1.2, )", + "resolved": "6.1.2", + "contentHash": "R/uHJ40Cc0fBLi48SqDtT6fHyR5G8L3+PeKlbe8t498GLebeBIR3ve4l4n7UzCD0qgmQDDvyIYvVywx3i5Y6Ng==", + "dependencies": { + "Azure.Storage.Blobs": "12.14.1", + "Azure.Storage.Files.Shares": "12.11.0", + "Azure.Storage.Queues": "12.11.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.10" + } + }, + "AspNetCore.HealthChecks.Network": { + "type": "Direct", + "requested": "[6.0.4, )", + "resolved": "6.0.4", + "contentHash": "rvoPkqlvhX1HW6dpqjE1rbvmmMo9v7+Uf9dJffEcd3mA/DyyEitlZFc6cwYtmZVFdgy2gbIU4ubs3654nVfvjA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.7", + "SSH.NET": "2020.0.2", + "System.Buffers": "4.5.1" + } + }, + "AspNetCore.HealthChecks.Redis": { + "type": "Direct", + "requested": "[6.0.4, )", + "resolved": "6.0.4", + "contentHash": "adNNWF6kV8v1HLTmF3b9F5K6ubvgx+S7VqhzA8T/5YuIpRWsCDk8+q3RIDDV8Twvl9pRahLfzCbFrPYxvzmk7g==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.4", + "StackExchange.Redis": "2.5.61" + } + }, + "AspNetCore.HealthChecks.SendGrid": { + "type": "Direct", + "requested": "[6.0.2, )", + "resolved": "6.0.2", + "contentHash": "VgskjkCUmSpAxil20rZlrj14bMi9aFNdiGLDtDTKjkUU0GYkoyi4HRVEy9Gp0FIgu9ce7quN+dNCpydKvMxjqA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.2", + "Microsoft.Extensions.Http": "6.0.0", + "SendGrid": "9.24.4" + } + }, + "AspNetCore.HealthChecks.SqlServer": { + "type": "Direct", + "requested": "[6.0.2, )", + "resolved": "6.0.2", + "contentHash": "Af7ws27DnZZ4bKCiEREm7emSAKEtIiYirEAkI0ixFgK1fwJ99jmMnPC+kU01zfqn3FyCO/gZOUO7WbyVvTPpFg==", + "dependencies": { + "Microsoft.Data.SqlClient": "3.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.0" + } + }, + "AspNetCore.HealthChecks.Uris": { + "type": "Direct", + "requested": "[6.0.3, )", + "resolved": "6.0.3", + "contentHash": "EY0Vh8s2UrbnyvM/QhbyYuCnbrBw36BKkdh5LqdINxqAGnlPFQXf+/UoNlH/76MTEyg+nvdp2wjr5MqWDkVFaQ==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.0", + "Microsoft.Extensions.Http": "6.0.0" + } + }, "Azure.Messaging.EventGrid": { "type": "Direct", "requested": "[4.10.0, )", @@ -97,6 +172,14 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Azure.Core.Amqp": { + "type": "Transitive", + "resolved": "1.2.0", + "contentHash": "vrF4isvhwdZspzorLwYhukXz3DA8/ONSnZUIBAqBtOCzsDNUgAsuILbCzvtDrn2oDxyq7DZx5Nh81pe0BeWmDQ==", + "dependencies": { + "System.Memory": "4.5.4" + } + }, "Azure.Extensions.AspNetCore.DataProtection.Blobs": { "type": "Transitive", "resolved": "1.3.2", @@ -121,6 +204,34 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Azure.Messaging.EventHubs": { + "type": "Transitive", + "resolved": "5.7.4", + "contentHash": "8vC4efO5HzDgZjx6LaViScywbyKu3xIkL+y+QoyN7Yo6u1pEmMAPW4ptaWIj1JW4gypeWC1tFy+U3zdQ/E7bGA==", + "dependencies": { + "Azure.Core": "1.25.0", + "Azure.Core.Amqp": "1.2.0", + "Microsoft.Azure.Amqp": "2.5.12", + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Reflection.TypeExtensions": "4.7.0", + "System.Threading.Channels": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Messaging.ServiceBus": { + "type": "Transitive", + "resolved": "7.11.1", + "contentHash": "ioGedXeH8KK4HdTDEyOzdgNbEXGstGItVljI1EKYsz08sgwej6LpODCZmwPR2ui1fjXBWt8Zea0RJT4d9LwlMg==", + "dependencies": { + "Azure.Core": "1.25.0", + "Azure.Core.Amqp": "1.2.0", + "Microsoft.Azure.Amqp": "2.5.12", + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Memory.Data": "1.0.2" + } + }, "Azure.Storage.Blobs": { "type": "Transitive", "resolved": "12.14.1", @@ -139,6 +250,15 @@ "System.IO.Hashing": "6.0.0" } }, + "Azure.Storage.Files.Shares": { + "type": "Transitive", + "resolved": "12.11.0", + "contentHash": "C747FRSZNe/L4hu1wrvzQImVaIfNDcZXfttaV3FwX96+TsbgXotHe6Y0lmSu65H/gVYKt07sIW9E1mDi3bdADw==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, "Azure.Storage.Queues": { "type": "Transitive", "resolved": "12.12.0", @@ -389,12 +509,8 @@ }, "Microsoft.Azure.Amqp": { "type": "Transitive", - "resolved": "2.4.11", - "contentHash": "7x5fu2f6TLQDDJS0sY5qW8/daFwJaY9O75YvU8RcUfRzbug+9YGjXUBxoRrprgyi0jxdBAMQL05p1s783SOSFQ==", - "dependencies": { - "System.Net.WebSockets.Client": "4.0.2", - "System.Runtime.Serialization.Primitives": "4.1.1" - } + "resolved": "2.5.12", + "contentHash": "0SlEl+TSQdpjXWf9/37dXWAa0zk6R1EJKmGtGZeKUAH7WEQpJOWMxJ9I43igcBCnTkFwa28CdPnpSCjFZVQlkw==" }, "Microsoft.Azure.Cosmos": { "type": "Transitive", @@ -722,6 +838,22 @@ "System.Text.Json": "6.0.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.10", + "contentHash": "YmTyFOc7xx2/9FKuAlCmcWYKYLr0bYgNrRlcNPy/vc8qXnxnRV+kua6z96RUXSJVSQadCbJcEjmnTUMTEVfXOQ==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.10", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.2", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.10", + "contentHash": "U1PO967am1BIWbxBiLcYzVx8KOTYa9NvhBNgTn8Oii3LcsjvIwHzM+GTYy6bTiHnAFAlK5HAjxusAnAHSHJRoA==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -747,13 +879,12 @@ }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "00J6eE920t5vfPnEHBSGyj1Ya9lG6WYsMwqvLZ0nMPPTD2UxkaL+FNJM5DNSnMFJtV84KkUudPRngmNiCkqhuA==", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "3.1.32", - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.32", - "Microsoft.Extensions.FileProviders.Abstractions": "3.1.32", - "Microsoft.Extensions.Logging.Abstractions": "3.1.32" + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" } }, "Microsoft.Extensions.Http": { @@ -801,8 +932,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -1423,10 +1554,23 @@ "SQLitePCLRaw.core": "2.1.2" } }, + "SSH.NET": { + "type": "Transitive", + "resolved": "2020.0.2", + "contentHash": "G0dNlTBAM00KZXv1wWVwgg26d9/METcM6qWBpNQwllzQmmbu+Zu+FS1L1X4fFgGdPu3e8k9mmTBu6SwtQ0614g==", + "dependencies": { + "SshNet.Security.Cryptography": "[1.3.0]" + } + }, + "SshNet.Security.Cryptography": { + "type": "Transitive", + "resolved": "1.3.0", + "contentHash": "5pBIXRjcSO/amY8WztpmNOhaaCNHY/B6CcYDI7FSTgqSyo/ZUojlLiKcsl+YGbxQuLX439qIkMfP0PHqxqJi/Q==" + }, "StackExchange.Redis": { "type": "Transitive", - "resolved": "2.5.43", - "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", + "resolved": "2.5.61", + "contentHash": "h1Gz4itrHL/PQ0GBLTEiPK8bBkOp5SFO6iaRFSSn/x1qltBWENsz/NUxPid6WHX9yf2Tiyzn9D3R7mtnksODxg==", "dependencies": { "Pipelines.Sockets.Unofficial": "2.2.2", "System.Diagnostics.PerformanceCounter": "5.0.0" @@ -2061,42 +2205,6 @@ "System.Runtime.Extensions": "4.1.0" } }, - "System.Net.WebSockets": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "2KJo8hir6Edi9jnMDAMhiJoI691xRBmKcbNpwjrvpIMOCTYOtBpSsSEGBxBDV7PKbasJNaFp1+PZz1D7xS41Hg==", - "dependencies": { - "Microsoft.Win32.Primitives": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Threading.Tasks": "4.0.11" - } - }, - "System.Net.WebSockets.Client": { - "type": "Transitive", - "resolved": "4.0.2", - "contentHash": "NUCcDroX4lCQXgOrzlwIZ1u9YJ0krfyF0wk0ONnyLUmcQoEiYV2/OfUPRqUwQBbpH1BlGApkLgoQUwMqb5+c1g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.2", - "Microsoft.Win32.Primitives": "4.0.1", - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tracing": "4.1.0", - "System.Globalization": "4.0.11", - "System.Net.Primitives": "4.0.11", - "System.Net.WebHeaderCollection": "4.0.1", - "System.Net.WebSockets": "4.0.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Handles": "4.0.1", - "System.Runtime.InteropServices": "4.1.0", - "System.Security.Cryptography.X509Certificates": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11" - } - }, "System.Numerics.Vectors": { "type": "Transitive", "resolved": "4.5.0", @@ -2213,12 +2321,8 @@ }, "System.Reflection.TypeExtensions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "4.7.0", + "contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==" }, "System.Resources.ResourceManager": { "type": "Transitive", @@ -2606,6 +2710,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" + }, "System.Threading.Overlapped": { "type": "Transitive", "resolved": "4.0.1", @@ -2798,85 +2907,85 @@ "commercial.core": { "type": "Project", "dependencies": { - "Core": "2023.3.0" + "Core": "[2023.5.0, )" } }, "commercial.infrastructure.entityframework": { "type": "Project", "dependencies": { - "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", + "Core": "[2023.5.0, )", + "Infrastructure.EntityFramework": "[2023.5.0, )" } }, "core": { "type": "Project", "dependencies": { - "AWSSDK.SQS": "3.7.2.47", - "AWSSDK.SimpleEmail": "3.7.0.150", - "AspNetCoreRateLimit": "4.0.2", - "AspNetCoreRateLimit.Redis": "1.0.1", - "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.3.2", - "Azure.Storage.Blobs": "12.14.1", - "Azure.Storage.Queues": "12.12.0", - "BitPay.Light": "1.0.1907", - "Braintree": "5.12.0", - "DnsClient": "1.7.0", - "Fido2.AspNet": "3.0.1", - "Handlebars.Net": "2.1.2", - "IdentityServer4": "4.1.2", - "IdentityServer4.AccessTokenValidation": "3.0.1", - "LaunchDarkly.ServerSdk": "7.0.0", - "MailKit": "3.2.0", - "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.4", - "Microsoft.Azure.Cosmos.Table": "1.0.8", - "Microsoft.Azure.NotificationHubs": "4.1.0", - "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Data.SqlClient": "5.0.1", - "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", - "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", - "Microsoft.Extensions.Identity.Stores": "6.0.4", - "Newtonsoft.Json": "13.0.1", - "Otp.NET": "1.2.2", - "Quartz": "3.4.0", - "SendGrid": "9.27.0", - "Sentry.Serilog": "3.16.0", - "Serilog.AspNetCore": "5.0.0", - "Serilog.Extensions.Logging": "3.1.0", - "Serilog.Extensions.Logging.File": "2.0.0", - "Serilog.Sinks.AzureCosmosDB": "2.0.0", - "Serilog.Sinks.SyslogMessages": "2.0.6", - "Stripe.net": "40.0.0", - "YubicoDotNetClient": "1.2.0" + "AWSSDK.SQS": "[3.7.2.47, )", + "AWSSDK.SimpleEmail": "[3.7.0.150, )", + "AspNetCoreRateLimit": "[4.0.2, )", + "AspNetCoreRateLimit.Redis": "[1.0.1, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.2, )", + "Azure.Storage.Blobs": "[12.14.1, )", + "Azure.Storage.Queues": "[12.12.0, )", + "BitPay.Light": "[1.0.1907, )", + "Braintree": "[5.12.0, )", + "DnsClient": "[1.7.0, )", + "Fido2.AspNet": "[3.0.1, )", + "Handlebars.Net": "[2.1.2, )", + "IdentityServer4": "[4.1.2, )", + "IdentityServer4.AccessTokenValidation": "[3.0.1, )", + "LaunchDarkly.ServerSdk": "[7.0.0, )", + "MailKit": "[3.2.0, )", + "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", + "Microsoft.Azure.Cosmos.Table": "[1.0.8, )", + "Microsoft.Azure.NotificationHubs": "[4.1.0, )", + "Microsoft.Azure.ServiceBus": "[5.2.0, )", + "Microsoft.Data.SqlClient": "[5.0.1, )", + "Microsoft.Extensions.Caching.StackExchangeRedis": "[6.0.6, )", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "[6.0.1, )", + "Microsoft.Extensions.Configuration.UserSecrets": "[6.0.1, )", + "Microsoft.Extensions.Identity.Stores": "[6.0.4, )", + "Newtonsoft.Json": "[13.0.1, )", + "Otp.NET": "[1.2.2, )", + "Quartz": "[3.4.0, )", + "SendGrid": "[9.27.0, )", + "Sentry.Serilog": "[3.16.0, )", + "Serilog.AspNetCore": "[5.0.0, )", + "Serilog.Extensions.Logging": "[3.1.0, )", + "Serilog.Extensions.Logging.File": "[2.0.0, )", + "Serilog.Sinks.AzureCosmosDB": "[2.0.0, )", + "Serilog.Sinks.SyslogMessages": "[2.0.6, )", + "Stripe.net": "[40.0.0, )", + "YubicoDotNetClient": "[1.2.0, )" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Dapper": "2.0.123" + "Core": "[2023.5.0, )", + "Dapper": "[2.0.123, )" } }, "infrastructure.entityframework": { "type": "Project", "dependencies": { - "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", - "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", - "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", - "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.8", - "Pomelo.EntityFrameworkCore.MySql": "6.0.2", - "linq2db.EntityFrameworkCore": "6.11.0" + "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", + "Core": "[2023.5.0, )", + "Microsoft.EntityFrameworkCore.Relational": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.SqlServer": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.12, )", + "Npgsql.EntityFrameworkCore.PostgreSQL": "[6.0.8, )", + "Pomelo.EntityFrameworkCore.MySql": "[6.0.2, )", + "linq2db.EntityFrameworkCore": "[6.11.0, )" } }, "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "[2023.5.0, )", + "Infrastructure.Dapper": "[2023.5.0, )", + "Infrastructure.EntityFramework": "[2023.5.0, )" } } } diff --git a/src/Billing/packages.lock.json b/src/Billing/packages.lock.json index e53e007446..79daea5128 100644 --- a/src/Billing/packages.lock.json +++ b/src/Billing/packages.lock.json @@ -2786,7 +2786,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2794,7 +2794,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -2806,9 +2806,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/src/Events/packages.lock.json b/src/Events/packages.lock.json index e53e007446..79daea5128 100644 --- a/src/Events/packages.lock.json +++ b/src/Events/packages.lock.json @@ -2786,7 +2786,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2794,7 +2794,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -2806,9 +2806,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/src/EventsProcessor/packages.lock.json b/src/EventsProcessor/packages.lock.json index e53e007446..79daea5128 100644 --- a/src/EventsProcessor/packages.lock.json +++ b/src/EventsProcessor/packages.lock.json @@ -2786,7 +2786,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2794,7 +2794,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -2806,9 +2806,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/src/Icons/packages.lock.json b/src/Icons/packages.lock.json index 0538d0f74f..606ce3fc30 100644 --- a/src/Icons/packages.lock.json +++ b/src/Icons/packages.lock.json @@ -2796,7 +2796,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2804,7 +2804,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -2816,9 +2816,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/src/Identity/packages.lock.json b/src/Identity/packages.lock.json index 3c35872042..bcf1c0e8b4 100644 --- a/src/Identity/packages.lock.json +++ b/src/Identity/packages.lock.json @@ -2808,7 +2808,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2816,7 +2816,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -2828,9 +2828,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/src/Notifications/packages.lock.json b/src/Notifications/packages.lock.json index 19c6dc1354..4d16450e93 100644 --- a/src/Notifications/packages.lock.json +++ b/src/Notifications/packages.lock.json @@ -2836,7 +2836,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2844,7 +2844,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -2856,9 +2856,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/src/SharedWeb/Health/HealthCheckServiceExtensions.cs b/src/SharedWeb/Health/HealthCheckServiceExtensions.cs new file mode 100644 index 0000000000..9be369c676 --- /dev/null +++ b/src/SharedWeb/Health/HealthCheckServiceExtensions.cs @@ -0,0 +1,60 @@ +using System.Text; +using System.Text.Json; +using Bit.Core.Settings; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.HealthChecks; + +namespace Bit.SharedWeb.Health; + +public static class HealthCheckServiceExtensions +{ + public static void AddHealthCheckServices(this IServiceCollection services, GlobalSettings globalSettings, + Action addBuilder = null) + { + var builder = services.AddHealthChecks(); + addBuilder?.Invoke(builder); + } + + public static Task WriteResponse(HttpContext context, HealthReport healthReport) + { + context.Response.ContentType = "application/json; charset=utf-8"; + + var options = new JsonWriterOptions { Indented = true }; + + using var memoryStream = new MemoryStream(); + using (var jsonWriter = new Utf8JsonWriter(memoryStream, options)) + { + jsonWriter.WriteStartObject(); + jsonWriter.WriteString("status", healthReport.Status.ToString()); + jsonWriter.WriteStartObject("results"); + + foreach (var healthReportEntry in healthReport.Entries) + { + jsonWriter.WriteStartObject(healthReportEntry.Key); + jsonWriter.WriteString("status", + healthReportEntry.Value.Status.ToString()); + jsonWriter.WriteString("description", + healthReportEntry.Value.Description ?? healthReportEntry.Value.Exception?.Message); + jsonWriter.WriteStartObject("data"); + + foreach (var item in healthReportEntry.Value.Data) + { + jsonWriter.WritePropertyName(item.Key); + + JsonSerializer.Serialize(jsonWriter, item.Value, + item.Value?.GetType() ?? typeof(object)); + } + + jsonWriter.WriteEndObject(); + jsonWriter.WriteEndObject(); + } + + jsonWriter.WriteEndObject(); + jsonWriter.WriteEndObject(); + } + + return context.Response.WriteAsync( + Encoding.UTF8.GetString(memoryStream.ToArray())); + } +} diff --git a/src/SharedWeb/packages.lock.json b/src/SharedWeb/packages.lock.json index d6dfb7ff41..db03af92cd 100644 --- a/src/SharedWeb/packages.lock.json +++ b/src/SharedWeb/packages.lock.json @@ -2786,7 +2786,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2794,7 +2794,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", diff --git a/test/Api.IntegrationTest/packages.lock.json b/test/Api.IntegrationTest/packages.lock.json index d464a72320..427d253dc9 100644 --- a/test/Api.IntegrationTest/packages.lock.json +++ b/test/Api.IntegrationTest/packages.lock.json @@ -35,6 +35,74 @@ "resolved": "2.4.3", "contentHash": "kZZSmOmKA8OBlAJaquPXnJJLM9RwQ27H7BMVqfMLUcTi9xHinWGJiWksa3D4NEtz0wZ/nxd2mogObvBgJKCRhQ==" }, + "AspNetCore.HealthChecks.AzureServiceBus": { + "type": "Transitive", + "resolved": "6.1.0", + "contentHash": "LepLE6NO4bLBVDzlx/730pD6jnfkV6zaaRUrbN1LqnNk4m1hROsv7wOpgbKgVDgYIfeLzdiVnBviEevSxWFKMQ==", + "dependencies": { + "Azure.Messaging.EventHubs": "5.7.4", + "Azure.Messaging.ServiceBus": "7.11.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.10" + } + }, + "AspNetCore.HealthChecks.AzureStorage": { + "type": "Transitive", + "resolved": "6.1.2", + "contentHash": "R/uHJ40Cc0fBLi48SqDtT6fHyR5G8L3+PeKlbe8t498GLebeBIR3ve4l4n7UzCD0qgmQDDvyIYvVywx3i5Y6Ng==", + "dependencies": { + "Azure.Storage.Blobs": "12.14.1", + "Azure.Storage.Files.Shares": "12.11.0", + "Azure.Storage.Queues": "12.11.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.10" + } + }, + "AspNetCore.HealthChecks.Network": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "rvoPkqlvhX1HW6dpqjE1rbvmmMo9v7+Uf9dJffEcd3mA/DyyEitlZFc6cwYtmZVFdgy2gbIU4ubs3654nVfvjA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.7", + "SSH.NET": "2020.0.2", + "System.Buffers": "4.5.1" + } + }, + "AspNetCore.HealthChecks.Redis": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "adNNWF6kV8v1HLTmF3b9F5K6ubvgx+S7VqhzA8T/5YuIpRWsCDk8+q3RIDDV8Twvl9pRahLfzCbFrPYxvzmk7g==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.4", + "StackExchange.Redis": "2.5.61" + } + }, + "AspNetCore.HealthChecks.SendGrid": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "VgskjkCUmSpAxil20rZlrj14bMi9aFNdiGLDtDTKjkUU0GYkoyi4HRVEy9Gp0FIgu9ce7quN+dNCpydKvMxjqA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.2", + "Microsoft.Extensions.Http": "6.0.0", + "SendGrid": "9.24.4" + } + }, + "AspNetCore.HealthChecks.SqlServer": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "Af7ws27DnZZ4bKCiEREm7emSAKEtIiYirEAkI0ixFgK1fwJ99jmMnPC+kU01zfqn3FyCO/gZOUO7WbyVvTPpFg==", + "dependencies": { + "Microsoft.Data.SqlClient": "3.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.0" + } + }, + "AspNetCore.HealthChecks.Uris": { + "type": "Transitive", + "resolved": "6.0.3", + "contentHash": "EY0Vh8s2UrbnyvM/QhbyYuCnbrBw36BKkdh5LqdINxqAGnlPFQXf+/UoNlH/76MTEyg+nvdp2wjr5MqWDkVFaQ==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.0", + "Microsoft.Extensions.Http": "6.0.0" + } + }, "AspNetCoreRateLimit": { "type": "Transitive", "resolved": "4.0.2", @@ -134,6 +202,14 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Azure.Core.Amqp": { + "type": "Transitive", + "resolved": "1.2.0", + "contentHash": "vrF4isvhwdZspzorLwYhukXz3DA8/ONSnZUIBAqBtOCzsDNUgAsuILbCzvtDrn2oDxyq7DZx5Nh81pe0BeWmDQ==", + "dependencies": { + "System.Memory": "4.5.4" + } + }, "Azure.Extensions.AspNetCore.DataProtection.Blobs": { "type": "Transitive", "resolved": "1.3.2", @@ -168,6 +244,34 @@ "System.Text.Json": "4.7.2" } }, + "Azure.Messaging.EventHubs": { + "type": "Transitive", + "resolved": "5.7.4", + "contentHash": "8vC4efO5HzDgZjx6LaViScywbyKu3xIkL+y+QoyN7Yo6u1pEmMAPW4ptaWIj1JW4gypeWC1tFy+U3zdQ/E7bGA==", + "dependencies": { + "Azure.Core": "1.25.0", + "Azure.Core.Amqp": "1.2.0", + "Microsoft.Azure.Amqp": "2.5.12", + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Reflection.TypeExtensions": "4.7.0", + "System.Threading.Channels": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Messaging.ServiceBus": { + "type": "Transitive", + "resolved": "7.11.1", + "contentHash": "ioGedXeH8KK4HdTDEyOzdgNbEXGstGItVljI1EKYsz08sgwej6LpODCZmwPR2ui1fjXBWt8Zea0RJT4d9LwlMg==", + "dependencies": { + "Azure.Core": "1.25.0", + "Azure.Core.Amqp": "1.2.0", + "Microsoft.Azure.Amqp": "2.5.12", + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Memory.Data": "1.0.2" + } + }, "Azure.Storage.Blobs": { "type": "Transitive", "resolved": "12.14.1", @@ -186,6 +290,15 @@ "System.IO.Hashing": "6.0.0" } }, + "Azure.Storage.Files.Shares": { + "type": "Transitive", + "resolved": "12.11.0", + "contentHash": "C747FRSZNe/L4hu1wrvzQImVaIfNDcZXfttaV3FwX96+TsbgXotHe6Y0lmSu65H/gVYKt07sIW9E1mDi3bdADw==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, "Azure.Storage.Queues": { "type": "Transitive", "resolved": "12.12.0", @@ -488,12 +601,8 @@ }, "Microsoft.Azure.Amqp": { "type": "Transitive", - "resolved": "2.4.11", - "contentHash": "7x5fu2f6TLQDDJS0sY5qW8/daFwJaY9O75YvU8RcUfRzbug+9YGjXUBxoRrprgyi0jxdBAMQL05p1s783SOSFQ==", - "dependencies": { - "System.Net.WebSockets.Client": "4.0.2", - "System.Runtime.Serialization.Primitives": "4.1.1" - } + "resolved": "2.5.12", + "contentHash": "0SlEl+TSQdpjXWf9/37dXWAa0zk6R1EJKmGtGZeKUAH7WEQpJOWMxJ9I43igcBCnTkFwa28CdPnpSCjFZVQlkw==" }, "Microsoft.Azure.Cosmos": { "type": "Transitive", @@ -843,6 +952,22 @@ "System.Text.Json": "6.0.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.10", + "contentHash": "YmTyFOc7xx2/9FKuAlCmcWYKYLr0bYgNrRlcNPy/vc8qXnxnRV+kua6z96RUXSJVSQadCbJcEjmnTUMTEVfXOQ==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.10", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.2", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.10", + "contentHash": "U1PO967am1BIWbxBiLcYzVx8KOTYa9NvhBNgTn8Oii3LcsjvIwHzM+GTYy6bTiHnAFAlK5HAjxusAnAHSHJRoA==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -949,8 +1074,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -1672,10 +1797,23 @@ "SQLitePCLRaw.core": "2.1.2" } }, + "SSH.NET": { + "type": "Transitive", + "resolved": "2020.0.2", + "contentHash": "G0dNlTBAM00KZXv1wWVwgg26d9/METcM6qWBpNQwllzQmmbu+Zu+FS1L1X4fFgGdPu3e8k9mmTBu6SwtQ0614g==", + "dependencies": { + "SshNet.Security.Cryptography": "[1.3.0]" + } + }, + "SshNet.Security.Cryptography": { + "type": "Transitive", + "resolved": "1.3.0", + "contentHash": "5pBIXRjcSO/amY8WztpmNOhaaCNHY/B6CcYDI7FSTgqSyo/ZUojlLiKcsl+YGbxQuLX439qIkMfP0PHqxqJi/Q==" + }, "StackExchange.Redis": { "type": "Transitive", - "resolved": "2.5.43", - "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", + "resolved": "2.5.61", + "contentHash": "h1Gz4itrHL/PQ0GBLTEiPK8bBkOp5SFO6iaRFSSn/x1qltBWENsz/NUxPid6WHX9yf2Tiyzn9D3R7mtnksODxg==", "dependencies": { "Pipelines.Sockets.Unofficial": "2.2.2", "System.Diagnostics.PerformanceCounter": "5.0.0" @@ -2383,42 +2521,6 @@ "System.Runtime.Extensions": "4.1.0" } }, - "System.Net.WebSockets": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "2KJo8hir6Edi9jnMDAMhiJoI691xRBmKcbNpwjrvpIMOCTYOtBpSsSEGBxBDV7PKbasJNaFp1+PZz1D7xS41Hg==", - "dependencies": { - "Microsoft.Win32.Primitives": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Threading.Tasks": "4.0.11" - } - }, - "System.Net.WebSockets.Client": { - "type": "Transitive", - "resolved": "4.0.2", - "contentHash": "NUCcDroX4lCQXgOrzlwIZ1u9YJ0krfyF0wk0ONnyLUmcQoEiYV2/OfUPRqUwQBbpH1BlGApkLgoQUwMqb5+c1g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.2", - "Microsoft.Win32.Primitives": "4.0.1", - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tracing": "4.1.0", - "System.Globalization": "4.0.11", - "System.Net.Primitives": "4.0.11", - "System.Net.WebHeaderCollection": "4.0.1", - "System.Net.WebSockets": "4.0.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Handles": "4.0.1", - "System.Runtime.InteropServices": "4.1.0", - "System.Security.Cryptography.X509Certificates": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11" - } - }, "System.Numerics.Vectors": { "type": "Transitive", "resolved": "4.5.0", @@ -2540,12 +2642,8 @@ }, "System.Reflection.TypeExtensions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "4.7.0", + "contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==" }, "System.Resources.ResourceManager": { "type": "Transitive", @@ -2933,6 +3031,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" + }, "System.Threading.Overlapped": { "type": "Transitive", "resolved": "4.0.1", @@ -3170,126 +3273,133 @@ "api": { "type": "Project", "dependencies": { - "Azure.Messaging.EventGrid": "4.10.0", - "Commercial.Core": "2023.3.0", - "Commercial.Infrastructure.EntityFramework": "2023.3.0", - "Core": "2023.3.0", - "SharedWeb": "2023.3.0", - "Swashbuckle.AspNetCore": "6.5.0" + "AspNetCore.HealthChecks.AzureServiceBus": "[6.1.0, )", + "AspNetCore.HealthChecks.AzureStorage": "[6.1.2, )", + "AspNetCore.HealthChecks.Network": "[6.0.4, )", + "AspNetCore.HealthChecks.Redis": "[6.0.4, )", + "AspNetCore.HealthChecks.SendGrid": "[6.0.2, )", + "AspNetCore.HealthChecks.SqlServer": "[6.0.2, )", + "AspNetCore.HealthChecks.Uris": "[6.0.3, )", + "Azure.Messaging.EventGrid": "[4.10.0, )", + "Commercial.Core": "[2023.5.0, )", + "Commercial.Infrastructure.EntityFramework": "[2023.5.0, )", + "Core": "[2023.5.0, )", + "SharedWeb": "[2023.5.0, )", + "Swashbuckle.AspNetCore": "[6.5.0, )" } }, "commercial.core": { "type": "Project", "dependencies": { - "Core": "2023.3.0" + "Core": "[2023.5.0, )" } }, "commercial.infrastructure.entityframework": { "type": "Project", "dependencies": { - "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", + "Core": "[2023.5.0, )", + "Infrastructure.EntityFramework": "[2023.5.0, )" } }, "common": { "type": "Project", "dependencies": { - "AutoFixture.AutoNSubstitute": "4.17.0", - "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", - "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", - "Microsoft.NET.Test.Sdk": "17.1.0", - "NSubstitute": "4.3.0", - "xunit": "2.4.1" + "AutoFixture.AutoNSubstitute": "[4.17.0, )", + "AutoFixture.Xunit2": "[4.17.0, )", + "Core": "[2023.5.0, )", + "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", + "Microsoft.NET.Test.Sdk": "[17.1.0, )", + "NSubstitute": "[4.3.0, )", + "xunit": "[2.4.1, )" } }, "core": { "type": "Project", "dependencies": { - "AWSSDK.SQS": "3.7.2.47", - "AWSSDK.SimpleEmail": "3.7.0.150", - "AspNetCoreRateLimit": "4.0.2", - "AspNetCoreRateLimit.Redis": "1.0.1", - "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.3.2", - "Azure.Storage.Blobs": "12.14.1", - "Azure.Storage.Queues": "12.12.0", - "BitPay.Light": "1.0.1907", - "Braintree": "5.12.0", - "DnsClient": "1.7.0", - "Fido2.AspNet": "3.0.1", - "Handlebars.Net": "2.1.2", - "IdentityServer4": "4.1.2", - "IdentityServer4.AccessTokenValidation": "3.0.1", - "LaunchDarkly.ServerSdk": "7.0.0", - "MailKit": "3.2.0", - "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.4", - "Microsoft.Azure.Cosmos.Table": "1.0.8", - "Microsoft.Azure.NotificationHubs": "4.1.0", - "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Data.SqlClient": "5.0.1", - "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", - "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", - "Microsoft.Extensions.Identity.Stores": "6.0.4", - "Newtonsoft.Json": "13.0.1", - "Otp.NET": "1.2.2", - "Quartz": "3.4.0", - "SendGrid": "9.27.0", - "Sentry.Serilog": "3.16.0", - "Serilog.AspNetCore": "5.0.0", - "Serilog.Extensions.Logging": "3.1.0", - "Serilog.Extensions.Logging.File": "2.0.0", - "Serilog.Sinks.AzureCosmosDB": "2.0.0", - "Serilog.Sinks.SyslogMessages": "2.0.6", - "Stripe.net": "40.0.0", - "YubicoDotNetClient": "1.2.0" + "AWSSDK.SQS": "[3.7.2.47, )", + "AWSSDK.SimpleEmail": "[3.7.0.150, )", + "AspNetCoreRateLimit": "[4.0.2, )", + "AspNetCoreRateLimit.Redis": "[1.0.1, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.2, )", + "Azure.Storage.Blobs": "[12.14.1, )", + "Azure.Storage.Queues": "[12.12.0, )", + "BitPay.Light": "[1.0.1907, )", + "Braintree": "[5.12.0, )", + "DnsClient": "[1.7.0, )", + "Fido2.AspNet": "[3.0.1, )", + "Handlebars.Net": "[2.1.2, )", + "IdentityServer4": "[4.1.2, )", + "IdentityServer4.AccessTokenValidation": "[3.0.1, )", + "LaunchDarkly.ServerSdk": "[7.0.0, )", + "MailKit": "[3.2.0, )", + "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", + "Microsoft.Azure.Cosmos.Table": "[1.0.8, )", + "Microsoft.Azure.NotificationHubs": "[4.1.0, )", + "Microsoft.Azure.ServiceBus": "[5.2.0, )", + "Microsoft.Data.SqlClient": "[5.0.1, )", + "Microsoft.Extensions.Caching.StackExchangeRedis": "[6.0.6, )", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "[6.0.1, )", + "Microsoft.Extensions.Configuration.UserSecrets": "[6.0.1, )", + "Microsoft.Extensions.Identity.Stores": "[6.0.4, )", + "Newtonsoft.Json": "[13.0.1, )", + "Otp.NET": "[1.2.2, )", + "Quartz": "[3.4.0, )", + "SendGrid": "[9.27.0, )", + "Sentry.Serilog": "[3.16.0, )", + "Serilog.AspNetCore": "[5.0.0, )", + "Serilog.Extensions.Logging": "[3.1.0, )", + "Serilog.Extensions.Logging.File": "[2.0.0, )", + "Serilog.Sinks.AzureCosmosDB": "[2.0.0, )", + "Serilog.Sinks.SyslogMessages": "[2.0.6, )", + "Stripe.net": "[40.0.0, )", + "YubicoDotNetClient": "[1.2.0, )" } }, "identity": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "SharedWeb": "2023.3.0", - "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0" + "Core": "[2023.5.0, )", + "SharedWeb": "[2023.5.0, )", + "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Dapper": "2.0.123" + "Core": "[2023.5.0, )", + "Dapper": "[2.0.123, )" } }, "infrastructure.entityframework": { "type": "Project", "dependencies": { - "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", - "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", - "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", - "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.8", - "Pomelo.EntityFrameworkCore.MySql": "6.0.2", - "linq2db.EntityFrameworkCore": "6.11.0" + "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", + "Core": "[2023.5.0, )", + "Microsoft.EntityFrameworkCore.Relational": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.SqlServer": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.12, )", + "Npgsql.EntityFrameworkCore.PostgreSQL": "[6.0.8, )", + "Pomelo.EntityFrameworkCore.MySql": "[6.0.2, )", + "linq2db.EntityFrameworkCore": "[6.11.0, )" } }, "integrationtestcommon": { "type": "Project", "dependencies": { - "Common": "2023.3.0", - "Identity": "2023.3.0", - "Microsoft.AspNetCore.Mvc.Testing": "6.0.5", - "Microsoft.EntityFrameworkCore.InMemory": "6.0.5", - "Microsoft.Extensions.Configuration": "6.0.1" + "Common": "[2023.5.0, )", + "Identity": "[2023.5.0, )", + "Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )", + "Microsoft.EntityFrameworkCore.InMemory": "[6.0.5, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )" } }, "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "[2023.5.0, )", + "Infrastructure.Dapper": "[2023.5.0, )", + "Infrastructure.EntityFramework": "[2023.5.0, )" } } } diff --git a/test/Api.Test/packages.lock.json b/test/Api.Test/packages.lock.json index da16df5d7b..c5bde98fde 100644 --- a/test/Api.Test/packages.lock.json +++ b/test/Api.Test/packages.lock.json @@ -54,6 +54,74 @@ "resolved": "2.4.3", "contentHash": "kZZSmOmKA8OBlAJaquPXnJJLM9RwQ27H7BMVqfMLUcTi9xHinWGJiWksa3D4NEtz0wZ/nxd2mogObvBgJKCRhQ==" }, + "AspNetCore.HealthChecks.AzureServiceBus": { + "type": "Transitive", + "resolved": "6.1.0", + "contentHash": "LepLE6NO4bLBVDzlx/730pD6jnfkV6zaaRUrbN1LqnNk4m1hROsv7wOpgbKgVDgYIfeLzdiVnBviEevSxWFKMQ==", + "dependencies": { + "Azure.Messaging.EventHubs": "5.7.4", + "Azure.Messaging.ServiceBus": "7.11.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.10" + } + }, + "AspNetCore.HealthChecks.AzureStorage": { + "type": "Transitive", + "resolved": "6.1.2", + "contentHash": "R/uHJ40Cc0fBLi48SqDtT6fHyR5G8L3+PeKlbe8t498GLebeBIR3ve4l4n7UzCD0qgmQDDvyIYvVywx3i5Y6Ng==", + "dependencies": { + "Azure.Storage.Blobs": "12.14.1", + "Azure.Storage.Files.Shares": "12.11.0", + "Azure.Storage.Queues": "12.11.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.10" + } + }, + "AspNetCore.HealthChecks.Network": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "rvoPkqlvhX1HW6dpqjE1rbvmmMo9v7+Uf9dJffEcd3mA/DyyEitlZFc6cwYtmZVFdgy2gbIU4ubs3654nVfvjA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.7", + "SSH.NET": "2020.0.2", + "System.Buffers": "4.5.1" + } + }, + "AspNetCore.HealthChecks.Redis": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "adNNWF6kV8v1HLTmF3b9F5K6ubvgx+S7VqhzA8T/5YuIpRWsCDk8+q3RIDDV8Twvl9pRahLfzCbFrPYxvzmk7g==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.4", + "StackExchange.Redis": "2.5.61" + } + }, + "AspNetCore.HealthChecks.SendGrid": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "VgskjkCUmSpAxil20rZlrj14bMi9aFNdiGLDtDTKjkUU0GYkoyi4HRVEy9Gp0FIgu9ce7quN+dNCpydKvMxjqA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.2", + "Microsoft.Extensions.Http": "6.0.0", + "SendGrid": "9.24.4" + } + }, + "AspNetCore.HealthChecks.SqlServer": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "Af7ws27DnZZ4bKCiEREm7emSAKEtIiYirEAkI0ixFgK1fwJ99jmMnPC+kU01zfqn3FyCO/gZOUO7WbyVvTPpFg==", + "dependencies": { + "Microsoft.Data.SqlClient": "3.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.0" + } + }, + "AspNetCore.HealthChecks.Uris": { + "type": "Transitive", + "resolved": "6.0.3", + "contentHash": "EY0Vh8s2UrbnyvM/QhbyYuCnbrBw36BKkdh5LqdINxqAGnlPFQXf+/UoNlH/76MTEyg+nvdp2wjr5MqWDkVFaQ==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.0", + "Microsoft.Extensions.Http": "6.0.0" + } + }, "AspNetCoreRateLimit": { "type": "Transitive", "resolved": "4.0.2", @@ -144,6 +212,14 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Azure.Core.Amqp": { + "type": "Transitive", + "resolved": "1.2.0", + "contentHash": "vrF4isvhwdZspzorLwYhukXz3DA8/ONSnZUIBAqBtOCzsDNUgAsuILbCzvtDrn2oDxyq7DZx5Nh81pe0BeWmDQ==", + "dependencies": { + "System.Memory": "4.5.4" + } + }, "Azure.Extensions.AspNetCore.DataProtection.Blobs": { "type": "Transitive", "resolved": "1.3.2", @@ -178,6 +254,34 @@ "System.Text.Json": "4.7.2" } }, + "Azure.Messaging.EventHubs": { + "type": "Transitive", + "resolved": "5.7.4", + "contentHash": "8vC4efO5HzDgZjx6LaViScywbyKu3xIkL+y+QoyN7Yo6u1pEmMAPW4ptaWIj1JW4gypeWC1tFy+U3zdQ/E7bGA==", + "dependencies": { + "Azure.Core": "1.25.0", + "Azure.Core.Amqp": "1.2.0", + "Microsoft.Azure.Amqp": "2.5.12", + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Reflection.TypeExtensions": "4.7.0", + "System.Threading.Channels": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Messaging.ServiceBus": { + "type": "Transitive", + "resolved": "7.11.1", + "contentHash": "ioGedXeH8KK4HdTDEyOzdgNbEXGstGItVljI1EKYsz08sgwej6LpODCZmwPR2ui1fjXBWt8Zea0RJT4d9LwlMg==", + "dependencies": { + "Azure.Core": "1.25.0", + "Azure.Core.Amqp": "1.2.0", + "Microsoft.Azure.Amqp": "2.5.12", + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Memory.Data": "1.0.2" + } + }, "Azure.Storage.Blobs": { "type": "Transitive", "resolved": "12.14.1", @@ -196,6 +300,15 @@ "System.IO.Hashing": "6.0.0" } }, + "Azure.Storage.Files.Shares": { + "type": "Transitive", + "resolved": "12.11.0", + "contentHash": "C747FRSZNe/L4hu1wrvzQImVaIfNDcZXfttaV3FwX96+TsbgXotHe6Y0lmSu65H/gVYKt07sIW9E1mDi3bdADw==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, "Azure.Storage.Queues": { "type": "Transitive", "resolved": "12.12.0", @@ -480,12 +593,8 @@ }, "Microsoft.Azure.Amqp": { "type": "Transitive", - "resolved": "2.4.11", - "contentHash": "7x5fu2f6TLQDDJS0sY5qW8/daFwJaY9O75YvU8RcUfRzbug+9YGjXUBxoRrprgyi0jxdBAMQL05p1s783SOSFQ==", - "dependencies": { - "System.Net.WebSockets.Client": "4.0.2", - "System.Runtime.Serialization.Primitives": "4.1.1" - } + "resolved": "2.5.12", + "contentHash": "0SlEl+TSQdpjXWf9/37dXWAa0zk6R1EJKmGtGZeKUAH7WEQpJOWMxJ9I43igcBCnTkFwa28CdPnpSCjFZVQlkw==" }, "Microsoft.Azure.Cosmos": { "type": "Transitive", @@ -818,6 +927,22 @@ "System.Text.Json": "6.0.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.10", + "contentHash": "YmTyFOc7xx2/9FKuAlCmcWYKYLr0bYgNrRlcNPy/vc8qXnxnRV+kua6z96RUXSJVSQadCbJcEjmnTUMTEVfXOQ==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.10", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.2", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.10", + "contentHash": "U1PO967am1BIWbxBiLcYzVx8KOTYa9NvhBNgTn8Oii3LcsjvIwHzM+GTYy6bTiHnAFAlK5HAjxusAnAHSHJRoA==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -843,13 +968,12 @@ }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "00J6eE920t5vfPnEHBSGyj1Ya9lG6WYsMwqvLZ0nMPPTD2UxkaL+FNJM5DNSnMFJtV84KkUudPRngmNiCkqhuA==", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "3.1.32", - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.32", - "Microsoft.Extensions.FileProviders.Abstractions": "3.1.32", - "Microsoft.Extensions.Logging.Abstractions": "3.1.32" + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" } }, "Microsoft.Extensions.Http": { @@ -897,8 +1021,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -1556,10 +1680,23 @@ "SQLitePCLRaw.core": "2.1.2" } }, + "SSH.NET": { + "type": "Transitive", + "resolved": "2020.0.2", + "contentHash": "G0dNlTBAM00KZXv1wWVwgg26d9/METcM6qWBpNQwllzQmmbu+Zu+FS1L1X4fFgGdPu3e8k9mmTBu6SwtQ0614g==", + "dependencies": { + "SshNet.Security.Cryptography": "[1.3.0]" + } + }, + "SshNet.Security.Cryptography": { + "type": "Transitive", + "resolved": "1.3.0", + "contentHash": "5pBIXRjcSO/amY8WztpmNOhaaCNHY/B6CcYDI7FSTgqSyo/ZUojlLiKcsl+YGbxQuLX439qIkMfP0PHqxqJi/Q==" + }, "StackExchange.Redis": { "type": "Transitive", - "resolved": "2.5.43", - "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", + "resolved": "2.5.61", + "contentHash": "h1Gz4itrHL/PQ0GBLTEiPK8bBkOp5SFO6iaRFSSn/x1qltBWENsz/NUxPid6WHX9yf2Tiyzn9D3R7mtnksODxg==", "dependencies": { "Pipelines.Sockets.Unofficial": "2.2.2", "System.Diagnostics.PerformanceCounter": "5.0.0" @@ -2262,42 +2399,6 @@ "System.Runtime.Extensions": "4.1.0" } }, - "System.Net.WebSockets": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "2KJo8hir6Edi9jnMDAMhiJoI691xRBmKcbNpwjrvpIMOCTYOtBpSsSEGBxBDV7PKbasJNaFp1+PZz1D7xS41Hg==", - "dependencies": { - "Microsoft.Win32.Primitives": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Threading.Tasks": "4.0.11" - } - }, - "System.Net.WebSockets.Client": { - "type": "Transitive", - "resolved": "4.0.2", - "contentHash": "NUCcDroX4lCQXgOrzlwIZ1u9YJ0krfyF0wk0ONnyLUmcQoEiYV2/OfUPRqUwQBbpH1BlGApkLgoQUwMqb5+c1g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.2", - "Microsoft.Win32.Primitives": "4.0.1", - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tracing": "4.1.0", - "System.Globalization": "4.0.11", - "System.Net.Primitives": "4.0.11", - "System.Net.WebHeaderCollection": "4.0.1", - "System.Net.WebSockets": "4.0.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Handles": "4.0.1", - "System.Runtime.InteropServices": "4.1.0", - "System.Security.Cryptography.X509Certificates": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11" - } - }, "System.Numerics.Vectors": { "type": "Transitive", "resolved": "4.5.0", @@ -2419,12 +2520,8 @@ }, "System.Reflection.TypeExtensions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "4.7.0", + "contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==" }, "System.Resources.ResourceManager": { "type": "Transitive", @@ -2812,6 +2909,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" + }, "System.Threading.Overlapped": { "type": "Transitive", "resolved": "4.0.1", @@ -3049,122 +3151,129 @@ "api": { "type": "Project", "dependencies": { - "Azure.Messaging.EventGrid": "4.10.0", - "Commercial.Core": "2023.3.0", - "Commercial.Infrastructure.EntityFramework": "2023.3.0", - "Core": "2023.3.0", - "SharedWeb": "2023.3.0", - "Swashbuckle.AspNetCore": "6.5.0" + "AspNetCore.HealthChecks.AzureServiceBus": "[6.1.0, )", + "AspNetCore.HealthChecks.AzureStorage": "[6.1.2, )", + "AspNetCore.HealthChecks.Network": "[6.0.4, )", + "AspNetCore.HealthChecks.Redis": "[6.0.4, )", + "AspNetCore.HealthChecks.SendGrid": "[6.0.2, )", + "AspNetCore.HealthChecks.SqlServer": "[6.0.2, )", + "AspNetCore.HealthChecks.Uris": "[6.0.3, )", + "Azure.Messaging.EventGrid": "[4.10.0, )", + "Commercial.Core": "[2023.5.0, )", + "Commercial.Infrastructure.EntityFramework": "[2023.5.0, )", + "Core": "[2023.5.0, )", + "SharedWeb": "[2023.5.0, )", + "Swashbuckle.AspNetCore": "[6.5.0, )" } }, "commercial.core": { "type": "Project", "dependencies": { - "Core": "2023.3.0" + "Core": "[2023.5.0, )" } }, "commercial.infrastructure.entityframework": { "type": "Project", "dependencies": { - "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", + "Core": "[2023.5.0, )", + "Infrastructure.EntityFramework": "[2023.5.0, )" } }, "common": { "type": "Project", "dependencies": { - "AutoFixture.AutoNSubstitute": "4.17.0", - "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", - "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", - "Microsoft.NET.Test.Sdk": "17.1.0", - "NSubstitute": "4.3.0", - "xunit": "2.4.1" + "AutoFixture.AutoNSubstitute": "[4.17.0, )", + "AutoFixture.Xunit2": "[4.17.0, )", + "Core": "[2023.5.0, )", + "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", + "Microsoft.NET.Test.Sdk": "[17.1.0, )", + "NSubstitute": "[4.3.0, )", + "xunit": "[2.4.1, )" } }, "core": { "type": "Project", "dependencies": { - "AWSSDK.SQS": "3.7.2.47", - "AWSSDK.SimpleEmail": "3.7.0.150", - "AspNetCoreRateLimit": "4.0.2", - "AspNetCoreRateLimit.Redis": "1.0.1", - "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.3.2", - "Azure.Storage.Blobs": "12.14.1", - "Azure.Storage.Queues": "12.12.0", - "BitPay.Light": "1.0.1907", - "Braintree": "5.12.0", - "DnsClient": "1.7.0", - "Fido2.AspNet": "3.0.1", - "Handlebars.Net": "2.1.2", - "IdentityServer4": "4.1.2", - "IdentityServer4.AccessTokenValidation": "3.0.1", - "LaunchDarkly.ServerSdk": "7.0.0", - "MailKit": "3.2.0", - "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.4", - "Microsoft.Azure.Cosmos.Table": "1.0.8", - "Microsoft.Azure.NotificationHubs": "4.1.0", - "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Data.SqlClient": "5.0.1", - "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", - "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", - "Microsoft.Extensions.Identity.Stores": "6.0.4", - "Newtonsoft.Json": "13.0.1", - "Otp.NET": "1.2.2", - "Quartz": "3.4.0", - "SendGrid": "9.27.0", - "Sentry.Serilog": "3.16.0", - "Serilog.AspNetCore": "5.0.0", - "Serilog.Extensions.Logging": "3.1.0", - "Serilog.Extensions.Logging.File": "2.0.0", - "Serilog.Sinks.AzureCosmosDB": "2.0.0", - "Serilog.Sinks.SyslogMessages": "2.0.6", - "Stripe.net": "40.0.0", - "YubicoDotNetClient": "1.2.0" + "AWSSDK.SQS": "[3.7.2.47, )", + "AWSSDK.SimpleEmail": "[3.7.0.150, )", + "AspNetCoreRateLimit": "[4.0.2, )", + "AspNetCoreRateLimit.Redis": "[1.0.1, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.2, )", + "Azure.Storage.Blobs": "[12.14.1, )", + "Azure.Storage.Queues": "[12.12.0, )", + "BitPay.Light": "[1.0.1907, )", + "Braintree": "[5.12.0, )", + "DnsClient": "[1.7.0, )", + "Fido2.AspNet": "[3.0.1, )", + "Handlebars.Net": "[2.1.2, )", + "IdentityServer4": "[4.1.2, )", + "IdentityServer4.AccessTokenValidation": "[3.0.1, )", + "LaunchDarkly.ServerSdk": "[7.0.0, )", + "MailKit": "[3.2.0, )", + "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", + "Microsoft.Azure.Cosmos.Table": "[1.0.8, )", + "Microsoft.Azure.NotificationHubs": "[4.1.0, )", + "Microsoft.Azure.ServiceBus": "[5.2.0, )", + "Microsoft.Data.SqlClient": "[5.0.1, )", + "Microsoft.Extensions.Caching.StackExchangeRedis": "[6.0.6, )", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "[6.0.1, )", + "Microsoft.Extensions.Configuration.UserSecrets": "[6.0.1, )", + "Microsoft.Extensions.Identity.Stores": "[6.0.4, )", + "Newtonsoft.Json": "[13.0.1, )", + "Otp.NET": "[1.2.2, )", + "Quartz": "[3.4.0, )", + "SendGrid": "[9.27.0, )", + "Sentry.Serilog": "[3.16.0, )", + "Serilog.AspNetCore": "[5.0.0, )", + "Serilog.Extensions.Logging": "[3.1.0, )", + "Serilog.Extensions.Logging.File": "[2.0.0, )", + "Serilog.Sinks.AzureCosmosDB": "[2.0.0, )", + "Serilog.Sinks.SyslogMessages": "[2.0.6, )", + "Stripe.net": "[40.0.0, )", + "YubicoDotNetClient": "[1.2.0, )" } }, "core.test": { "type": "Project", "dependencies": { - "AutoFixture.AutoNSubstitute": "4.17.0", - "AutoFixture.Xunit2": "4.17.0", - "Common": "2023.3.0", - "Core": "2023.3.0", - "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", - "Microsoft.NET.Test.Sdk": "17.1.0", - "Moq": "4.17.2", - "NSubstitute": "4.3.0", - "xunit": "2.4.1" + "AutoFixture.AutoNSubstitute": "[4.17.0, )", + "AutoFixture.Xunit2": "[4.17.0, )", + "Common": "[2023.5.0, )", + "Core": "[2023.5.0, )", + "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", + "Microsoft.NET.Test.Sdk": "[17.1.0, )", + "Moq": "[4.17.2, )", + "NSubstitute": "[4.3.0, )", + "xunit": "[2.4.1, )" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Dapper": "2.0.123" + "Core": "[2023.5.0, )", + "Dapper": "[2.0.123, )" } }, "infrastructure.entityframework": { "type": "Project", "dependencies": { - "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", - "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", - "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", - "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.8", - "Pomelo.EntityFrameworkCore.MySql": "6.0.2", - "linq2db.EntityFrameworkCore": "6.11.0" + "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", + "Core": "[2023.5.0, )", + "Microsoft.EntityFrameworkCore.Relational": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.SqlServer": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.12, )", + "Npgsql.EntityFrameworkCore.PostgreSQL": "[6.0.8, )", + "Pomelo.EntityFrameworkCore.MySql": "[6.0.2, )", + "linq2db.EntityFrameworkCore": "[6.11.0, )" } }, "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "[2023.5.0, )", + "Infrastructure.Dapper": "[2023.5.0, )", + "Infrastructure.EntityFramework": "[2023.5.0, )" } } } diff --git a/test/Billing.Test/packages.lock.json b/test/Billing.Test/packages.lock.json index 456fad9598..474bc52aec 100644 --- a/test/Billing.Test/packages.lock.json +++ b/test/Billing.Test/packages.lock.json @@ -2988,8 +2988,8 @@ "billing": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "SharedWeb": "2023.3.0" + "Core": "2023.4.3", + "SharedWeb": "2023.4.3" } }, "common": { @@ -2997,7 +2997,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -3049,7 +3049,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -3057,7 +3057,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -3069,9 +3069,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/test/Core.Test/packages.lock.json b/test/Core.Test/packages.lock.json index 0779d09152..dd605b4e62 100644 --- a/test/Core.Test/packages.lock.json +++ b/test/Core.Test/packages.lock.json @@ -2825,7 +2825,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", diff --git a/test/Icons.Test/packages.lock.json b/test/Icons.Test/packages.lock.json index 5584303deb..0c902100b4 100644 --- a/test/Icons.Test/packages.lock.json +++ b/test/Icons.Test/packages.lock.json @@ -2972,14 +2972,14 @@ "type": "Project", "dependencies": { "AngleSharp": "0.16.1", - "Core": "2023.3.0", - "SharedWeb": "2023.3.0" + "Core": "2023.4.3", + "SharedWeb": "2023.4.3" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2987,7 +2987,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -2999,9 +2999,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/test/Identity.IntegrationTest/packages.lock.json b/test/Identity.IntegrationTest/packages.lock.json index c7feb90f13..471e1da6a5 100644 --- a/test/Identity.IntegrationTest/packages.lock.json +++ b/test/Identity.IntegrationTest/packages.lock.json @@ -3144,7 +3144,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -3196,15 +3196,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "SharedWeb": "2023.3.0", + "Core": "2023.4.3", + "SharedWeb": "2023.4.3", "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -3212,7 +3212,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -3224,8 +3224,8 @@ "integrationtestcommon": { "type": "Project", "dependencies": { - "Common": "2023.3.0", - "Identity": "2023.3.0", + "Common": "2023.4.3", + "Identity": "2023.4.3", "Microsoft.AspNetCore.Mvc.Testing": "6.0.5", "Microsoft.EntityFrameworkCore.InMemory": "6.0.5", "Microsoft.Extensions.Configuration": "6.0.1" @@ -3234,9 +3234,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/test/Identity.Test/packages.lock.json b/test/Identity.Test/packages.lock.json index aae8c8e33f..7df7684529 100644 --- a/test/Identity.Test/packages.lock.json +++ b/test/Identity.Test/packages.lock.json @@ -3011,7 +3011,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -3063,15 +3063,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "SharedWeb": "2023.3.0", + "Core": "2023.4.3", + "SharedWeb": "2023.4.3", "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -3079,7 +3079,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -3091,9 +3091,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/test/Infrastructure.EFIntegration.Test/packages.lock.json b/test/Infrastructure.EFIntegration.Test/packages.lock.json index b14044d349..b0e5968c90 100644 --- a/test/Infrastructure.EFIntegration.Test/packages.lock.json +++ b/test/Infrastructure.EFIntegration.Test/packages.lock.json @@ -3001,7 +3001,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -3055,8 +3055,8 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Common": "2023.3.0", - "Core": "2023.3.0", + "Common": "2023.4.3", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "Moq": "4.17.2", @@ -3067,7 +3067,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -3075,7 +3075,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", diff --git a/test/Infrastructure.IntegrationTest/packages.lock.json b/test/Infrastructure.IntegrationTest/packages.lock.json index 34c6b87a97..7ae6c2b8fb 100644 --- a/test/Infrastructure.IntegrationTest/packages.lock.json +++ b/test/Infrastructure.IntegrationTest/packages.lock.json @@ -2901,7 +2901,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -2909,7 +2909,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", diff --git a/test/IntegrationTestCommon/packages.lock.json b/test/IntegrationTestCommon/packages.lock.json index aefb843b5b..fee97803ee 100644 --- a/test/IntegrationTestCommon/packages.lock.json +++ b/test/IntegrationTestCommon/packages.lock.json @@ -3130,7 +3130,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "4.17.0", "AutoFixture.Xunit2": "4.17.0", - "Core": "2023.3.0", + "Core": "2023.4.3", "Kralizek.AutoFixture.Extensions.MockHttp": "1.2.0", "Microsoft.NET.Test.Sdk": "17.1.0", "NSubstitute": "4.3.0", @@ -3182,15 +3182,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "SharedWeb": "2023.3.0", + "Core": "2023.4.3", + "SharedWeb": "2023.4.3", "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Dapper": "2.0.123" } }, @@ -3198,7 +3198,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", @@ -3210,9 +3210,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "2023.4.3", + "Infrastructure.Dapper": "2023.4.3", + "Infrastructure.EntityFramework": "2023.4.3" } } } diff --git a/util/MsSqlMigratorUtility/packages.lock.json b/util/MsSqlMigratorUtility/packages.lock.json index 89fbf31e7e..7489bc4272 100644 --- a/util/MsSqlMigratorUtility/packages.lock.json +++ b/util/MsSqlMigratorUtility/packages.lock.json @@ -2729,7 +2729,7 @@ "migrator": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.Extensions.Logging": "6.0.0", "dbup-sqlserver": "5.0.8" } diff --git a/util/MySqlMigrations/packages.lock.json b/util/MySqlMigrations/packages.lock.json index 5e97b54a6b..f15f8d717e 100644 --- a/util/MySqlMigrations/packages.lock.json +++ b/util/MySqlMigrations/packages.lock.json @@ -2797,7 +2797,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", diff --git a/util/PostgresMigrations/packages.lock.json b/util/PostgresMigrations/packages.lock.json index 5e97b54a6b..f15f8d717e 100644 --- a/util/PostgresMigrations/packages.lock.json +++ b/util/PostgresMigrations/packages.lock.json @@ -2797,7 +2797,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", diff --git a/util/Setup/packages.lock.json b/util/Setup/packages.lock.json index 3fe1499534..c2b4d660d8 100644 --- a/util/Setup/packages.lock.json +++ b/util/Setup/packages.lock.json @@ -2706,7 +2706,7 @@ "migrator": { "type": "Project", "dependencies": { - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.Extensions.Logging": "6.0.0", "dbup-sqlserver": "5.0.8" } diff --git a/util/SqlServerEFScaffold/packages.lock.json b/util/SqlServerEFScaffold/packages.lock.json index 4e04168d02..f425d941ec 100644 --- a/util/SqlServerEFScaffold/packages.lock.json +++ b/util/SqlServerEFScaffold/packages.lock.json @@ -12,6 +12,74 @@ "Microsoft.EntityFrameworkCore.Relational": "6.0.4" } }, + "AspNetCore.HealthChecks.AzureServiceBus": { + "type": "Transitive", + "resolved": "6.1.0", + "contentHash": "LepLE6NO4bLBVDzlx/730pD6jnfkV6zaaRUrbN1LqnNk4m1hROsv7wOpgbKgVDgYIfeLzdiVnBviEevSxWFKMQ==", + "dependencies": { + "Azure.Messaging.EventHubs": "5.7.4", + "Azure.Messaging.ServiceBus": "7.11.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.10" + } + }, + "AspNetCore.HealthChecks.AzureStorage": { + "type": "Transitive", + "resolved": "6.1.2", + "contentHash": "R/uHJ40Cc0fBLi48SqDtT6fHyR5G8L3+PeKlbe8t498GLebeBIR3ve4l4n7UzCD0qgmQDDvyIYvVywx3i5Y6Ng==", + "dependencies": { + "Azure.Storage.Blobs": "12.14.1", + "Azure.Storage.Files.Shares": "12.11.0", + "Azure.Storage.Queues": "12.11.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.10" + } + }, + "AspNetCore.HealthChecks.Network": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "rvoPkqlvhX1HW6dpqjE1rbvmmMo9v7+Uf9dJffEcd3mA/DyyEitlZFc6cwYtmZVFdgy2gbIU4ubs3654nVfvjA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.7", + "SSH.NET": "2020.0.2", + "System.Buffers": "4.5.1" + } + }, + "AspNetCore.HealthChecks.Redis": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "adNNWF6kV8v1HLTmF3b9F5K6ubvgx+S7VqhzA8T/5YuIpRWsCDk8+q3RIDDV8Twvl9pRahLfzCbFrPYxvzmk7g==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.4", + "StackExchange.Redis": "2.5.61" + } + }, + "AspNetCore.HealthChecks.SendGrid": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "VgskjkCUmSpAxil20rZlrj14bMi9aFNdiGLDtDTKjkUU0GYkoyi4HRVEy9Gp0FIgu9ce7quN+dNCpydKvMxjqA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.2", + "Microsoft.Extensions.Http": "6.0.0", + "SendGrid": "9.24.4" + } + }, + "AspNetCore.HealthChecks.SqlServer": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "Af7ws27DnZZ4bKCiEREm7emSAKEtIiYirEAkI0ixFgK1fwJ99jmMnPC+kU01zfqn3FyCO/gZOUO7WbyVvTPpFg==", + "dependencies": { + "Microsoft.Data.SqlClient": "3.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.0" + } + }, + "AspNetCore.HealthChecks.Uris": { + "type": "Transitive", + "resolved": "6.0.3", + "contentHash": "EY0Vh8s2UrbnyvM/QhbyYuCnbrBw36BKkdh5LqdINxqAGnlPFQXf+/UoNlH/76MTEyg+nvdp2wjr5MqWDkVFaQ==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.0", + "Microsoft.Extensions.Http": "6.0.0" + } + }, "AspNetCoreRateLimit": { "type": "Transitive", "resolved": "4.0.2", @@ -84,6 +152,14 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Azure.Core.Amqp": { + "type": "Transitive", + "resolved": "1.2.0", + "contentHash": "vrF4isvhwdZspzorLwYhukXz3DA8/ONSnZUIBAqBtOCzsDNUgAsuILbCzvtDrn2oDxyq7DZx5Nh81pe0BeWmDQ==", + "dependencies": { + "System.Memory": "4.5.4" + } + }, "Azure.Extensions.AspNetCore.DataProtection.Blobs": { "type": "Transitive", "resolved": "1.3.2", @@ -118,6 +194,34 @@ "System.Text.Json": "4.7.2" } }, + "Azure.Messaging.EventHubs": { + "type": "Transitive", + "resolved": "5.7.4", + "contentHash": "8vC4efO5HzDgZjx6LaViScywbyKu3xIkL+y+QoyN7Yo6u1pEmMAPW4ptaWIj1JW4gypeWC1tFy+U3zdQ/E7bGA==", + "dependencies": { + "Azure.Core": "1.25.0", + "Azure.Core.Amqp": "1.2.0", + "Microsoft.Azure.Amqp": "2.5.12", + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Reflection.TypeExtensions": "4.7.0", + "System.Threading.Channels": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Messaging.ServiceBus": { + "type": "Transitive", + "resolved": "7.11.1", + "contentHash": "ioGedXeH8KK4HdTDEyOzdgNbEXGstGItVljI1EKYsz08sgwej6LpODCZmwPR2ui1fjXBWt8Zea0RJT4d9LwlMg==", + "dependencies": { + "Azure.Core": "1.25.0", + "Azure.Core.Amqp": "1.2.0", + "Microsoft.Azure.Amqp": "2.5.12", + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Memory.Data": "1.0.2" + } + }, "Azure.Storage.Blobs": { "type": "Transitive", "resolved": "12.14.1", @@ -136,6 +240,15 @@ "System.IO.Hashing": "6.0.0" } }, + "Azure.Storage.Files.Shares": { + "type": "Transitive", + "resolved": "12.11.0", + "contentHash": "C747FRSZNe/L4hu1wrvzQImVaIfNDcZXfttaV3FwX96+TsbgXotHe6Y0lmSu65H/gVYKt07sIW9E1mDi3bdADw==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, "Azure.Storage.Queues": { "type": "Transitive", "resolved": "12.12.0", @@ -391,12 +504,8 @@ }, "Microsoft.Azure.Amqp": { "type": "Transitive", - "resolved": "2.4.11", - "contentHash": "7x5fu2f6TLQDDJS0sY5qW8/daFwJaY9O75YvU8RcUfRzbug+9YGjXUBxoRrprgyi0jxdBAMQL05p1s783SOSFQ==", - "dependencies": { - "System.Net.WebSockets.Client": "4.0.2", - "System.Runtime.Serialization.Primitives": "4.1.1" - } + "resolved": "2.5.12", + "contentHash": "0SlEl+TSQdpjXWf9/37dXWAa0zk6R1EJKmGtGZeKUAH7WEQpJOWMxJ9I43igcBCnTkFwa28CdPnpSCjFZVQlkw==" }, "Microsoft.Azure.Cosmos": { "type": "Transitive", @@ -724,6 +833,22 @@ "System.Text.Json": "6.0.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.10", + "contentHash": "YmTyFOc7xx2/9FKuAlCmcWYKYLr0bYgNrRlcNPy/vc8qXnxnRV+kua6z96RUXSJVSQadCbJcEjmnTUMTEVfXOQ==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.10", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.2", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.10", + "contentHash": "U1PO967am1BIWbxBiLcYzVx8KOTYa9NvhBNgTn8Oii3LcsjvIwHzM+GTYy6bTiHnAFAlK5HAjxusAnAHSHJRoA==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -749,13 +874,12 @@ }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "3.1.32", - "contentHash": "00J6eE920t5vfPnEHBSGyj1Ya9lG6WYsMwqvLZ0nMPPTD2UxkaL+FNJM5DNSnMFJtV84KkUudPRngmNiCkqhuA==", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "3.1.32", - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.32", - "Microsoft.Extensions.FileProviders.Abstractions": "3.1.32", - "Microsoft.Extensions.Logging.Abstractions": "3.1.32" + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" } }, "Microsoft.Extensions.Http": { @@ -803,8 +927,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -1425,10 +1549,23 @@ "SQLitePCLRaw.core": "2.1.2" } }, + "SSH.NET": { + "type": "Transitive", + "resolved": "2020.0.2", + "contentHash": "G0dNlTBAM00KZXv1wWVwgg26d9/METcM6qWBpNQwllzQmmbu+Zu+FS1L1X4fFgGdPu3e8k9mmTBu6SwtQ0614g==", + "dependencies": { + "SshNet.Security.Cryptography": "[1.3.0]" + } + }, + "SshNet.Security.Cryptography": { + "type": "Transitive", + "resolved": "1.3.0", + "contentHash": "5pBIXRjcSO/amY8WztpmNOhaaCNHY/B6CcYDI7FSTgqSyo/ZUojlLiKcsl+YGbxQuLX439qIkMfP0PHqxqJi/Q==" + }, "StackExchange.Redis": { "type": "Transitive", - "resolved": "2.5.43", - "contentHash": "YQ38jVbX1b5mBi6lizESou+NpV6QZpeo6ofRR6qeuqJ8ePOmhcwhje3nDTNIGEkfPSK0sLuF6pR5rtFyq2F46g==", + "resolved": "2.5.61", + "contentHash": "h1Gz4itrHL/PQ0GBLTEiPK8bBkOp5SFO6iaRFSSn/x1qltBWENsz/NUxPid6WHX9yf2Tiyzn9D3R7mtnksODxg==", "dependencies": { "Pipelines.Sockets.Unofficial": "2.2.2", "System.Diagnostics.PerformanceCounter": "5.0.0" @@ -2074,42 +2211,6 @@ "System.Runtime.Extensions": "4.1.0" } }, - "System.Net.WebSockets": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "2KJo8hir6Edi9jnMDAMhiJoI691xRBmKcbNpwjrvpIMOCTYOtBpSsSEGBxBDV7PKbasJNaFp1+PZz1D7xS41Hg==", - "dependencies": { - "Microsoft.Win32.Primitives": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Threading.Tasks": "4.0.11" - } - }, - "System.Net.WebSockets.Client": { - "type": "Transitive", - "resolved": "4.0.2", - "contentHash": "NUCcDroX4lCQXgOrzlwIZ1u9YJ0krfyF0wk0ONnyLUmcQoEiYV2/OfUPRqUwQBbpH1BlGApkLgoQUwMqb5+c1g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.2", - "Microsoft.Win32.Primitives": "4.0.1", - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tracing": "4.1.0", - "System.Globalization": "4.0.11", - "System.Net.Primitives": "4.0.11", - "System.Net.WebHeaderCollection": "4.0.1", - "System.Net.WebSockets": "4.0.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Handles": "4.0.1", - "System.Runtime.InteropServices": "4.1.0", - "System.Security.Cryptography.X509Certificates": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11" - } - }, "System.Numerics.Vectors": { "type": "Transitive", "resolved": "4.5.0", @@ -2226,12 +2327,8 @@ }, "System.Reflection.TypeExtensions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "4.7.0", + "contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==" }, "System.Resources.ResourceManager": { "type": "Transitive", @@ -2619,6 +2716,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" + }, "System.Threading.Overlapped": { "type": "Transitive", "resolved": "4.0.1", @@ -2811,96 +2913,103 @@ "api": { "type": "Project", "dependencies": { - "Azure.Messaging.EventGrid": "4.10.0", - "Commercial.Core": "2023.3.0", - "Commercial.Infrastructure.EntityFramework": "2023.3.0", - "Core": "2023.3.0", - "SharedWeb": "2023.3.0", - "Swashbuckle.AspNetCore": "6.5.0" + "AspNetCore.HealthChecks.AzureServiceBus": "[6.1.0, )", + "AspNetCore.HealthChecks.AzureStorage": "[6.1.2, )", + "AspNetCore.HealthChecks.Network": "[6.0.4, )", + "AspNetCore.HealthChecks.Redis": "[6.0.4, )", + "AspNetCore.HealthChecks.SendGrid": "[6.0.2, )", + "AspNetCore.HealthChecks.SqlServer": "[6.0.2, )", + "AspNetCore.HealthChecks.Uris": "[6.0.3, )", + "Azure.Messaging.EventGrid": "[4.10.0, )", + "Commercial.Core": "[2023.5.0, )", + "Commercial.Infrastructure.EntityFramework": "[2023.5.0, )", + "Core": "[2023.5.0, )", + "SharedWeb": "[2023.5.0, )", + "Swashbuckle.AspNetCore": "[6.5.0, )" } }, "commercial.core": { "type": "Project", "dependencies": { - "Core": "2023.3.0" + "Core": "[2023.5.0, )" } }, "commercial.infrastructure.entityframework": { "type": "Project", "dependencies": { - "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", + "Core": "[2023.5.0, )", + "Infrastructure.EntityFramework": "[2023.5.0, )" } }, "core": { "type": "Project", "dependencies": { - "AWSSDK.SQS": "3.7.2.47", - "AWSSDK.SimpleEmail": "3.7.0.150", - "AspNetCoreRateLimit": "4.0.2", - "AspNetCoreRateLimit.Redis": "1.0.1", - "Azure.Extensions.AspNetCore.DataProtection.Blobs": "1.3.2", - "Azure.Storage.Blobs": "12.14.1", - "Azure.Storage.Queues": "12.12.0", - "BitPay.Light": "1.0.1907", - "Braintree": "5.12.0", - "DnsClient": "1.7.0", - "Fido2.AspNet": "3.0.1", - "Handlebars.Net": "2.1.2", - "IdentityServer4": "4.1.2", - "IdentityServer4.AccessTokenValidation": "3.0.1", - "LaunchDarkly.ServerSdk": "7.0.0", - "MailKit": "3.2.0", - "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.4", - "Microsoft.Azure.Cosmos.Table": "1.0.8", - "Microsoft.Azure.NotificationHubs": "4.1.0", - "Microsoft.Azure.ServiceBus": "5.2.0", - "Microsoft.Data.SqlClient": "5.0.1", - "Microsoft.Extensions.Caching.StackExchangeRedis": "6.0.6", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", - "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", - "Microsoft.Extensions.Identity.Stores": "6.0.4", - "Newtonsoft.Json": "13.0.1", - "Otp.NET": "1.2.2", - "Quartz": "3.4.0", - "SendGrid": "9.27.0", - "Sentry.Serilog": "3.16.0", - "Serilog.AspNetCore": "5.0.0", - "Serilog.Extensions.Logging": "3.1.0", - "Serilog.Extensions.Logging.File": "2.0.0", - "Serilog.Sinks.AzureCosmosDB": "2.0.0", - "Serilog.Sinks.SyslogMessages": "2.0.6", - "Stripe.net": "40.0.0", - "YubicoDotNetClient": "1.2.0" + "AWSSDK.SQS": "[3.7.2.47, )", + "AWSSDK.SimpleEmail": "[3.7.0.150, )", + "AspNetCoreRateLimit": "[4.0.2, )", + "AspNetCoreRateLimit.Redis": "[1.0.1, )", + "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.2, )", + "Azure.Storage.Blobs": "[12.14.1, )", + "Azure.Storage.Queues": "[12.12.0, )", + "BitPay.Light": "[1.0.1907, )", + "Braintree": "[5.12.0, )", + "DnsClient": "[1.7.0, )", + "Fido2.AspNet": "[3.0.1, )", + "Handlebars.Net": "[2.1.2, )", + "IdentityServer4": "[4.1.2, )", + "IdentityServer4.AccessTokenValidation": "[3.0.1, )", + "LaunchDarkly.ServerSdk": "[7.0.0, )", + "MailKit": "[3.2.0, )", + "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.4, )", + "Microsoft.Azure.Cosmos.Table": "[1.0.8, )", + "Microsoft.Azure.NotificationHubs": "[4.1.0, )", + "Microsoft.Azure.ServiceBus": "[5.2.0, )", + "Microsoft.Data.SqlClient": "[5.0.1, )", + "Microsoft.Extensions.Caching.StackExchangeRedis": "[6.0.6, )", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "[6.0.1, )", + "Microsoft.Extensions.Configuration.UserSecrets": "[6.0.1, )", + "Microsoft.Extensions.Identity.Stores": "[6.0.4, )", + "Newtonsoft.Json": "[13.0.1, )", + "Otp.NET": "[1.2.2, )", + "Quartz": "[3.4.0, )", + "SendGrid": "[9.27.0, )", + "Sentry.Serilog": "[3.16.0, )", + "Serilog.AspNetCore": "[5.0.0, )", + "Serilog.Extensions.Logging": "[3.1.0, )", + "Serilog.Extensions.Logging.File": "[2.0.0, )", + "Serilog.Sinks.AzureCosmosDB": "[2.0.0, )", + "Serilog.Sinks.SyslogMessages": "[2.0.6, )", + "Stripe.net": "[40.0.0, )", + "YubicoDotNetClient": "[1.2.0, )" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Dapper": "2.0.123" + "Core": "[2023.5.0, )", + "Dapper": "[2.0.123, )" } }, "infrastructure.entityframework": { "type": "Project", "dependencies": { - "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", - "Microsoft.EntityFrameworkCore.Relational": "6.0.12", - "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", - "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", - "Npgsql.EntityFrameworkCore.PostgreSQL": "6.0.8", - "Pomelo.EntityFrameworkCore.MySql": "6.0.2", - "linq2db.EntityFrameworkCore": "6.11.0" + "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", + "Core": "[2023.5.0, )", + "Microsoft.EntityFrameworkCore.Relational": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.SqlServer": "[6.0.12, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.12, )", + "Npgsql.EntityFrameworkCore.PostgreSQL": "[6.0.8, )", + "Pomelo.EntityFrameworkCore.MySql": "[6.0.2, )", + "linq2db.EntityFrameworkCore": "[6.11.0, )" } }, "sharedweb": { "type": "Project", "dependencies": { - "Core": "2023.3.0", - "Infrastructure.Dapper": "2023.3.0", - "Infrastructure.EntityFramework": "2023.3.0" + "Core": "[2023.5.0, )", + "Infrastructure.Dapper": "[2023.5.0, )", + "Infrastructure.EntityFramework": "[2023.5.0, )" } } } diff --git a/util/SqliteMigrations/packages.lock.json b/util/SqliteMigrations/packages.lock.json index 5e97b54a6b..f15f8d717e 100644 --- a/util/SqliteMigrations/packages.lock.json +++ b/util/SqliteMigrations/packages.lock.json @@ -2797,7 +2797,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.1", - "Core": "2023.3.0", + "Core": "2023.4.3", "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.12", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12",