Skip to content

Commit

Permalink
VCST-2276: Update dependencies (#2861)
Browse files Browse the repository at this point in the history
  • Loading branch information
artem-dudarev authored Nov 22, 2024
1 parent dbd24d2 commit b1c7298
Show file tree
Hide file tree
Showing 16 changed files with 88 additions and 73 deletions.
10 changes: 10 additions & 0 deletions module.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ FluentValidation.dll
Hangfire.AspNetCore.dll
Hangfire.Console.dll
Hangfire.Core.dll
Hangfire.Core.resources.dll
Hangfire.MemoryStorage.dll
Hangfire.MySql.dll
Hangfire.NetCore.dll
Expand Down Expand Up @@ -63,22 +64,30 @@ Microsoft.EntityFrameworkCore.dll
Microsoft.EntityFrameworkCore.Relational.dll
Microsoft.EntityFrameworkCore.SqlServer.dll
Microsoft.Extensions.AmbientMetadata.Application.dll
Microsoft.Extensions.Caching.Memory.dll
Microsoft.Extensions.Compliance.Abstractions.dll
Microsoft.Extensions.Configuration.AzureAppConfiguration.dll
Microsoft.Extensions.Configuration.Binder.dll
Microsoft.Extensions.Configuration.FileExtensions.dll
Microsoft.Extensions.Configuration.Json.dll
Microsoft.Extensions.DependencyInjection.Abstractions.dll
Microsoft.Extensions.DependencyInjection.AutoActivation.dll
Microsoft.Extensions.DependencyInjection.dll
Microsoft.Extensions.DependencyModel.dll
Microsoft.Extensions.DiagnosticAdapter.dll
Microsoft.Extensions.Diagnostics.Abstractions.dll
Microsoft.Extensions.Diagnostics.ExceptionSummarization.dll
Microsoft.Extensions.Features.dll
Microsoft.Extensions.Hosting.Abstractions.dll
Microsoft.Extensions.Http.Diagnostics.dll
Microsoft.Extensions.Http.Polly.dll
Microsoft.Extensions.Http.Resilience.dll
Microsoft.Extensions.Identity.Core.dll
Microsoft.Extensions.Identity.Stores.dll
Microsoft.Extensions.Logging.Abstractions.dll
Microsoft.Extensions.Logging.AzureAppServices.dll
Microsoft.Extensions.Logging.Configuration.dll
Microsoft.Extensions.Logging.dll
Microsoft.Extensions.ObjectPool.dll
Microsoft.Extensions.Options.dll
Microsoft.Extensions.Resilience.dll
Expand Down Expand Up @@ -169,6 +178,7 @@ System.IO.Abstractions.dll
System.Linq.Async.dll
System.Memory.Data.dll
System.Runtime.Caching.dll
System.Security.Cryptography.Pkcs.dll
System.Security.Cryptography.ProtectedData.dll
System.Security.Cryptography.Xml.dll
System.Security.Permissions.dll
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[8.0.1,9)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Polly" Version="8.4.2" />
<PackageReference Include="Polly" Version="8.5.0" />
<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.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.8" />
<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.Extensions.Caching.Abstractions" Version="[8.0.0,9)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.2,9)" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.1,9)" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="[8.0.0,9)" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="[8.0.0,9)" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="[8.0.0,9)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog" Version="4.0.2" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.29" />
<PackageReference Include="Serilog" Version="4.1.0" />
<PackageReference Include="System.IO.Abstractions" Version="21.1.3" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="[8.0.11,9)">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="[8.0.11,9)">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql" Version="8.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8" />
<PackageReference Include="Npgsql" Version="[8.0.6,9)" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[8.0.11,9)" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="[8.0.11,9)">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
</ItemGroup>

<!--Workaround for vulnerable transitive packages-->
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.12.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<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 @@ -19,10 +19,10 @@

