Skip to content

Commit

Permalink
Update packages to last versions
Browse files Browse the repository at this point in the history
  • Loading branch information
PKrasniuk authored and pkrasnyuk committed Aug 1, 2024
1 parent 575053e commit ed0fe98
Show file tree
Hide file tree
Showing 29 changed files with 118 additions and 105 deletions.
10 changes: 5 additions & 5 deletions VideoPlatform.AIL/VideoPlatform.AIL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.ML" Version="3.0.0" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="3.0.0" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="3.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.7" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.ML" Version="3.0.1" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="3.0.1" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="3.0.1" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.4" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using IdentityServer4.Models;
using Duende.IdentityServer.Models;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Configuration;

Expand Down
11 changes: 5 additions & 6 deletions VideoPlatform.Api/VideoPlatform.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
<PackageReference Include="App.Metrics.AspNetCore.Tracking" Version="4.3.0" />
<PackageReference Include="App.Metrics.Formatters.Json" Version="4.3.0" />
<PackageReference Include="App.Metrics.Reporting.InfluxDB" Version="4.3.0" />
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.7" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.7.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.7.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions VideoPlatform.ApiGateway/VideoPlatform.ApiGateway.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MMLib.SwaggerForOcelot" Version="8.1.0" />
<PackageReference Include="Ocelot" Version="22.0.1" />
<PackageReference Include="Ocelot.Administration" Version="22.0.1" />
<PackageReference Include="Ocelot.Cache.CacheManager" Version="22.0.1" />
<PackageReference Include="MMLib.SwaggerForOcelot" Version="8.3.0" />
<PackageReference Include="Ocelot" Version="23.3.3" />
<PackageReference Include="Ocelot.Administration" Version="23.3.3" />
<PackageReference Include="Ocelot.Cache.CacheManager" Version="23.3.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using IdentityServer4.Models;
using Duende.IdentityServer.Models;
using Microsoft.Extensions.Configuration;

