Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update nuget non-major dependencies (main) #747

Merged
merged 3 commits into from
Nov 21, 2024
Merged

Update nuget non-major dependencies (main) #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83a0827
Update nuget non-major dependencies
renovate[bot] Nov 21, 2024
dde5b9c
Fix nullability and update a few minor things in the generated swagger
ivarne Nov 21, 2024
cdc5cc0
Stop use of deprecated method
ivarne Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "8.0.404",
ivarne marked this conversation as resolved.
Show resolved Hide resolved
"rollForward": "latestFeature",
"allowPrerelease": false
}
Expand Down
6 changes: 3 additions & 3 deletions src/Altinn.App.Api/Altinn.App.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<PackageReference Include="Altinn.Common.PEP" Version="4.1.0" />
<PackageReference Include="Altinn.Platform.Storage.Interface" Version="4.0.3" />
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.5.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="Azure.Identity" Version="1.13.1" />
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Altinn.App.Api/Extensions/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,12 +362,12 @@ internal sealed class OtelPropagator : TextMapPropagator

public OtelPropagator(TextMapPropagator inner) => _inner = inner;

public override ISet<string> Fields => _inner.Fields;
public override ISet<string>? Fields => _inner.Fields;

public override PropagationContext Extract<T>(
PropagationContext context,
T carrier,
Func<T, string, IEnumerable<string>> getter
Func<T, string, IEnumerable<string>?> getter
)
{
if (carrier is HttpRequest)
Expand Down
6 changes: 3 additions & 3 deletions src/Altinn.App.Core/Altinn.App.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<PackageReference Include="JsonPatch.Net" Version="3.1.1" />
<PackageReference Include="JWTCookieAuthentication" Version="3.0.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="[9.0.0-preview.7.24406.2]" NoWarn="NU5104" />
<PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="[9.0.0-preview.9.24556.5]" NoWarn="NU5104" />
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NetEscapades.EnumGenerators" Version="1.0.0-beta09" PrivateAssets="all" ExcludeAssets="runtime" />
<PackageReference Include="OpenTelemetry.Api" Version="1.9.0" />
<PackageReference Include="NetEscapades.EnumGenerators" Version="1.0.0-beta11" PrivateAssets="all" ExcludeAssets="runtime" />
<PackageReference Include="OpenTelemetry.Api" Version="1.10.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/Altinn.App.Core/Extensions/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ IWebHostEnvironment env
#pragma warning restore CS0618 // Type or member is obsolete
services.AddHttpClient<IProcessClient, ProcessClient>();
services.AddHttpClient<IPersonClient, PersonClient>();
#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<IUserTokenProvider, UserTokenProvider>();
services.TryAddTransient<IAccessTokenGenerator, AccessTokenGenerator>();
Expand Down
6 changes: 4 additions & 2 deletions src/Altinn.App.Core/Features/Telemetry/TelemetryActivityExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -269,14 +268,14 @@
internal static Activity SetProblemDetails(this Activity activity, ProblemDetails problemDetails)
{
// Leave activity status to ASP.NET Core, as it will be set depending on status code?
// activity.SetStatus(ActivityStatusCode.Error, problemDetails.Title);

Check warning on line 271 in src/Altinn.App.Core/Features/Telemetry/TelemetryActivityExtensions.cs

View workflow job for this annotation

GitHub Actions / Static code analysis 

Remove this commented out code. (https://rules.sonarsource.com/csharp/RSPEC-125)

activity.SetTag(InternalLabels.ProblemType, problemDetails.Type);
activity.SetTag(InternalLabels.ProblemTitle, problemDetails.Title);
activity.SetTag(InternalLabels.ProblemStatus, problemDetails.Status);

// Is it safe to use detail here? In some cases the detail field is set from exception message
// activity.SetTag(InternalLabels.ProblemDetail, problemDetails.Detail);

Check warning on line 278 in src/Altinn.App.Core/Features/Telemetry/TelemetryActivityExtensions.cs

View workflow job for this annotation

GitHub Actions / Static code analysis 

Remove this commented out code. (https://rules.sonarsource.com/csharp/RSPEC-125)

return activity;
}
Expand Down Expand Up @@ -345,6 +344,9 @@
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);
}
}
}
12 changes: 6 additions & 6 deletions test/Altinn.App.Api.Tests/Altinn.App.Api.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.11" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
17 changes: 5 additions & 12 deletions test/Altinn.App.Api.Tests/OpenApi/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5259,8 +5259,7 @@
"actions": {
"type": "object",
"additionalProperties": {
"type": "boolean",
"nullable": true
"type": "boolean"
},
"nullable": true
},
Expand Down Expand Up @@ -5479,8 +5478,7 @@
"features": {
"type": "object",
"additionalProperties": {
"type": "boolean",
"nullable": true
"type": "boolean"
},
"nullable": true
},
Expand Down Expand Up @@ -6503,12 +6501,8 @@
"JsonNodeOptions": {
"type": "object",
"properties": {
"hasValue": {
"type": "boolean",
"readOnly": true
},
"value": {
"$ref": "#/components/schemas/JsonNodeOptions"
"propertyNameCaseInsensitive": {
"type": "boolean"
}
},
"additionalProperties": false
Expand Down Expand Up @@ -7349,8 +7343,7 @@
"items": {
"$ref": "#/components/schemas/ValidationIssueWithSource"
}
},
"nullable": true
}
},
"nullable": true
},
Expand Down
8 changes: 1 addition & 7 deletions test/Altinn.App.Api.Tests/OpenApi/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3215,7 +3215,6 @@ components:
type: object
additionalProperties:
type: boolean
nullable: true
nullable: true
userActions:
type: array
Expand Down Expand Up @@ -3374,7 +3373,6 @@ components:
type: object
additionalProperties:
type: boolean
nullable: true
nullable: true
logo:
$ref: '#/components/schemas/Logo'
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -4727,7 +4722,6 @@ components:
type: array
items:
$ref: '#/components/schemas/ValidationIssueWithSource'
nullable: true
nullable: true
clientActions:
type: array
Expand Down
10 changes: 5 additions & 5 deletions test/Altinn.App.Common.Tests/Altinn.App.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="8.9.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="8.10.0" />
<PackageReference Include="Verify.Xunit" Version="28.3.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -31,7 +31,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="OpenTelemetry" Version="1.9.0" />
<PackageReference Include="OpenTelemetry" Version="1.10.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions test/Altinn.App.Core.Tests/Altinn.App.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.8.0" />
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
<PackageReference Include="Verify.Xunit" Version="28.3.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
Loading