Skip to content

Commit

Permalink
chore(resources): Packages update (#688)
Browse files Browse the repository at this point in the history
- [ ] New feature
- [ ] Bug fix
- [ ] High impact

**Description of work:**

AB55718

This updates all packages to the latest version. ~excluding
Fusion.AspNetCore. Fusion.AspNetCore version above 7.0.1 causes the
PatchModelBinder to fail to parse
PatchProperty<ApiPropertiesCollection?> properties in patch requests.~

~Where PatchProperty with ApiPropertiesCollection will always be empty.
I have created an issue for this:
equinor/fusion#400

Issue has been closed and I've added the newest Fusion.AspNetCore
version to this PR

**Testing:**
- [ ] Can be tested
- [x] Automatic tests created / updated
- [x] Local tests are passing



**Checklist:**
- [x] Considered automated tests
- [x] Considered updating specification / documentation
- [x] Considered work items 
- [x] Considered security
- [x] Performed developer testing
- [x] Checklist finalized / ready for review
  • Loading branch information
Jonathanio123 authored Sep 24, 2024
1 parent d24676e commit 12c0596
Show file tree
Hide file tree
Showing 25 changed files with 118 additions and 116 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="AdaptiveCards" Version="3.1.0" />
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.1"/>
<PackageReference Include="Fusion.Integration" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration" Version="8.0.7"/>
<PackageReference Include="Fusion.Events.Azure.Functions.Extensions" Version="6.0.5"/>
<PackageReference Include="Fusion.Events.Services" Version="8.0.1"/>
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0"/>
Expand Down
36 changes: 17 additions & 19 deletions src/Fusion.Summary.Api/Fusion.Summary.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,33 @@

<ItemGroup>
<PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2"/>
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0"/>
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2"/>
<PackageReference Include="Fusion.AspNetCore" Version="8.0.4"/>
<PackageReference Include="Fusion.AspNetCore.FluentAuthorization" Version="8.0.0" />
<PackageReference Include="Fusion.AspNetCore.Versioning" Version="8.1.0"/>
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.10.0"/>
<PackageReference Include="Fusion.AspNetCore" Version="8.0.6"/>
<PackageReference Include="Fusion.AspNetCore.FluentAuthorization" Version="8.0.1"/>
<PackageReference Include="Fusion.Infrastructure.Database" Version="8.0.5"/>
<PackageReference Include="Fusion.Integration" Version="8.0.0" />
<PackageReference Include="Fusion.Integration.Authorization" Version="8.0.0" />
<PackageReference Include="MediatR" Version="12.3.0" />
<PackageReference Include="Fusion.Integration" Version="8.0.7"/>
<PackageReference Include="MediatR" Version="12.4.1"/>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8"/>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8"/>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8"/>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.8"/>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
10 changes: 5 additions & 5 deletions src/Fusion.Summary.Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
builder.AddKeyVault();
}

var azureAdClientId = builder.Configuration["AzureAd:ClientId"];
var azureAdClientId = builder.Configuration["AzureAd:ClientId"] ?? throw new InvalidOperationException("Missing AzureAd:ClientId");
var azureAdClientSecret = builder.Configuration["AzureAd:ClientSecret"];
var certThumbprint = builder.Configuration["Config:CertThumbprint"];
var environment = builder.Configuration["Environment"];
var fusionEnvironment = builder.Configuration["FUSION_ENVIRONMENT"];
var environment = builder.Configuration["Environment"] ?? "Development";
var fusionEnvironment = builder.Configuration["FUSION_ENVIRONMENT"] ?? "ci";
var databaseConnectionString = builder.Configuration.GetConnectionString(nameof(SummaryDbContext))!;

