From 4d168f438d76895e56849d44b724ed9d672635fd Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Fri, 23 Aug 2024 13:49:49 +0200 Subject: [PATCH 01/16] Updated Summary api --- .../Fusion.Summary.Api.csproj | 30 +++++++++---------- src/Fusion.Summary.Api/Program.cs | 10 +++---- .../Fusion.Resources.Infrastructure.csproj | 11 +++---- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj b/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj index 0a9d61b22..ff33638a7 100644 --- a/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj +++ b/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj @@ -13,35 +13,33 @@ - + - - - - + + - - - - - + + + + + - + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Fusion.Summary.Api/Program.cs b/src/Fusion.Summary.Api/Program.cs index 5f3858339..cb5bfe78a 100644 --- a/src/Fusion.Summary.Api/Program.cs +++ b/src/Fusion.Summary.Api/Program.cs @@ -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(); @@ -62,10 +62,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; }); diff --git a/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj b/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj index d649f9f74..837caf0c5 100644 --- a/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj +++ b/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj @@ -7,12 +7,13 @@ - - + + + - - - + + + From c428a617d8fd2af11b25f6d01ba3a55ce9f5a0e7 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Fri, 23 Aug 2024 14:13:39 +0200 Subject: [PATCH 02/16] Updated packages for resources --- .../Fusion.Resources.Authorization.csproj | 2 +- .../Fusion.Resources.Api.csproj | 32 ++++++++----------- .../api/Fusion.Resources.Api/Startup.cs | 3 +- .../Fusion.Resources.Application.csproj | 8 ++--- .../Fusion.Resources.Database.csproj | 8 ++--- .../Fusion.Resources.Domain.csproj | 15 ++++----- 6 files changed, 31 insertions(+), 37 deletions(-) diff --git a/src/backend/Fusion.Resources.Authorization/Fusion.Resources.Authorization.csproj b/src/backend/Fusion.Resources.Authorization/Fusion.Resources.Authorization.csproj index 494ada828..8f0d4f800 100644 --- a/src/backend/Fusion.Resources.Authorization/Fusion.Resources.Authorization.csproj +++ b/src/backend/Fusion.Resources.Authorization/Fusion.Resources.Authorization.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj b/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj index 98ea6d587..b52e06e58 100644 --- a/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj +++ b/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj @@ -15,30 +15,24 @@ - - - - - - - - - - - - - + + + + + + + + + + + - + - - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/backend/api/Fusion.Resources.Api/Startup.cs b/src/backend/api/Fusion.Resources.Api/Startup.cs index 10b72aa24..5d6ddeeb4 100644 --- a/src/backend/api/Fusion.Resources.Api/Startup.cs +++ b/src/backend/api/Fusion.Resources.Api/Startup.cs @@ -23,6 +23,7 @@ using Microsoft.Extensions.Hosting; using SixLabors.ImageSharp; using System.Reflection; +using Fusion.AspNetCore.Versioning; namespace Fusion.Resources.Api { @@ -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(); diff --git a/src/backend/api/Fusion.Resources.Application/Fusion.Resources.Application.csproj b/src/backend/api/Fusion.Resources.Application/Fusion.Resources.Application.csproj index 87c165680..25743785f 100644 --- a/src/backend/api/Fusion.Resources.Application/Fusion.Resources.Application.csproj +++ b/src/backend/api/Fusion.Resources.Application/Fusion.Resources.Application.csproj @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/src/backend/api/Fusion.Resources.Database/Fusion.Resources.Database.csproj b/src/backend/api/Fusion.Resources.Database/Fusion.Resources.Database.csproj index af751439a..a1caa516c 100644 --- a/src/backend/api/Fusion.Resources.Database/Fusion.Resources.Database.csproj +++ b/src/backend/api/Fusion.Resources.Database/Fusion.Resources.Database.csproj @@ -7,13 +7,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj b/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj index 4eee602ef..ea44bdb39 100644 --- a/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj +++ b/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj @@ -6,15 +6,14 @@ - - - - - + + + + - - - + + + From 555d96fd8f16ff64abcbe52ebc14c3355874525c Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Fri, 23 Aug 2024 14:48:57 +0200 Subject: [PATCH 03/16] Updated tests --- .../Fusion.Resources.Api.Tests.csproj | 8 ++++---- .../Fusion.Resources.Domain.Tests.csproj | 6 +++--- .../Fusion.Resources.Functions.Tests.csproj | 6 +++--- .../Fusion.Resources.Logic.Tests.csproj | 6 +++--- .../Fusion.Resources.Test.Core.csproj | 2 +- .../Fusion.Testing.Authentication.csproj | 6 +++--- .../Fusion.Testing.Core/Fusion.Testing.Core.csproj | 2 +- .../Fusion.Testing.Mocks.ContextService.csproj | 8 ++++---- .../Fusion.Testing.Mocks.LineOrgService.csproj | 6 +++--- .../Fusion.Testing.Mocks.OrgService.csproj | 12 ++++++------ .../Fusion.Testing.Mocks.ProfileService.csproj | 12 ++++++------ .../Fusion.Summary.Api.Tests.csproj | 8 ++++---- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/backend/tests/Fusion.Resources.Api.Tests/Fusion.Resources.Api.Tests.csproj b/src/backend/tests/Fusion.Resources.Api.Tests/Fusion.Resources.Api.Tests.csproj index 0f0188b89..610756af4 100644 --- a/src/backend/tests/Fusion.Resources.Api.Tests/Fusion.Resources.Api.Tests.csproj +++ b/src/backend/tests/Fusion.Resources.Api.Tests/Fusion.Resources.Api.Tests.csproj @@ -22,9 +22,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -32,7 +32,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/backend/tests/Fusion.Resources.Domain.Tests/Fusion.Resources.Domain.Tests.csproj b/src/backend/tests/Fusion.Resources.Domain.Tests/Fusion.Resources.Domain.Tests.csproj index 3b2f41785..619466ded 100644 --- a/src/backend/tests/Fusion.Resources.Domain.Tests/Fusion.Resources.Domain.Tests.csproj +++ b/src/backend/tests/Fusion.Resources.Domain.Tests/Fusion.Resources.Domain.Tests.csproj @@ -14,10 +14,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/backend/tests/Fusion.Resources.Functions.Tests/Fusion.Resources.Functions.Tests.csproj b/src/backend/tests/Fusion.Resources.Functions.Tests/Fusion.Resources.Functions.Tests.csproj index f306397cf..0404dd231 100644 --- a/src/backend/tests/Fusion.Resources.Functions.Tests/Fusion.Resources.Functions.Tests.csproj +++ b/src/backend/tests/Fusion.Resources.Functions.Tests/Fusion.Resources.Functions.Tests.csproj @@ -11,10 +11,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/backend/tests/Fusion.Resources.Logic.Tests/Fusion.Resources.Logic.Tests.csproj b/src/backend/tests/Fusion.Resources.Logic.Tests/Fusion.Resources.Logic.Tests.csproj index cd841747c..b11b73509 100644 --- a/src/backend/tests/Fusion.Resources.Logic.Tests/Fusion.Resources.Logic.Tests.csproj +++ b/src/backend/tests/Fusion.Resources.Logic.Tests/Fusion.Resources.Logic.Tests.csproj @@ -11,9 +11,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/backend/tests/Fusion.Resources.Test.Core/Fusion.Resources.Test.Core.csproj b/src/backend/tests/Fusion.Resources.Test.Core/Fusion.Resources.Test.Core.csproj index 507f1b6b5..431862eb2 100644 --- a/src/backend/tests/Fusion.Resources.Test.Core/Fusion.Resources.Test.Core.csproj +++ b/src/backend/tests/Fusion.Resources.Test.Core/Fusion.Resources.Test.Core.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Authentication/Fusion.Testing.Authentication.csproj b/src/backend/tests/Fusion.Testing.Authentication/Fusion.Testing.Authentication.csproj index 32effd02d..bd289437f 100644 --- a/src/backend/tests/Fusion.Testing.Authentication/Fusion.Testing.Authentication.csproj +++ b/src/backend/tests/Fusion.Testing.Authentication/Fusion.Testing.Authentication.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/src/backend/tests/Fusion.Testing.Core/Fusion.Testing.Core.csproj b/src/backend/tests/Fusion.Testing.Core/Fusion.Testing.Core.csproj index a2e84d19a..30bde8cf0 100644 --- a/src/backend/tests/Fusion.Testing.Core/Fusion.Testing.Core.csproj +++ b/src/backend/tests/Fusion.Testing.Core/Fusion.Testing.Core.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj b/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj index 6819b7e60..3e12526d9 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj @@ -5,10 +5,10 @@ - - - - + + + + diff --git a/src/backend/tests/Fusion.Testing.Mocks.LineOrgService/Fusion.Testing.Mocks.LineOrgService.csproj b/src/backend/tests/Fusion.Testing.Mocks.LineOrgService/Fusion.Testing.Mocks.LineOrgService.csproj index 551f1bbed..23411e5de 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.LineOrgService/Fusion.Testing.Mocks.LineOrgService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.LineOrgService/Fusion.Testing.Mocks.LineOrgService.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj b/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj index 66df1c883..0600c5dc5 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj @@ -13,13 +13,13 @@ - - + + - - - - + + + + diff --git a/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj b/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj index bfb5bf385..99c79c03d 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj @@ -6,12 +6,12 @@ - - - - - - + + + + + + diff --git a/src/tests/Fusion.Summary.Api.Tests/Fusion.Summary.Api.Tests.csproj b/src/tests/Fusion.Summary.Api.Tests/Fusion.Summary.Api.Tests.csproj index 2a771144f..8b2911dc0 100644 --- a/src/tests/Fusion.Summary.Api.Tests/Fusion.Summary.Api.Tests.csproj +++ b/src/tests/Fusion.Summary.Api.Tests/Fusion.Summary.Api.Tests.csproj @@ -31,10 +31,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 2e586a1bb700b2a70c798c65655b5e95210725a4 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:03:46 +0200 Subject: [PATCH 04/16] Added api versions to mocked profile service controllers --- .../Api/PersonsController.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Api/PersonsController.cs b/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Api/PersonsController.cs index 2c80dc61f..fa9fa300c 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Api/PersonsController.cs +++ b/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Api/PersonsController.cs @@ -16,6 +16,8 @@ namespace Fusion.Testing.Mocks.ProfileService.Api { [ApiController] [ApiVersion("1.0")] + [ApiVersion("2.0")] + [ApiVersion("3.0")] public class PersonsController : ControllerBase { [MapToApiVersion("3.0")] From d9baf94e5a2701b7bf66a85636276505ab70fa83 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Fri, 30 Aug 2024 14:06:36 +0200 Subject: [PATCH 05/16] Update --- src/Fusion.Summary.Api/Fusion.Summary.Api.csproj | 2 +- .../Fusion.Resources.Infrastructure.csproj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj b/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj index ff33638a7..2291da9ef 100644 --- a/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj +++ b/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj b/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj index 837caf0c5..c964bc475 100644 --- a/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj +++ b/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj @@ -11,9 +11,9 @@ - - - + + + From 0896a6cfceb79962f67a3df00626c8625785b426 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Mon, 2 Sep 2024 14:30:26 +0200 Subject: [PATCH 06/16] Downgrade to Fusion.AspNetCore 7.0.1 due to problems parsing PatchProperty in 8.0.4 --- .../Fusion.Resources.Infrastructure.csproj | 2 +- .../api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj | 2 +- .../Fusion.Testing.Mocks.ContextService.csproj | 2 +- .../Fusion.Testing.Mocks.OrgService.csproj | 2 +- .../Fusion.Testing.Mocks.ProfileService.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj b/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj index c964bc475..4c33f0be2 100644 --- a/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj +++ b/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj b/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj index ea44bdb39..ae81b5e2d 100644 --- a/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj +++ b/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj b/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj index 3e12526d9..838fba86e 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj b/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj index 0600c5dc5..ace38633b 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj b/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj index 99c79c03d..174260b70 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj @@ -11,7 +11,7 @@ - + From 1e1a423981c3ce10973fb368f8844e09faecfbd0 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Mon, 2 Sep 2024 14:30:42 +0200 Subject: [PATCH 07/16] Add missing ApiVersion attribute --- .../Controllers/Requests/AnalyticsController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/api/Fusion.Resources.Api/Controllers/Requests/AnalyticsController.cs b/src/backend/api/Fusion.Resources.Api/Controllers/Requests/AnalyticsController.cs index 7d64819b2..27fb8a1ec 100644 --- a/src/backend/api/Fusion.Resources.Api/Controllers/Requests/AnalyticsController.cs +++ b/src/backend/api/Fusion.Resources.Api/Controllers/Requests/AnalyticsController.cs @@ -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 From e504c110732c9c684200ac2a4cf169f9e3401742 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Mon, 2 Sep 2024 14:57:54 +0200 Subject: [PATCH 08/16] Minor updates --- .../api/Fusion.Resources.Api/Fusion.Resources.Api.csproj | 2 +- .../Fusion.Testing.Mocks.OrgService.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj b/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj index b52e06e58..34f938a9c 100644 --- a/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj +++ b/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj @@ -31,7 +31,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj b/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj index ace38633b..8fbe4a7c9 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj @@ -15,7 +15,7 @@ - + From 9a0cddd3516e438a1518e9d566667f057fab5d21 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:38:33 +0200 Subject: [PATCH 09/16] Added MapToApiVersion to fix conflicting versioning in swagger --- .../Controllers/Requests/AnalyticsController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/api/Fusion.Resources.Api/Controllers/Requests/AnalyticsController.cs b/src/backend/api/Fusion.Resources.Api/Controllers/Requests/AnalyticsController.cs index 27fb8a1ec..12e76b872 100644 --- a/src/backend/api/Fusion.Resources.Api/Controllers/Requests/AnalyticsController.cs +++ b/src/backend/api/Fusion.Resources.Api/Controllers/Requests/AnalyticsController.cs @@ -45,6 +45,7 @@ public async Task>> GetPersonsAbsence([FromQuery] ODataQueryParams query) { From ff32b7040b51e735d8c0fbb60172d2cd05f54ac2 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:39:01 +0200 Subject: [PATCH 10/16] Added missing ApiVersion attribute --- .../Controllers/Personnel/InternalPersonnelController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/api/Fusion.Resources.Api/Controllers/Personnel/InternalPersonnelController.cs b/src/backend/api/Fusion.Resources.Api/Controllers/Personnel/InternalPersonnelController.cs index e652d41d7..d04cfff94 100644 --- a/src/backend/api/Fusion.Resources.Api/Controllers/Personnel/InternalPersonnelController.cs +++ b/src/backend/api/Fusion.Resources.Api/Controllers/Personnel/InternalPersonnelController.cs @@ -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 { From a544d3e249c7dd10acfd52b15b89ec3836b7e408 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:35:55 +0200 Subject: [PATCH 11/16] Empty-Commit to trigger snyk check again From 1b9ae2fdec2114033a50d4b76a221c29ca7d4fa7 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Wed, 4 Sep 2024 08:39:30 +0200 Subject: [PATCH 12/16] Empty-Commit to trigger snyk check again From 2d15cf362b1ddd5ebeae1f5ae1d67fd20b32d004 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Wed, 4 Sep 2024 09:18:12 +0200 Subject: [PATCH 13/16] Updated Fusion.AspNetCore after new fix from core --- src/Fusion.Summary.Api/Fusion.Summary.Api.csproj | 2 +- .../Fusion.Resources.Infrastructure.csproj | 2 +- .../api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj | 2 +- .../Fusion.Testing.Mocks.ContextService.csproj | 2 +- .../Fusion.Testing.Mocks.OrgService.csproj | 2 +- .../Fusion.Testing.Mocks.ProfileService.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj b/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj index 2291da9ef..c56028841 100644 --- a/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj +++ b/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj b/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj index 4c33f0be2..4c546cd22 100644 --- a/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj +++ b/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj b/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj index ae81b5e2d..3f6317ff9 100644 --- a/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj +++ b/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj b/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj index 838fba86e..40f20a103 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj b/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj index 8fbe4a7c9..65f3ffb09 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj b/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj index 174260b70..3395584ab 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj @@ -11,7 +11,7 @@ - + From 553519e6ad9558301cb87a997c013fbe98628b47 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:56:26 +0200 Subject: [PATCH 14/16] Testing, trying to fix snyk erros --- src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj b/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj index 34f938a9c..89c2dec1c 100644 --- a/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj +++ b/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj @@ -38,6 +38,7 @@ + From c1abb2204589b01cfe6c837132514dfdff8268a4 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:35:26 +0200 Subject: [PATCH 15/16] Trigger Snyk --- .../Fusion.Resources.Authorization.csproj | 1 + .../api/Fusion.Resources.Api/Fusion.Resources.Api.csproj | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/backend/Fusion.Resources.Authorization/Fusion.Resources.Authorization.csproj b/src/backend/Fusion.Resources.Authorization/Fusion.Resources.Authorization.csproj index 8f0d4f800..38bf6eb71 100644 --- a/src/backend/Fusion.Resources.Authorization/Fusion.Resources.Authorization.csproj +++ b/src/backend/Fusion.Resources.Authorization/Fusion.Resources.Authorization.csproj @@ -12,6 +12,7 @@ PreserveNewest + diff --git a/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj b/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj index 89c2dec1c..d4d45f89d 100644 --- a/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj +++ b/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj @@ -11,9 +11,11 @@ + + From 9dd0d9429a65ab6fb748be6dd458ddc2a0b06636 Mon Sep 17 00:00:00 2001 From: Jonathan Idland Olsnes <73334350+Jonathanio123@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:25:51 +0200 Subject: [PATCH 16/16] Update packages --- .../Fusion.Resources.Functions.Common.csproj | 2 +- src/Fusion.Summary.Api/Fusion.Summary.Api.csproj | 10 +++++----- .../Fusion.Resources.Infrastructure.csproj | 2 +- .../Fusion.Resources.Api/Fusion.Resources.Api.csproj | 4 ++-- .../Fusion.Resources.Domain.csproj | 4 ++-- .../Fusion.Resources.Api.Tests.csproj | 2 +- .../Fusion.Resources.Domain.Tests.csproj | 2 +- .../Fusion.Resources.Functions.Tests.csproj | 6 +++--- .../Fusion.Resources.Logic.Tests.csproj | 2 +- .../Fusion.Resources.Test.Core.csproj | 6 +++--- .../Fusion.Testing.Core/Fusion.Testing.Core.csproj | 2 +- .../Fusion.Testing.Mocks.ContextService.csproj | 2 +- .../Fusion.Testing.Mocks.LineOrgService.csproj | 2 +- .../Fusion.Testing.Mocks.OrgService.csproj | 4 ++-- .../Fusion.Testing.Mocks.ProfileService.csproj | 4 ++-- .../Fusion.Summary.Api.Tests.csproj | 4 ++-- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Fusion.Resources.Functions.Common/Fusion.Resources.Functions.Common.csproj b/src/Fusion.Resources.Functions.Common/Fusion.Resources.Functions.Common.csproj index 49ab0d6b1..ecd364778 100644 --- a/src/Fusion.Resources.Functions.Common/Fusion.Resources.Functions.Common.csproj +++ b/src/Fusion.Resources.Functions.Common/Fusion.Resources.Functions.Common.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj b/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj index c56028841..993f08fd3 100644 --- a/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj +++ b/src/Fusion.Summary.Api/Fusion.Summary.Api.csproj @@ -15,12 +15,12 @@ - - - + + + - - + + diff --git a/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj b/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj index 4c546cd22..79cab7879 100644 --- a/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj +++ b/src/backend/Fusion.Resources.Infrastructure/Fusion.Resources.Infrastructure.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj b/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj index d4d45f89d..b4812d649 100644 --- a/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj +++ b/src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj @@ -18,9 +18,9 @@ - + - + diff --git a/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj b/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj index 3f6317ff9..d5a428afd 100644 --- a/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj +++ b/src/backend/api/Fusion.Resources.Domain/Fusion.Resources.Domain.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/backend/tests/Fusion.Resources.Api.Tests/Fusion.Resources.Api.Tests.csproj b/src/backend/tests/Fusion.Resources.Api.Tests/Fusion.Resources.Api.Tests.csproj index 610756af4..ddf7f2e13 100644 --- a/src/backend/tests/Fusion.Resources.Api.Tests/Fusion.Resources.Api.Tests.csproj +++ b/src/backend/tests/Fusion.Resources.Api.Tests/Fusion.Resources.Api.Tests.csproj @@ -22,7 +22,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/src/backend/tests/Fusion.Resources.Domain.Tests/Fusion.Resources.Domain.Tests.csproj b/src/backend/tests/Fusion.Resources.Domain.Tests/Fusion.Resources.Domain.Tests.csproj index 619466ded..5e06a62de 100644 --- a/src/backend/tests/Fusion.Resources.Domain.Tests/Fusion.Resources.Domain.Tests.csproj +++ b/src/backend/tests/Fusion.Resources.Domain.Tests/Fusion.Resources.Domain.Tests.csproj @@ -14,7 +14,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/backend/tests/Fusion.Resources.Functions.Tests/Fusion.Resources.Functions.Tests.csproj b/src/backend/tests/Fusion.Resources.Functions.Tests/Fusion.Resources.Functions.Tests.csproj index 4430e4aba..5330a4b2f 100644 --- a/src/backend/tests/Fusion.Resources.Functions.Tests/Fusion.Resources.Functions.Tests.csproj +++ b/src/backend/tests/Fusion.Resources.Functions.Tests/Fusion.Resources.Functions.Tests.csproj @@ -7,13 +7,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all diff --git a/src/backend/tests/Fusion.Resources.Logic.Tests/Fusion.Resources.Logic.Tests.csproj b/src/backend/tests/Fusion.Resources.Logic.Tests/Fusion.Resources.Logic.Tests.csproj index b11b73509..5aca3fc5e 100644 --- a/src/backend/tests/Fusion.Resources.Logic.Tests/Fusion.Resources.Logic.Tests.csproj +++ b/src/backend/tests/Fusion.Resources.Logic.Tests/Fusion.Resources.Logic.Tests.csproj @@ -11,7 +11,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/src/backend/tests/Fusion.Resources.Test.Core/Fusion.Resources.Test.Core.csproj b/src/backend/tests/Fusion.Resources.Test.Core/Fusion.Resources.Test.Core.csproj index 431862eb2..90528eb59 100644 --- a/src/backend/tests/Fusion.Resources.Test.Core/Fusion.Resources.Test.Core.csproj +++ b/src/backend/tests/Fusion.Resources.Test.Core/Fusion.Resources.Test.Core.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/src/backend/tests/Fusion.Testing.Core/Fusion.Testing.Core.csproj b/src/backend/tests/Fusion.Testing.Core/Fusion.Testing.Core.csproj index 30bde8cf0..17309ac8e 100644 --- a/src/backend/tests/Fusion.Testing.Core/Fusion.Testing.Core.csproj +++ b/src/backend/tests/Fusion.Testing.Core/Fusion.Testing.Core.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj b/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj index 40f20a103..aa085d54e 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.ContextService/Fusion.Testing.Mocks.ContextService.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.LineOrgService/Fusion.Testing.Mocks.LineOrgService.csproj b/src/backend/tests/Fusion.Testing.Mocks.LineOrgService/Fusion.Testing.Mocks.LineOrgService.csproj index 23411e5de..c323300f9 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.LineOrgService/Fusion.Testing.Mocks.LineOrgService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.LineOrgService/Fusion.Testing.Mocks.LineOrgService.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj b/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj index 65f3ffb09..e822ee9d0 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.OrgService/Fusion.Testing.Mocks.OrgService.csproj @@ -13,13 +13,13 @@ - + - + diff --git a/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj b/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj index 3395584ab..c7d10d8aa 100644 --- a/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj +++ b/src/backend/tests/Fusion.Testing.Mocks.ProfileService/Fusion.Testing.Mocks.ProfileService.csproj @@ -6,12 +6,12 @@ - + - + diff --git a/src/tests/Fusion.Summary.Api.Tests/Fusion.Summary.Api.Tests.csproj b/src/tests/Fusion.Summary.Api.Tests/Fusion.Summary.Api.Tests.csproj index 8b2911dc0..b4f1bf846 100644 --- a/src/tests/Fusion.Summary.Api.Tests/Fusion.Summary.Api.Tests.csproj +++ b/src/tests/Fusion.Summary.Api.Tests/Fusion.Summary.Api.Tests.csproj @@ -22,7 +22,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -32,7 +32,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all