namespace VideoPlatform.AuthenticationService.Infrastructure.Configurations;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Microsoft.AspNetCore.Identity;
using System.Collections.Generic;
using Duende.IdentityServer.Models;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
Expand Down Expand Up @@ -39,7 +41,7 @@ public static void AddIdentityServerConfiguration(this IServiceCollection servic
.AddDeveloperSigningCredential()
.AddInMemoryIdentityResources(ClientsConfiguration.GetIdentityResources())
.AddInMemoryApiResources(clientsConfiguration.GetApiResources())
.AddInMemoryClients(clientsConfiguration.GetClients())
.AddInMemoryClients((ICollection<Client>)clientsConfiguration.GetClients())
.AddAspNetIdentity<AppUser>();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using Duende.IdentityServer;
using Duende.IdentityServer.Events;
using Duende.IdentityServer.Extensions;
using Duende.IdentityServer.Services;
using Duende.IdentityServer.Stores;
using IdentityModel;
using IdentityServer4.Events;
using IdentityServer4.Extensions;
using IdentityServer4.Services;
using IdentityServer4.Stores;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using VideoPlatform.BLL.Infrastructure.Extensions;
using VideoPlatform.Domain.Entities;

namespace IdentityServer4.Quickstart.UI;
Expand Down Expand Up @@ -294,20 +296,15 @@ private async Task<LoggedOutViewModel> BuildLoggedOutViewModelAsync(string logou
LogoutId = logoutId
};

if (User?.Identity.IsAuthenticated == true)
if (User.Identity?.IsAuthenticated == true)
{
var idp = User.FindFirst(JwtClaimTypes.IdentityProvider)?.Value;
if (idp != null && idp != IdentityServerConstants.LocalIdentityProvider)
{
var providerSupportsSignout = await HttpContext.GetSchemeSupportsSignOutAsync(idp);
if (providerSupportsSignout)
{
if (vm.LogoutId == null)
// if there's no current logout context, we need to create one
// this captures necessary info from the current logged in user
// before we signout and redirect away to the external IdP for signout
vm.LogoutId = await _interaction.CreateLogoutContextAsync();

vm.LogoutId ??= await _interaction.CreateLogoutContextAsync();
vm.ExternalAuthenticationScheme = idp;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
using System.Security.Claims;
using System.Security.Principal;
using System.Threading.Tasks;
using Duende.IdentityServer;
using Duende.IdentityServer.Services;
using Duende.IdentityServer.Stores;
using IdentityModel;
using IdentityServer4.Services;
using IdentityServer4.Stores;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@

using System.Linq;
using System.Threading.Tasks;
using IdentityServer4.Models;
using IdentityServer4.Services;
using IdentityServer4.Stores;
using Duende.IdentityServer;
using Duende.IdentityServer.Models;
using Duende.IdentityServer.Services;
using Duende.IdentityServer.Stores;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using IdentityServer4.Models;
using IdentityServer4.Services;
using IdentityServer4.Stores;
using Duende.IdentityServer;
using Duende.IdentityServer.Models;
using Duende.IdentityServer.Services;
using Duende.IdentityServer.Stores;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Threading.Tasks;
using IdentityServer4.Stores;
using Duende.IdentityServer.Stores;

namespace IdentityServer4.Quickstart.UI;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

using System.Collections.Generic;
using System.Threading.Tasks;
using IdentityServer4.Events;
using IdentityServer4.Extensions;
using IdentityServer4.Services;
using IdentityServer4.Stores;
using Duende.IdentityServer.Events;
using Duende.IdentityServer.Extensions;
using Duende.IdentityServer.Services;
using Duende.IdentityServer.Stores;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.


using IdentityServer4.Models;
using Duende.IdentityServer.Models;

namespace IdentityServer4.Quickstart.UI;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@


using System.Threading.Tasks;
using IdentityServer4.Services;
using Duende.IdentityServer.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.2" />
<PackageReference Include="Duende.IdentityServer" Version="7.0.6" />
<PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.0.6" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VideoPlatform.BLL\VideoPlatform.BLL.csproj" />
<ProjectReference Include="..\VideoPlatform.Common\VideoPlatform.Common.csproj" />
<ProjectReference Include="..\VideoPlatform.DAL\VideoPlatform.DAL.csproj" />
<ProjectReference Include="..\VideoPlatform.Domain\VideoPlatform.Domain.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using IdentityServer4.Hosting
@using Duende.IdentityServer.Hosting
@{
var version = typeof(IdentityServerMiddleware).Assembly.GetName().Version?.ToString();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@using IdentityServer4.Extensions
@using Duende.IdentityServer.Extensions
@using Microsoft.AspNetCore.Mvc.TagHelpers
@{
string name = null;
if (!true.Equals(ViewData["signed-out"]))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using Microsoft.AspNetCore.Builder;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
Expand All @@ -18,4 +21,11 @@ public static void AddBusinessInfrastructureBuilder(this IApplicationBuilder app

IdentityDataInitializer.SeedData(userManager, roleManager);
}

public static async Task<bool> GetSchemeSupportsSignOutAsync(this HttpContext context, string scheme)
{
var provider = context.RequestServices.GetRequiredService<IAuthenticationHandlerProvider>();
var handler = await provider.GetHandlerAsync(context, scheme);
return handler != null && handler is IAuthenticationSignOutHandler;
}
}
2 changes: 1 addition & 1 deletion VideoPlatform.CQRS/VideoPlatform.CQRS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="MediatR" Version="12.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions VideoPlatform.Common/VideoPlatform.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@

<ItemGroup>
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.MongoDB" Version="5.3.1" />
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.12" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
<PackageReference Include="Serilog.Sinks.MongoDB" Version="5.4.1" />
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.6.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion VideoPlatform.DAL/Repositories/EntityRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
using System.Transactions;
using EFCore.BulkExtensions;
using Microsoft.EntityFrameworkCore;
using VideoPlatform.Common.Models.Enums;
using VideoPlatform.DAL.Interfaces;
using VideoPlatform.DAL.Models;
using VideoPlatform.Domain.Entities;
using IsolationLevel = System.Data.IsolationLevel;
using SortOrder = VideoPlatform.Common.Models.Enums.SortOrder;

namespace VideoPlatform.DAL.Repositories;

Expand Down
20 changes: 10 additions & 10 deletions VideoPlatform.DAL/VideoPlatform.DAL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@


<ItemGroup>
<PackageReference Include="EFCore.BulkExtensions" Version="8.0.0" />
<PackageReference Include="IdentityServer4.EntityFramework" Version="4.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.37.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="EFCore.BulkExtensions" Version="8.1.0" />
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="7.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.7" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.42.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.0" />
<PackageReference Include="MongoDB.Driver" Version="2.23.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.7" />
<PackageReference Include="MongoDB.Driver" Version="2.28.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions VideoPlatform.Domain/VideoPlatform.Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.0" />
<PackageReference Include="MongoDB.Bson" Version="2.23.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.7" />
<PackageReference Include="MongoDB.Bson" Version="2.28.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="NEST" Version="7.17.5" />
<PackageReference Include="Nest" Version="7.17.5" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
<PackageReference Include="Polly" Version="8.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.7" />
<PackageReference Include="Polly" Version="8.4.1" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions VideoPlatform.MessageService/VideoPlatform.MessageService.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Confluent.Kafka" Version="2.3.0" />
<PackageReference Include="DotNetCore.CAP" Version="7.2.2" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="7.2.2" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="7.2.2" />
<PackageReference Include="DotNetCore.CAP.SqlServer" Version="7.2.2" />
<PackageReference Include="Confluent.Kafka" Version="2.5.0" />
<PackageReference Include="DotNetCore.CAP" Version="8.2.0" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="8.2.0" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="8.2.0" />
<PackageReference Include="DotNetCore.CAP.SqlServer" Version="8.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Polly" Version="8.2.0" />
<PackageReference Include="Polly" Version="8.4.1" />
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
</ItemGroup>

Expand Down
Loading

0 comments on commit ed0fe98

Please sign in to comment.