Skip to content

Commit

Permalink
chore(deps): Update dependencies (#1402)
Browse files Browse the repository at this point in the history
* Update packages

* Update grpc tools

* Update Mvc.Testing

* Update durable task

* Update Azure.Core

* Update major Microsoft packages

* Update DataHub Core packages

* Update packages

* Update packages

* Update package

* Update OutgoingMessages.Infrastructure.csproj

* Update packages

* Update func core tools versions for tests

* Update github action versions

* Update github workflows to v14

* Remove Publish ProcessManager.Client bundle workflow

* Downgrade 5455

* Update ci-dotnet.yml

* Update ci-dotnet.yml
  • Loading branch information
ebbeknudsen authored Dec 2, 2024
1 parent b49a13c commit 5dad335
Show file tree
Hide file tree
Showing 50 changed files with 182 additions and 294 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
dotnet_promote_prerelease:
needs: changes
if: ${{ needs.changes.outputs.dotnet == 'true' || needs.changes.outputs.db_migrations == 'true'}}
uses: Energinet-DataHub/.github/.github/workflows/promote-prerelease.yml@v13
uses: Energinet-DataHub/.github/.github/workflows/promote-prerelease.yml@v14
with:
release_name_prefix: dotnet

Expand All @@ -49,10 +49,10 @@ jobs:
needs: [dotnet_promote_prerelease, changes]
steps:
- name: Find associated pull request
uses: Energinet-DataHub/.github/.github/actions/find-related-pr-number@v13
uses: Energinet-DataHub/.github/.github/actions/find-related-pr-number@v14
id: find_pull_request

- uses: Energinet-DataHub/.github/.github/actions/github-create-token@v13
- uses: Energinet-DataHub/.github/.github/actions/github-create-token@v14
name: Generate Github token
id: generate_token
with:
Expand All @@ -76,7 +76,7 @@ jobs:
if: |
always() &&
contains(needs.*.result, 'failure')
uses: Energinet-DataHub/.github/.github/workflows/notify-team.yml@v13
uses: Energinet-DataHub/.github/.github/workflows/notify-team.yml@v14
with:
team_name: Mosaic
subject: "Deployment dispatch failed: EDI"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: Energinet-DataHub/.github/.github/workflows/dotnet-postbuild-test.yml@v14
with:
download_attempt_limit: 30
azure_functions_core_tools_version: 4.0.5413
azure_functions_core_tools_version: 4.0.5455
# Matrix parameters
job_name: ${{ matrix.tests_filter_expression.name }}
tests_dll_file_path: ${{ matrix.tests_filter_expression.paths }}
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
uses: Energinet-DataHub/.github/.github/workflows/dotnet-postbuild-test.yml@v14
with:
download_attempt_limit: 20
azure_functions_core_tools_version: 4.0.5413
azure_functions_core_tools_version: 4.0.5455
azure_integrationtest_tenant_id: ${{ vars.integration_test_azure_tenant_id }}
azure_integrationtest_subscription_id: ${{ vars.integration_test_azure_subscription_id }}
azure_integrationtest_spn_id: ${{ vars.integration_test_azure_spn_id_oidc }}
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/ci-orchestrator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
# License and Markdown Check
#
ci_base:
uses: Energinet-DataHub/.github/.github/workflows/ci-base.yml@v13
uses: Energinet-DataHub/.github/.github/workflows/ci-base.yml@v14
secrets:
dh3serviceaccount_privatekey: ${{ secrets.dh3serviceaccount_privatekey }}

Expand All @@ -38,12 +38,6 @@ jobs:
if: ${{ needs.changes.outputs.dotnet == 'true' || needs.changes.outputs.db_migrations == 'true' }}
uses: ./.github/workflows/ci-dotnet.yml

ci_processmanager_client:
needs: changes
if: ${{ needs.changes.outputs.processmanager_client == 'true' }}
uses: ./.github/workflows/processmanager-client-bundle-publish.yml
secrets: inherit

render_c4model_views:
needs: changes
if: ${{ needs.changes.outputs.render_c4model_views == 'true' }}
Expand All @@ -64,7 +58,6 @@ jobs:
[
ci_base,
ci_dotnet,
ci_processmanager_client,
render_c4model_views
]
if: |
Expand Down
118 changes: 0 additions & 118 deletions .github/workflows/processmanager-client-bundle-publish.yml

This file was deleted.

2 changes: 1 addition & 1 deletion source/ApplyDBMigrationsApp/ApplyDBMigrationsApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ limitations under the License.
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions source/ArchitectureTests/ArchitectureTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ limitations under the License.

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="FluentAssertions.Analyzers" Version="0.33.0">
<PackageReference Include="FluentAssertions.Analyzers" Version="0.34.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.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>
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ limitations under the License.

<ItemGroup>
<PackageReference Include="AdaskoTheBeAsT.Dapper.NodaTime" Version="4.0.2" />
<PackageReference Include="Energinet.DataHub.Core.FunctionApp.TestCommon" Version="7.0.1" />
<PackageReference Include="Energinet.DataHub.Core.FunctionApp.TestCommon" Version="7.0.4" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.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>
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NodaTime" Version="3.1.12" />
<PackageReference Include="NodaTime" Version="3.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BuildingBlocks.Domain\BuildingBlocks.Domain.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions source/AuditLog/AuditLog.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<RootNamespace>Energinet.DataHub.EDI.AuditLog</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Energinet.DataHub.Core.Outbox.Abstractions" Version="1.0.0" />
<PackageReference Include="Energinet.DataHub.RevisionLog.Integration" Version="1.1.3" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Energinet.DataHub.Core.Outbox.Abstractions" Version="1.0.1" />
<PackageReference Include="Energinet.DataHub.RevisionLog.Integration" Version="1.1.4" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NodaTime" Version="3.1.12" />
<PackageReference Include="NodaTime" Version="3.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BuildingBlocks.Domain\BuildingBlocks.Domain.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions source/B2BApi.AppTests/B2BApi.AppTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Energinet.DataHub.Wholesale.Contracts" Version="10.0.0" />
<PackageReference Include="FluentAssertions.Analyzers" Version="0.33.0">
<PackageReference Include="Energinet.DataHub.Wholesale.Contracts" Version="11.0.0" />
<PackageReference Include="FluentAssertions.Analyzers" Version="0.34.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="CsvHelper" Version="33.0.1" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.13.7" />
<PackageReference Include="Energinet.DataHub.Core.FunctionApp.TestCommon" Version="7.0.1" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="3.0.1" />
<PackageReference Include="Energinet.DataHub.Core.FunctionApp.TestCommon" Version="7.0.4" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
26 changes: 13 additions & 13 deletions source/B2BApi/B2BApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@ limitations under the License.
<GenerateDocumentationFile>false</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Energinet.DataHub.Core.Databricks.SqlStatementExecution" Version="11.2.4" />
<PackageReference Include="Energinet.DataHub.Core.Outbox" Version="1.0.0" />
<PackageReference Include="Energinet.DataHub.Core.Databricks.SqlStatementExecution" Version="12.0.0" />
<PackageReference Include="Energinet.DataHub.Core.Outbox" Version="1.0.1" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.1.5" />
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.1" />
<PackageReference Include="Energinet.DataHub.Core.App.FunctionApp" Version="13.2.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.4.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.2.1" />
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.2" />
<PackageReference Include="Energinet.DataHub.Core.App.FunctionApp" Version="14.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" Version="1.3.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.22.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.4" OutputItemType="Analyzer" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
<PackageReference Include="Energinet.DataHub.Core.Messaging" Version="6.1.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" OutputItemType="Analyzer" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
<PackageReference Include="Energinet.DataHub.Core.Messaging" Version="6.1.1" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<!--Microsoft.IdentityModel.XX has to be in sync, aka. same version-->
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.0" />
<PackageReference Include="Microsoft.IdentityModel.Protocols" Version="8.1.0" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.1" />
<PackageReference Include="Microsoft.IdentityModel.Protocols" Version="8.2.1" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.2.1" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ArchivedMessages.Infrastructure\ArchivedMessages.Infrastructure.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,8 @@ await newHttpResponse.WriteStringAsync(

private static async Task CreateJsonResponseAsync(HttpResponseData newHttpResponse)
{
// You need to explicitly pass the status code in WriteAsJsonAsync method.
// https://github.com/Azure/azure-functions-dotnet-worker/issues/776
// The method also ensures that the content type is "application/json; charset=utf-8"
await newHttpResponse.WriteAsJsonAsync(new { Message = ErrorMessage }, newHttpResponse.StatusCode);
// The method ensures that the content type is "application/json; charset=utf-8"
await newHttpResponse.WriteAsJsonAsync(new { Message = ErrorMessage });
}

private static OutputBindingData<HttpResponseData>? GetHttpOutputBindingFromMultipleOutputBinding(FunctionContext context)
Expand Down
5 changes: 0 additions & 5 deletions source/B2BApi/HostFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ public static IHost CreateHost(TokenValidationParameters tokenValidationParamete
(context, services) =>
{
services
.Configure((Action<WorkerOptions>)(options =>
{
options.EnableUserCodeException = true;
}))

// Logging
.AddApplicationInsightsForIsolatedWorker(SubsystemName)

Expand Down
Loading

0 comments on commit 5dad335

Please sign in to comment.