<ItemGroup>
<PackageReference Include="EntityFrameworkCore.Triggers" Version="1.2.3" />
<PackageReference Include="FluentValidation" Version="11.10.0" />
<PackageReference Include="FluentValidation" Version="11.11.0" />
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.11,9)" />
<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.1.160" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Hangfire" Version="1.8.14" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.14" />
<PackageReference Include="Hangfire" Version="1.8.15" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.15" />
<PackageReference Include="Hangfire.Console" Version="1.4.3" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.1" />
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
<PackageReference Include="Hangfire.PostgreSql" Version="1.20.9" />
<PackageReference Include="HangFire.SqlServer" Version="1.8.14" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
<PackageReference Include="Hangfire.PostgreSql" Version="1.20.10" />
<PackageReference Include="HangFire.SqlServer" Version="1.8.15" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="[8.0.2,9)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.2,9)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="[8.0.2,9)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.8" />
<PackageReference Include="Microsoft.IdentityModel.Validators" Version="8.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.IdentityModel.Validators" Version="8.2.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="5.8.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ public static void UpdateServerCertificateIfNeed(this IApplicationBuilder app, S

if (!string.IsNullOrEmpty(possiblyOldCert.Id))
{
// Delete old certificate in case of one exists (the Id of newly generated certs is null)
certificateService.DeleteAsync(new[] { possiblyOldCert.Id }).GetAwaiter().GetResult();
// Delete old certificate in case of one exists (the ID of newly generated certs is null)
certificateService.DeleteAsync([possiblyOldCert.Id]).GetAwaiter().GetResult();
}

certificateService.SaveChangesAsync(new[] { currentCert }).GetAwaiter().GetResult();
certificateService.SaveChangesAsync([currentCert]).GetAwaiter().GetResult();
}
}

Expand Down Expand Up @@ -128,8 +128,9 @@ public static void AddForwardedHeaders(this IServiceCollection services)

public static void AddCustomSecurityHeaders(this IServiceCollection services)
{
services.AddSecurityHeaderPolicies()
.SetPolicySelector(context =>
services.AddSecurityHeaderPolicies((policyBuilder, _) =>
{
policyBuilder.SetPolicySelector(context =>
{
var options = context.HttpContext.RequestServices.GetService<IOptions<SecurityHeadersOptions>>().Value;
var formActionUri = context.HttpContext.GetScpFormActionUri() ?? string.Empty;
Expand Down Expand Up @@ -177,6 +178,7 @@ public static void AddCustomSecurityHeaders(this IServiceCollection services)

return policies;
});
});
}

public static void OverrideScpFormActionUri(this HttpContext httpContext, string uri)
Expand Down
50 changes: 30 additions & 20 deletions src/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,39 +17,49 @@

<ItemGroup>
<PackageReference Include="Azure.Core" Version="1.44.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="[8.0.0,9)" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.28.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.32" />
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.8" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.65.0" />
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[8.0.11,9)" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.66.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.0.0-preview.1" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.0.0-preview.2" />
<PackageReference Include="OpenIddict.AspNetCore" Version="5.8.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageReference Include="Scrutor" Version="5.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.6.2" />
<PackageReference Include="Scrutor" Version="5.0.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="[6.6.2,6.7)" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="[6.6.2,6.7)" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.6.2" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="[6.6.2,6.7)" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="[6.6.2,6.7)" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="[8.0.1,9)" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageReference Include="VirtoCommerce.BuildWebpack" Version="1.0.0" />
</ItemGroup>

<!--Workaround for vulnerable transitive packages-->
<ItemGroup>
<PackageReference Include="MessagePack" Version="2.5.192" />
<PackageReference Include="System.Text.Json" Version="[8.0.5,9)" />
</ItemGroup>

<!--Temporary packages to be removed-->
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.TimeProvider" Version="[8.0.1,9)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VirtoCommerce.Platform.Data.MySql\VirtoCommerce.Platform.Data.MySql.csproj" />
<ProjectReference Include="..\VirtoCommerce.Platform.Data.PostgreSql\VirtoCommerce.Platform.Data.PostgreSql.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.1.3" />
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.2" />
Expand Down
Loading

0 comments on commit b1c7298

Please sign in to comment.