diff --git a/.editorconfig b/.editorconfig index 52a5b14dfc6..d467f1b26af 100644 --- a/.editorconfig +++ b/.editorconfig @@ -102,7 +102,7 @@ csharp_preserve_single_line_statements = false csharp_preserve_single_line_blocks = true csharp_using_directive_placement = outside_namespace:silent csharp_prefer_simple_using_statement = true:suggestion -csharp_style_namespace_declarations = block_scoped:silent +csharp_style_namespace_declarations = file_scoped:silent csharp_style_prefer_method_group_conversion = true:silent csharp_style_prefer_top_level_statements = true:silent csharp_style_expression_bodied_lambdas = true:silent diff --git a/module.ignore b/module.ignore index 38e07fc0f7c..314bbf67bf1 100644 --- a/module.ignore +++ b/module.ignore @@ -1,6 +1,10 @@ Azure.Core.dll +Azure.Data.AppConfiguration.dll Azure.Identity.dll +Azure.Messaging.EventGrid.dll +Azure.Security.KeyVault.Secrets.dll Dapper.dll +DnsClient.dll dotnet-swagger.dll EntityFrameworkCore.Triggers.dll FluentValidation.dll @@ -25,31 +29,40 @@ Microsoft.ApplicationInsights.AspNetCore.dll Microsoft.ApplicationInsights.dll Microsoft.AspNetCore.Authentication.JwtBearer.dll Microsoft.AspNetCore.Authentication.OpenIdConnect.dll +Microsoft.AspNetCore.Authorization.dll +Microsoft.AspNetCore.Connections.Abstractions.dll Microsoft.AspNetCore.Cryptography.Internal.dll Microsoft.AspNetCore.Cryptography.KeyDerivation.dll +Microsoft.AspNetCore.DataProtection.Abstractions.dll +Microsoft.AspNetCore.DataProtection.dll Microsoft.AspNetCore.DataProtection.StackExchangeRedis.dll Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.dll Microsoft.AspNetCore.Http.Connections.Client.dll +Microsoft.AspNetCore.Http.Connections.Common.dll Microsoft.AspNetCore.Identity.EntityFrameworkCore.dll Microsoft.AspNetCore.JsonPatch.dll +Microsoft.AspNetCore.Metadata.dll Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll Microsoft.AspNetCore.Server.Kestrel.Https.dll Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.dll Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.dll Microsoft.AspNetCore.SignalR.Client.Core.dll Microsoft.AspNetCore.SignalR.Client.dll +Microsoft.AspNetCore.SignalR.Common.dll +Microsoft.AspNetCore.SignalR.Protocols.Json.dll Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.dll Microsoft.AspNetCore.SignalR.StackExchangeRedis.dll +Microsoft.Azure.AppConfiguration.AspNetCore.dll Microsoft.Azure.SignalR.Common.dll Microsoft.Azure.SignalR.dll Microsoft.Azure.SignalR.Protocols.dll Microsoft.Bcl.AsyncInterfaces.dll -Microsoft.CodeAnalysis.dll -Microsoft.CodeAnalysis.resources.dll Microsoft.CodeAnalysis.CSharp.dll Microsoft.CodeAnalysis.CSharp.resources.dll Microsoft.CodeAnalysis.CSharp.Workspaces.dll Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll +Microsoft.CodeAnalysis.dll +Microsoft.CodeAnalysis.resources.dll Microsoft.CodeAnalysis.Workspaces.dll Microsoft.CodeAnalysis.Workspaces.resources.dll Microsoft.Data.SqlClient.dll @@ -61,14 +74,19 @@ Microsoft.EntityFrameworkCore.dll Microsoft.EntityFrameworkCore.Relational.dll Microsoft.EntityFrameworkCore.SqlServer.dll Microsoft.Extensions.Caching.Memory.dll +Microsoft.Extensions.Configuration.AzureAppConfiguration.dll +Microsoft.Extensions.DependencyInjection.Abstractions.dll Microsoft.Extensions.DependencyInjection.dll Microsoft.Extensions.DependencyModel.dll Microsoft.Extensions.DiagnosticAdapter.dll +Microsoft.Extensions.Features.dll Microsoft.Extensions.Http.Polly.dll Microsoft.Extensions.Identity.Core.dll Microsoft.Extensions.Identity.Stores.dll +Microsoft.Extensions.Logging.Abstractions.dll Microsoft.Extensions.Logging.ApplicationInsights.dll Microsoft.Extensions.Logging.AzureAppServices.dll +Microsoft.Extensions.Options.dll Microsoft.Extensions.PlatformAbstractions.dll Microsoft.Identity.Client.dll Microsoft.Identity.Client.Extensions.Msal.dll @@ -78,6 +96,7 @@ Microsoft.IdentityModel.Logging.dll Microsoft.IdentityModel.Protocols.dll Microsoft.IdentityModel.Protocols.OpenIdConnect.dll Microsoft.IdentityModel.Tokens.dll +Microsoft.NET.StringTools.dll Microsoft.OpenApi.dll Microsoft.SqlServer.Server.dll Microsoft.VisualStudio.Web.BrowserLink.dll @@ -85,11 +104,18 @@ Microsoft.Win32.SystemEvents.dll Mono.TextTemplating.dll MySqlConnector.dll Nager.Country.dll +NetEscapades.AspNetCore.SecurityHeaders.dll Newtonsoft.Json.Bson.dll Newtonsoft.Json.dll Npgsql.dll Npgsql.EntityFrameworkCore.PostgreSQL.dll OpenIddict.Abstractions.dll +OpenIddict.Client.AspNetCore.dll +OpenIddict.Client.DataProtection.dll +OpenIddict.Client.dll +OpenIddict.Client.SystemIntegration.dll +OpenIddict.Client.SystemNetHttp.dll +OpenIddict.Client.WebIntegration.dll OpenIddict.Core.dll OpenIddict.EntityFrameworkCore.dll OpenIddict.EntityFrameworkCore.Models.dll @@ -104,8 +130,8 @@ OpenIddict.Validation.SystemNetHttp.dll package.json package-lock.json Pipelines.Sockets.Unofficial.dll -Polly.dll Polly.Core.dll +Polly.dll Polly.Extensions.Http.dll Pomelo.EntityFrameworkCore.MySql.dll RedLockNet.Abstractions.dll @@ -120,14 +146,17 @@ Serilog.Formatting.Compact.dll Serilog.Settings.Configuration.dll Serilog.Sinks.Console.dll Serilog.Sinks.Debug.dll +Serilog.Sinks.File.dll sni.dll StackExchange.Redis.dll Swashbuckle.AspNetCore.Annotations.dll +Swashbuckle.AspNetCore.Filters.Abstractions.dll Swashbuckle.AspNetCore.Filters.dll Swashbuckle.AspNetCore.Newtonsoft.dll Swashbuckle.AspNetCore.Swagger.dll Swashbuckle.AspNetCore.SwaggerGen.dll Swashbuckle.AspNetCore.SwaggerUI.dll +System.ClientModel.dll System.CodeDom.dll System.Composition.AttributedModel.dll System.Composition.Convention.dll @@ -142,8 +171,10 @@ System.IdentityModel.Tokens.Jwt.dll System.IO.Abstractions.dll System.Linq.Async.dll System.Memory.Data.dll +System.Net.WebSockets.WebSocketProtocol.dll System.Runtime.Caching.dll System.Security.Cryptography.ProtectedData.dll +System.Security.Cryptography.Xml.dll System.Security.Permissions.dll System.Windows.Extensions.dll TestableIO.System.IO.Abstractions.dll diff --git a/src/VirtoCommerce.Platform.Caching/VirtoCommerce.Platform.Caching.csproj b/src/VirtoCommerce.Platform.Caching/VirtoCommerce.Platform.Caching.csproj index 70978a889ef..ab5581d2b54 100644 --- a/src/VirtoCommerce.Platform.Caching/VirtoCommerce.Platform.Caching.csproj +++ b/src/VirtoCommerce.Platform.Caching/VirtoCommerce.Platform.Caching.csproj @@ -1,34 +1,33 @@ - - net8.0 - 1591 - Library - True - true - true - true - snupkg - + + net8.0 + 1591 + Library + True + true + true + true + snupkg + - - 1701;1702;1705;1591 - VirtoCommerce.Platform.Caching.xml - + + 1701;1702;1705;1591 + VirtoCommerce.Platform.Caching.xml + - - - - - - - - - - + + + + + + + + + - - - + + + diff --git a/src/VirtoCommerce.Platform.Core/VirtoCommerce.Platform.Core.csproj b/src/VirtoCommerce.Platform.Core/VirtoCommerce.Platform.Core.csproj index 11075953732..6ffc7c99c9b 100644 --- a/src/VirtoCommerce.Platform.Core/VirtoCommerce.Platform.Core.csproj +++ b/src/VirtoCommerce.Platform.Core/VirtoCommerce.Platform.Core.csproj @@ -19,29 +19,22 @@ - - + - - + - + - - - - - - - + + diff --git a/src/VirtoCommerce.Platform.Data.MySql/VirtoCommerce.Platform.Data.MySql.csproj b/src/VirtoCommerce.Platform.Data.MySql/VirtoCommerce.Platform.Data.MySql.csproj index 8a9f28b32f2..435345ef9f0 100644 --- a/src/VirtoCommerce.Platform.Data.MySql/VirtoCommerce.Platform.Data.MySql.csproj +++ b/src/VirtoCommerce.Platform.Data.MySql/VirtoCommerce.Platform.Data.MySql.csproj @@ -7,17 +7,12 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - diff --git a/src/VirtoCommerce.Platform.Data.PostgreSql/VirtoCommerce.Platform.Data.PostgreSql.csproj b/src/VirtoCommerce.Platform.Data.PostgreSql/VirtoCommerce.Platform.Data.PostgreSql.csproj index 251d81e96cc..188063f9376 100644 --- a/src/VirtoCommerce.Platform.Data.PostgreSql/VirtoCommerce.Platform.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.Platform.Data.PostgreSql/VirtoCommerce.Platform.Data.PostgreSql.csproj @@ -7,16 +7,11 @@ - - - - - - + runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.Platform.Data.SqlServer/VirtoCommerce.Platform.Data.SqlServer.csproj b/src/VirtoCommerce.Platform.Data.SqlServer/VirtoCommerce.Platform.Data.SqlServer.csproj index 49c232871c1..795659f0db1 100644 --- a/src/VirtoCommerce.Platform.Data.SqlServer/VirtoCommerce.Platform.Data.SqlServer.csproj +++ b/src/VirtoCommerce.Platform.Data.SqlServer/VirtoCommerce.Platform.Data.SqlServer.csproj @@ -7,15 +7,16 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive - + - + + diff --git a/src/VirtoCommerce.Platform.Data/Extensions/ServiceCollectionExtensions.cs b/src/VirtoCommerce.Platform.Data/Extensions/ServiceCollectionExtensions.cs index 6b46b34b3af..e8e3cd76ef6 100644 --- a/src/VirtoCommerce.Platform.Data/Extensions/ServiceCollectionExtensions.cs +++ b/src/VirtoCommerce.Platform.Data/Extensions/ServiceCollectionExtensions.cs @@ -34,7 +34,7 @@ public static IServiceCollection AddPlatformServices(this IServiceCollection ser services.AddTransient>(provider => () => provider.CreateScope().ServiceProvider.GetService()); services.AddSettings(); - services.AddLocalization(); + services.AddLocalizedItems(); services.AddDynamicProperties(); services.AddSingleton(); diff --git a/src/VirtoCommerce.Platform.Data/Localizations/ServiceCollectionExtensions.cs b/src/VirtoCommerce.Platform.Data/Localizations/ServiceCollectionExtensions.cs index e0259d11228..18e1d099aea 100644 --- a/src/VirtoCommerce.Platform.Data/Localizations/ServiceCollectionExtensions.cs +++ b/src/VirtoCommerce.Platform.Data/Localizations/ServiceCollectionExtensions.cs @@ -5,7 +5,7 @@ namespace VirtoCommerce.Platform.Data.Localizations { public static class ServiceCollectionExtensions { - public static IServiceCollection AddLocalization(this IServiceCollection serviceCollection) + public static IServiceCollection AddLocalizedItems(this IServiceCollection serviceCollection) { serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); diff --git a/src/VirtoCommerce.Platform.Data/VirtoCommerce.Platform.Data.csproj b/src/VirtoCommerce.Platform.Data/VirtoCommerce.Platform.Data.csproj index f1ff9e6ccb4..40b93a21c10 100644 --- a/src/VirtoCommerce.Platform.Data/VirtoCommerce.Platform.Data.csproj +++ b/src/VirtoCommerce.Platform.Data/VirtoCommerce.Platform.Data.csproj @@ -1,42 +1,41 @@ - - net8.0 - 1591 - Library - True - true - true - true - snupkg - true - + + net8.0 + 1591 + Library + True + true + true + true + snupkg + true + - - 1701;1702;1705;1591 - VirtoCommerce.Platform.Data.xml - + + 1701;1702;1705;1591 + VirtoCommerce.Platform.Data.xml + - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + - - - - + + + + diff --git a/src/VirtoCommerce.Platform.DistributedLock/VirtoCommerce.Platform.DistributedLock.csproj b/src/VirtoCommerce.Platform.DistributedLock/VirtoCommerce.Platform.DistributedLock.csproj index 810d50b9f28..6eb38d99e5d 100644 --- a/src/VirtoCommerce.Platform.DistributedLock/VirtoCommerce.Platform.DistributedLock.csproj +++ b/src/VirtoCommerce.Platform.DistributedLock/VirtoCommerce.Platform.DistributedLock.csproj @@ -1,30 +1,30 @@ - - net8.0 - 1591 - - Library - True - true - true - true - snupkg - - + + net8.0 + 1591 + + Library + True + true + true + true + snupkg + + - - 1701;1702;1705;1591 - VirtoCommerce.Platform.DistributedLock.xml - + + 1701;1702;1705;1591 + VirtoCommerce.Platform.DistributedLock.xml + - - - - + + + + - - - + + + diff --git a/src/VirtoCommerce.Platform.Hangfire/VirtoCommerce.Platform.Hangfire.csproj b/src/VirtoCommerce.Platform.Hangfire/VirtoCommerce.Platform.Hangfire.csproj index e8633c8e1dc..77f63813a8c 100644 --- a/src/VirtoCommerce.Platform.Hangfire/VirtoCommerce.Platform.Hangfire.csproj +++ b/src/VirtoCommerce.Platform.Hangfire/VirtoCommerce.Platform.Hangfire.csproj @@ -19,14 +19,14 @@ - - - - + + + + - - - + + + diff --git a/src/VirtoCommerce.Platform.Modules/VirtoCommerce.Platform.Modules.csproj b/src/VirtoCommerce.Platform.Modules/VirtoCommerce.Platform.Modules.csproj index c21d184c9fe..89f181a0861 100644 --- a/src/VirtoCommerce.Platform.Modules/VirtoCommerce.Platform.Modules.csproj +++ b/src/VirtoCommerce.Platform.Modules/VirtoCommerce.Platform.Modules.csproj @@ -1,34 +1,33 @@ - - net8.0 - 1591 - Library - True - true - true - true - snupkg - + + net8.0 + 1591 + Library + True + true + true + true + snupkg + - - 1701;1702;1705;1591 - VirtoCommerce.Platform.Modules.xml - + + 1701;1702;1705;1591 + VirtoCommerce.Platform.Modules.xml + - - - - - - - - - + + + + + + + + - - - - + + + + diff --git a/src/VirtoCommerce.Platform.Security/VirtoCommerce.Platform.Security.csproj b/src/VirtoCommerce.Platform.Security/VirtoCommerce.Platform.Security.csproj index c0b9d432e89..7c1c4c73ab3 100644 --- a/src/VirtoCommerce.Platform.Security/VirtoCommerce.Platform.Security.csproj +++ b/src/VirtoCommerce.Platform.Security/VirtoCommerce.Platform.Security.csproj @@ -18,21 +18,17 @@ - - - - - + + + + - - - - - + + diff --git a/src/VirtoCommerce.Platform.Web/Startup.cs b/src/VirtoCommerce.Platform.Web/Startup.cs index 85f1cdd0737..f01993914fa 100644 --- a/src/VirtoCommerce.Platform.Web/Startup.cs +++ b/src/VirtoCommerce.Platform.Web/Startup.cs @@ -565,7 +565,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILogger< { app.UseDeveloperExceptionPage(); app.UseMigrationsEndPoint(); - app.UseBrowserLink(); } else { diff --git a/src/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj b/src/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj index ee6ef442da4..c941a81694e 100644 --- a/src/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj +++ b/src/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj @@ -10,57 +10,50 @@ ..\.. local + 1701;1702;1705;1591 - - - - - - - - - - - - - - + + + + + + + + + + + + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + + - - + - - + + - - - - - - + + + + + + + @@ -70,6 +63,7 @@ + @@ -89,6 +83,7 @@ + @@ -106,4 +101,5 @@ --> + diff --git a/tests/VirtoCommerce.Platform.Caching.Tests/CacheDisablerTests.cs b/tests/VirtoCommerce.Platform.Caching.Tests/CacheDisablerTests.cs index bf0d0c6c416..35ad1ee3b55 100644 --- a/tests/VirtoCommerce.Platform.Caching.Tests/CacheDisablerTests.cs +++ b/tests/VirtoCommerce.Platform.Caching.Tests/CacheDisablerTests.cs @@ -67,7 +67,7 @@ public async Task NotInheritedSetAfterAsyncMethodStarts() } [Fact] - public async void NotInheritedSetAfterAsyncMethodStartsInAnotherAsyncMethod() + public async Task NotInheritedSetAfterAsyncMethodStartsInAnotherAsyncMethod() { Assert.False(CacheDisabler.CacheDisabled, "CacheDisabler shouldn't be active in this thread before test."); diff --git a/tests/VirtoCommerce.Platform.Caching.Tests/VirtoCommerce.Platform.Caching.Tests.csproj b/tests/VirtoCommerce.Platform.Caching.Tests/VirtoCommerce.Platform.Caching.Tests.csproj index 2216bbadcbc..6fd65fc2613 100644 --- a/tests/VirtoCommerce.Platform.Caching.Tests/VirtoCommerce.Platform.Caching.Tests.csproj +++ b/tests/VirtoCommerce.Platform.Caching.Tests/VirtoCommerce.Platform.Caching.Tests.csproj @@ -2,20 +2,19 @@ net8.0 - false - - - - - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/VirtoCommerce.Platform.Core.Tests/VirtoCommerce.Platform.Core.Tests.csproj b/tests/VirtoCommerce.Platform.Core.Tests/VirtoCommerce.Platform.Core.Tests.csproj index 340b2dd92a1..86703107a9e 100644 --- a/tests/VirtoCommerce.Platform.Core.Tests/VirtoCommerce.Platform.Core.Tests.csproj +++ b/tests/VirtoCommerce.Platform.Core.Tests/VirtoCommerce.Platform.Core.Tests.csproj @@ -2,20 +2,19 @@ net8.0 - false - - - - - - all + runtime; build; native; contentfiles; analyzers; buildtransitive + all - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/VirtoCommerce.Platform.Tests/VirtoCommerce.Platform.Tests.csproj b/tests/VirtoCommerce.Platform.Tests/VirtoCommerce.Platform.Tests.csproj index f03ef701a6a..cb567dbb62f 100644 --- a/tests/VirtoCommerce.Platform.Tests/VirtoCommerce.Platform.Tests.csproj +++ b/tests/VirtoCommerce.Platform.Tests/VirtoCommerce.Platform.Tests.csproj @@ -1,41 +1,42 @@ - - net8.0 - false - 1591 - d6c1f7d4-06d1-4f4e-8c58-7a79573b50f6 - + + net8.0 + false + 1591 + d6c1f7d4-06d1-4f4e-8c58-7a79573b50f6 + - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + + + + + runtime; build; native; contentfiles; analyzers + all + + + + + + + + + + + + - - - - - - - - diff --git a/tests/VirtoCommerce.Platform.Web.Tests/VirtoCommerce.Platform.Web.Tests.csproj b/tests/VirtoCommerce.Platform.Web.Tests/VirtoCommerce.Platform.Web.Tests.csproj index 1bdb6536893..c21bf9f52d9 100644 --- a/tests/VirtoCommerce.Platform.Web.Tests/VirtoCommerce.Platform.Web.Tests.csproj +++ b/tests/VirtoCommerce.Platform.Web.Tests/VirtoCommerce.Platform.Web.Tests.csproj @@ -1,30 +1,30 @@ - - net8.0 + + net8.0 + false + - false - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + - - - - - diff --git a/tests/VirtoCommerce.Testing/VirtoCommerce.Testing.csproj b/tests/VirtoCommerce.Testing/VirtoCommerce.Testing.csproj index f6ff1c6aa30..6defe7540ce 100644 --- a/tests/VirtoCommerce.Testing/VirtoCommerce.Testing.csproj +++ b/tests/VirtoCommerce.Testing/VirtoCommerce.Testing.csproj @@ -1,23 +1,33 @@ - - net8.0 - 1591 - latest - True - true - true - true - snupkg - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - + + + net8.0 + 1591 + latest + True + true + true + true + snupkg + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + + + + + +