From 62daac03e1727888ec801030c75b3e420639962c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 12:58:19 +0100 Subject: [PATCH] Update nuget non-major dependencies (main) (#747) * Update nuget non-major dependencies * Fix nullability and update a few minor things in the generated swagger * Stop use of deprecated method --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ivar Nesje --- global.json | 2 +- src/Altinn.App.Api/Altinn.App.Api.csproj | 6 +++--- .../Extensions/ServiceCollectionExtensions.cs | 4 ++-- src/Altinn.App.Core/Altinn.App.Core.csproj | 6 +++--- .../Extensions/ServiceCollectionExtensions.cs | 2 ++ .../Telemetry/TelemetryActivityExtensions.cs | 6 ++++-- .../Altinn.App.Api.Tests.csproj | 12 ++++++------ test/Altinn.App.Api.Tests/OpenApi/swagger.json | 17 +++++------------ test/Altinn.App.Api.Tests/OpenApi/swagger.yaml | 8 +------- .../Altinn.App.Common.Tests.csproj | 10 +++++----- .../Altinn.App.Core.Tests.csproj | 8 ++++---- 11 files changed, 36 insertions(+), 45 deletions(-) diff --git a/global.json b/global.json index fee645a7b..6393e4ed9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "8.0.404", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/src/Altinn.App.Api/Altinn.App.Api.csproj b/src/Altinn.App.Api/Altinn.App.Api.csproj index ea6fb286e..bf078d632 100644 --- a/src/Altinn.App.Api/Altinn.App.Api.csproj +++ b/src/Altinn.App.Api/Altinn.App.Api.csproj @@ -18,13 +18,13 @@ - - + + - + diff --git a/src/Altinn.App.Api/Extensions/ServiceCollectionExtensions.cs b/src/Altinn.App.Api/Extensions/ServiceCollectionExtensions.cs index 77e581da3..2b4e41f47 100644 --- a/src/Altinn.App.Api/Extensions/ServiceCollectionExtensions.cs +++ b/src/Altinn.App.Api/Extensions/ServiceCollectionExtensions.cs @@ -362,12 +362,12 @@ internal sealed class OtelPropagator : TextMapPropagator public OtelPropagator(TextMapPropagator inner) => _inner = inner; - public override ISet Fields => _inner.Fields; + public override ISet? Fields => _inner.Fields; public override PropagationContext Extract( PropagationContext context, T carrier, - Func> getter + Func?> getter ) { if (carrier is HttpRequest) diff --git a/src/Altinn.App.Core/Altinn.App.Core.csproj b/src/Altinn.App.Core/Altinn.App.Core.csproj index 66fefd192..816034dd0 100644 --- a/src/Altinn.App.Core/Altinn.App.Core.csproj +++ b/src/Altinn.App.Core/Altinn.App.Core.csproj @@ -19,11 +19,11 @@ - + - - + + diff --git a/src/Altinn.App.Core/Extensions/ServiceCollectionExtensions.cs b/src/Altinn.App.Core/Extensions/ServiceCollectionExtensions.cs index 5edb3fe70..e74a0bf38 100644 --- a/src/Altinn.App.Core/Extensions/ServiceCollectionExtensions.cs +++ b/src/Altinn.App.Core/Extensions/ServiceCollectionExtensions.cs @@ -106,7 +106,9 @@ IWebHostEnvironment env #pragma warning restore CS0618 // Type or member is obsolete services.AddHttpClient(); services.AddHttpClient(); +#pragma warning disable EXTEXP0018 // is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. services.AddHybridCache(); +#pragma warning restore EXTEXP0018 services.TryAddTransient(); services.TryAddTransient(); diff --git a/src/Altinn.App.Core/Features/Telemetry/TelemetryActivityExtensions.cs b/src/Altinn.App.Core/Features/Telemetry/TelemetryActivityExtensions.cs index 190f00135..b2c8dab43 100644 --- a/src/Altinn.App.Core/Features/Telemetry/TelemetryActivityExtensions.cs +++ b/src/Altinn.App.Core/Features/Telemetry/TelemetryActivityExtensions.cs @@ -2,7 +2,6 @@ using Altinn.App.Core.Models.Process; using Altinn.Platform.Storage.Interface.Models; using Microsoft.AspNetCore.Mvc; -using OpenTelemetry.Trace; using InternalLabels = Altinn.App.Core.Features.Telemetry.InternalLabels; using Labels = Altinn.App.Core.Features.Telemetry.Labels; @@ -345,6 +344,9 @@ internal static Activity SetProblemDetails(this Activity activity, ProblemDetail internal static void Errored(this Activity activity, Exception? exception = null, string? error = null) { activity.SetStatus(ActivityStatusCode.Error, error); - activity.RecordException(exception); + if(exception is not null) + { + activity.AddException(exception); + } } } diff --git a/test/Altinn.App.Api.Tests/Altinn.App.Api.Tests.csproj b/test/Altinn.App.Api.Tests/Altinn.App.Api.Tests.csproj index 1b9278a64..e6f01904a 100644 --- a/test/Altinn.App.Api.Tests/Altinn.App.Api.Tests.csproj +++ b/test/Altinn.App.Api.Tests/Altinn.App.Api.Tests.csproj @@ -8,12 +8,12 @@ - - - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Altinn.App.Api.Tests/OpenApi/swagger.json b/test/Altinn.App.Api.Tests/OpenApi/swagger.json index 56aebd1b2..4a445daf5 100644 --- a/test/Altinn.App.Api.Tests/OpenApi/swagger.json +++ b/test/Altinn.App.Api.Tests/OpenApi/swagger.json @@ -5259,8 +5259,7 @@ "actions": { "type": "object", "additionalProperties": { - "type": "boolean", - "nullable": true + "type": "boolean" }, "nullable": true }, @@ -5479,8 +5478,7 @@ "features": { "type": "object", "additionalProperties": { - "type": "boolean", - "nullable": true + "type": "boolean" }, "nullable": true }, @@ -6503,12 +6501,8 @@ "JsonNodeOptions": { "type": "object", "properties": { - "hasValue": { - "type": "boolean", - "readOnly": true - }, - "value": { - "$ref": "#/components/schemas/JsonNodeOptions" + "propertyNameCaseInsensitive": { + "type": "boolean" } }, "additionalProperties": false @@ -7349,8 +7343,7 @@ "items": { "$ref": "#/components/schemas/ValidationIssueWithSource" } - }, - "nullable": true + } }, "nullable": true }, diff --git a/test/Altinn.App.Api.Tests/OpenApi/swagger.yaml b/test/Altinn.App.Api.Tests/OpenApi/swagger.yaml index d4db12244..6b3ff672b 100644 --- a/test/Altinn.App.Api.Tests/OpenApi/swagger.yaml +++ b/test/Altinn.App.Api.Tests/OpenApi/swagger.yaml @@ -3215,7 +3215,6 @@ components: type: object additionalProperties: type: boolean - nullable: true nullable: true userActions: type: array @@ -3374,7 +3373,6 @@ components: type: object additionalProperties: type: boolean - nullable: true nullable: true logo: $ref: '#/components/schemas/Logo' @@ -4115,11 +4113,8 @@ components: JsonNodeOptions: type: object properties: - hasValue: + propertyNameCaseInsensitive: type: boolean - readOnly: true - value: - $ref: '#/components/schemas/JsonNodeOptions' additionalProperties: false JsonPatch: type: object @@ -4727,7 +4722,6 @@ components: type: array items: $ref: '#/components/schemas/ValidationIssueWithSource' - nullable: true nullable: true clientActions: type: array diff --git a/test/Altinn.App.Common.Tests/Altinn.App.Common.Tests.csproj b/test/Altinn.App.Common.Tests/Altinn.App.Common.Tests.csproj index 6478c335c..f513d5746 100644 --- a/test/Altinn.App.Common.Tests/Altinn.App.Common.Tests.csproj +++ b/test/Altinn.App.Common.Tests/Altinn.App.Common.Tests.csproj @@ -16,12 +16,12 @@ - + - + - - + + all @@ -31,7 +31,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/Altinn.App.Core.Tests/Altinn.App.Core.Tests.csproj b/test/Altinn.App.Core.Tests/Altinn.App.Core.Tests.csproj index b24dc89ec..825de07cc 100644 --- a/test/Altinn.App.Core.Tests/Altinn.App.Core.Tests.csproj +++ b/test/Altinn.App.Core.Tests/Altinn.App.Core.Tests.csproj @@ -42,12 +42,12 @@ - + - + - - + + all