builder.Services.AddControllers();
Expand Down Expand Up @@ -60,10 +60,10 @@
{
f.AddFusionAuthorization();
f.UseServiceInformation("Fusion.Summary.Api", environment);
f.UseDefaultEndpointResolver(fusionEnvironment ?? "ci");
f.UseDefaultEndpointResolver(fusionEnvironment);
f.UseDefaultTokenProvider(opts =>
{
opts.ClientId = azureAdClientId ?? throw new InvalidOperationException("Missing AzureAd:ClientId");
opts.ClientId = azureAdClientId;
opts.ClientSecret = azureAdClientSecret;
opts.CertificateThumbprint = certThumbprint;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Fusion.Integration.Authorization" Version="8.0.0" />
<PackageReference Include="Fusion.Integration.Authorization" Version="8.0.6"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\api\Fusion.Resources.Database\Fusion.Resources.Database.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Fusion.AspNetCore" Version="7.0.1"/>
<PackageReference Include="Fusion.Integration.Authorization" Version="8.0.0"/>
<PackageReference Include="Fusion.AspNetCore" Version="8.0.6"/>
<PackageReference Include="Fusion.AspNetCore.Versioning" Version="8.1.0"/>
<PackageReference Include="Fusion.Integration.Authorization" Version="8.0.6"/>
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2"/>
<PackageReference Include="swashbuckle.AspNetCore.Swagger" Version="6.6.2"/>
<PackageReference Include="swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2"/>
<PackageReference Include="swashbuckle.AspNetCore.SwaggerUi" Version="6.6.2"/>
<PackageReference Include="swashbuckle.AspNetCore.Swagger" Version="6.7.3" />
<PackageReference Include="swashbuckle.AspNetCore.SwaggerGen" Version="6.7.3" />
<PackageReference Include="swashbuckle.AspNetCore.SwaggerUi" Version="6.7.3" />
</ItemGroup>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ namespace Fusion.Resources.Api.Controllers
[ApiController]
[ApiVersion("1.0-preview")]
[ApiVersion("1.0")]
[ApiVersion("2.0")]
public partial class InternalPersonnelController : ResourceControllerBase
{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace Fusion.Resources.Api.Controllers
{
[ApiVersion("1.0-preview")]
[ApiVersion("1.0")]
[ApiVersion("2.0")]
[Authorize]
[ApiController]
public class AnalyticsController : ResourceControllerBase
Expand Down Expand Up @@ -44,6 +45,7 @@ public async Task<ActionResult<ApiCollection<ApiResourceAllocationRequestForAnal
return collection;
}

[MapToApiVersion("1.0")]
[HttpGet("/analytics/absence/internal")]
public async Task<ActionResult<ApiCollection<ApiPersonAbsenceForAnalytics>>> GetPersonsAbsence([FromQuery] ODataQueryParams query)
{
Expand Down
37 changes: 17 additions & 20 deletions src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,36 @@
<ItemGroup>
<None Remove="Data\personnel-import-template.xlsx" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Data\personnel-import-template.xlsx" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
<PackageReference Include="Bogus" Version="35.5.1" />
<PackageReference Include="Fusion.Infrastructure.MediatR" Version="7.0.0" />
<PackageReference Include="Fusion.Integration" Version="8.0.0" />
<PackageReference Include="Fusion.Events.Client" Version="8.0.2" />
<PackageReference Include="Fusion.Events.Server" Version="8.0.0" />
<PackageReference Include="Fusion.Integration.Authorization" Version="8.0.0" />
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.0" />
<PackageReference Include="Fusion.Integration.Org" Version="8.0.0" />
<PackageReference Include="Fusion.Integration.Roles" Version="8.0.0" />
<PackageReference Include="Fusion.Integration.Notification" Version="8.0.0" />
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.1" />
<PackageReference Include="Fusion.AspNetCore" Version="7.0.1" />
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2"/>
<PackageReference Include="Bogus" Version="35.6.1"/>
<PackageReference Include="Fusion.Infrastructure.MediatR" Version="8.0.2"/>
<PackageReference Include="Fusion.Integration" Version="8.0.7"/>
<PackageReference Include="Fusion.Events.Client" Version="8.1.1"/>
<PackageReference Include="Fusion.Events.Server" Version="8.0.4"/>
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Org" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Roles" Version="8.0.8"/>
<PackageReference Include="Fusion.Integration.Notification" Version="8.0.7"/>
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.1"/>
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="JSM.FluentValidation.AspNet.AsyncFilter" Version="2.0.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8"/>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
<PackageReference Include="swashbuckle.AspNetCore.Swagger" Version="6.6.2" />
<PackageReference Include="swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
<PackageReference Include="swashbuckle.AspNetCore.SwaggerUi" Version="6.6.2" />
<PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="TimePeriodCore" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Fusion.Resources.Infrastructure\Fusion.Resources.Infrastructure.csproj"/><ProjectReference Include="..\..\Fusion.Resources.Authorization\Fusion.Resources.Authorization.csproj" />
<ProjectReference Include="..\Fusion.Resources.Application\Fusion.Resources.Application.csproj" />
Expand Down
3 changes: 2 additions & 1 deletion src/backend/api/Fusion.Resources.Api/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using Microsoft.Extensions.Hosting;
using SixLabors.ImageSharp;
using System.Reflection;
using Fusion.AspNetCore.Versioning;

namespace Fusion.Resources.Api
{
Expand Down Expand Up @@ -58,7 +59,7 @@ public void ConfigureServices(IServiceCollection services)
s.ReportApiVersions = true;
s.AssumeDefaultVersionWhenUnspecified = true;
s.DefaultApiVersion = new Microsoft.AspNetCore.Mvc.ApiVersion(1, 0);
s.ApiVersionReader = new Fusion.AspNetCore.Mvc.Versioning.HeaderOrQueryVersionReader("api-version");
s.ApiVersionReader = new HeaderOrQueryVersionReader("api-version");
});

services.AddHttpContextAccessor();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.17.5" />
<PackageReference Include="Fusion.Integration.Profile" Version="8.0.0" />
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.1"/>
<PackageReference Include="Fusion.Integration.Profile" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.6"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />

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

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8"/>
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AdaptiveCards" Version="3.0.0" />
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.0" />
<PackageReference Include="Fusion.Integration.LineOrg.Abstractions" Version="8.0.0" />
<PackageReference Include="MediatR" Version="12.3.0" />
<PackageReference Include="Fusion.AspNetCore" Version="7.0.1" />
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Notification" Version="8.0.7" />
<PackageReference Include="MediatR" Version="12.4.1"/>
<PackageReference Include="Fusion.AspNetCore" Version="8.0.6"/>
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.1"/>
<PackageReference Include="Fusion.Integration.Profile.Abstractions" Version="8.0.0" />
<PackageReference Include="Fusion.Integration.Org.Abstractions" Version="7.0.4" />
<PackageReference Include="Fusion.Integration.Roles.Abstractions" Version="7.0.4" />
<PackageReference Include="Fusion.Integration.Profile.Abstractions" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Org.Abstractions" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Roles.Abstractions" Version="8.0.8"/>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />

<PackageReference Include="TimePeriodCore" Version="1.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />

</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="FluentAssertions" Version="6.12.1"/>
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageReference Include="Moq" Version="4.20.72"/>
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading

0 comments on commit 12c0596

Please sign in to comment.