Skip to content

Commit

Permalink
VCST-1553: Update dependencies (#2818)
Browse files Browse the repository at this point in the history
  • Loading branch information
artem-dudarev authored Jul 30, 2024
1 parent bd4910f commit b639bb1
Show file tree
Hide file tree
Showing 22 changed files with 308 additions and 296 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 34 additions & 3 deletions module.ignore
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -78,18 +96,26 @@ 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
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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<noWarn>1591</noWarn>
<OutputType>Library</OutputType>
<IsPackable>True</IsPackable>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<noWarn>1591</noWarn>
<OutputType>Library</OutputType>
<IsPackable>True</IsPackable>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1705;1591</NoWarn>
<DocumentationFile>VirtoCommerce.Platform.Caching.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1705;1591</NoWarn>
<DocumentationFile>VirtoCommerce.Platform.Caching.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Polly" Version="8.2.0" />
<PackageReference Include="StackExchange.Redis" Version="2.7.4" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Polly" Version="8.4.1" />
<PackageReference Include="StackExchange.Redis" Version="2.8.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VirtoCommerce.Platform.Core\VirtoCommerce.Platform.Core.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VirtoCommerce.Platform.Core\VirtoCommerce.Platform.Core.csproj" />
</ItemGroup>

</Project>
17 changes: 5 additions & 12 deletions src/VirtoCommerce.Platform.Core/VirtoCommerce.Platform.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,22 @@
</PropertyGroup>

<ItemGroup>
<Folder Include="Messages\" />
<Folder Include="Specifications\" />
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.22.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="System.IO.Abstractions" Version="20.0.4" />
</ItemGroup>

<!--Workaround for vulnerable transitive packages-->
<ItemGroup>
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.1" />
<PackageReference Include="Serilog" Version="4.0.1" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.29" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
<Folder Include="Migrations\" />
<Folder Include="Migrations\Security\" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VirtoCommerce.Platform.Data\VirtoCommerce.Platform.Data.csproj" />
<ProjectReference Include="..\VirtoCommerce.Platform.Security\VirtoCommerce.Platform.Security.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@
</PropertyGroup>

<ItemGroup>
<Folder Include="Migrations\Data\" />
<Folder Include="Migrations\Security\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql" Version="8.0.3" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
</ItemGroup>

<!--Workaround for vulnerable transitive packages-->
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static IServiceCollection AddPlatformServices(this IServiceCollection ser
services.AddTransient<Func<IPlatformRepository>>(provider => () => provider.CreateScope().ServiceProvider.GetService<IPlatformRepository>());

services.AddSettings();
services.AddLocalization();
services.AddLocalizedItems();
services.AddDynamicProperties();

services.AddSingleton<InProcessBus>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ILocalizedItemService, LocalizedItemService>();
serviceCollection.AddSingleton<ILocalizedItemSearchService, LocalizedItemSearchService>();
Expand Down
69 changes: 34 additions & 35 deletions src/VirtoCommerce.Platform.Data/VirtoCommerce.Platform.Data.csproj
Original file line number Diff line number Diff line change
@@ -1,42 +1,41 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<noWarn>1591</noWarn>
<OutputType>Library</OutputType>
<IsPackable>True</IsPackable>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<noWarn>1591</noWarn>
<OutputType>Library</OutputType>
<IsPackable>True</IsPackable>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1705;1591</NoWarn>
<DocumentationFile>VirtoCommerce.Platform.Data.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1705;1591</NoWarn>
<DocumentationFile>VirtoCommerce.Platform.Data.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EntityFrameworkCore.Triggers" Version="1.2.3" />
<PackageReference Include="FluentValidation" Version="11.8.1" />
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Nager.Country" Version="4.0.0" />
<PackageReference Include="Serialize.Linq" Version="3.0.148" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="EntityFrameworkCore.Triggers" Version="1.2.3" />
<PackageReference Include="FluentValidation" Version="11.9.2" />
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Nager.Country" Version="4.0.0" />
<PackageReference Include="Serialize.Linq" Version="3.0.152" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VirtoCommerce.Platform.Caching\VirtoCommerce.Platform.Caching.csproj" />
<ProjectReference Include="..\VirtoCommerce.Platform.Core\VirtoCommerce.Platform.Core.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VirtoCommerce.Platform.Caching\VirtoCommerce.Platform.Caching.csproj" />
<ProjectReference Include="..\VirtoCommerce.Platform.Core\VirtoCommerce.Platform.Core.csproj" />
</ItemGroup>

</Project>
Loading

0 comments on commit b639bb1

Please sign in to comment.