From 63dd6723a9157cc72fc66456a797e00b8ef13c4f Mon Sep 17 00:00:00 2001 From: Stijn Moreels <9039753+stijnmoreels@users.noreply.github.com> Date: Fri, 23 Feb 2024 09:42:47 +0100 Subject: [PATCH] chore: use new major versions of arcus packages (#460) * chore: use new major versions of arcus packages * pr-fix: explicitly update the security package --- build/ci-build.yml | 6 +++--- build/nuget-release.yml | 6 +++--- .../templates/run-docker-integration-tests.yml | 4 ++-- build/variables/build.yml | 1 + .../Arcus.WebApi.Logging.AzureFunctions.csproj | 9 ++------- .../Arcus.WebApi.Logging.Core.csproj | 11 +++-------- .../CorrelationInfoUpstreamServiceOptions.cs | 2 +- .../Correlation/HttpCorrelation.cs | 4 ++-- .../Correlation/HttpCorrelationInfoOptions.cs | 17 ++++------------- .../Arcus.WebApi.Logging.csproj | 17 ++++++----------- .../Arcus.WebApi.Security.csproj | 7 +------ .../Arcus.WebApi.Tests.Integration.csproj | 3 ++- .../AzureFunctionsJsonFormattingDockerTests.cs | 1 - .../Arcus.WebApi.Tests.Unit.csproj | 1 + 14 files changed, 31 insertions(+), 58 deletions(-) diff --git a/build/ci-build.yml b/build/ci-build.yml index e08fa70e..34d58f5e 100644 --- a/build/ci-build.yml +++ b/build/ci-build.yml @@ -52,7 +52,7 @@ stages: - template: 'build/build-solution.yml@templates' parameters: dotnetSdkVersion: '$(DotNet.Sdk.Version)' - includePreviewVersions: true + includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions) versionSuffix: '$(packageVersion)' - task: CopyFiles@2 displayName: 'Copy build artifacts' @@ -83,7 +83,7 @@ stages: - template: test/run-unit-tests.yml@templates parameters: dotnetSdkVersion: '$(DotNet.Sdk.Version)' - includePreviewVersions: true + includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions) projectName: '$(Project).Tests.Unit' - stage: DockerIntegrationTests @@ -121,7 +121,7 @@ stages: - template: test/run-integration-tests.yml@templates parameters: dotnetSdkVersion: '$(DotNet.Sdk.Version)' - includePreviewVersions: true + includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions) projectName: '$(Project).Tests.Integration' category: 'Integration' diff --git a/build/nuget-release.yml b/build/nuget-release.yml index 161d8cfd..d39399e6 100644 --- a/build/nuget-release.yml +++ b/build/nuget-release.yml @@ -37,7 +37,7 @@ stages: - template: build/build-solution.yml@templates parameters: dotnetSdkVersion: '$(DotNet.Sdk.Version)' - includePreviewVersions: true + includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions) version: $(Build.BuildNumber) - task: CopyFiles@2 displayName: 'Copy build artifacts' @@ -73,7 +73,7 @@ stages: - template: test/run-unit-tests.yml@templates parameters: dotnetSdkVersion: '$(DotNet.Sdk.Version)' - includePreviewVersions: true + includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions) projectName: '$(Project).Tests.Unit' - stage: DockerIntegrationTests @@ -111,7 +111,7 @@ stages: - template: test/run-integration-tests.yml@templates parameters: dotnetSdkVersion: '$(DotNet.Sdk.Version)' - includePreviewVersions: true + includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions) projectName: '$(Project).Tests.Integration' category: 'Integration' diff --git a/build/templates/run-docker-integration-tests.yml b/build/templates/run-docker-integration-tests.yml index 9d7a1d13..718a3c66 100644 --- a/build/templates/run-docker-integration-tests.yml +++ b/build/templates/run-docker-integration-tests.yml @@ -4,7 +4,7 @@ steps: inputs: packageType: 'sdk' version: '$(DotNet.Sdk.Version)' - includePreviewVersions: true + includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions) # .NET 8 not available yet for Azure Functions in-process # - template: start-docker-project.yml # parameters: @@ -17,7 +17,7 @@ steps: - template: test/run-integration-tests.yml@templates parameters: dotnetSdkVersion: '$(DotNet.Sdk.Version)' - includePreviewVersions: true + includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions) projectName: '$(Project).Tests.Integration' category: 'Docker' # .NET 8 not available yet for Azure Functions in-process diff --git a/build/variables/build.yml b/build/variables/build.yml index 6a520dac..e54b0f1e 100644 --- a/build/variables/build.yml +++ b/build/variables/build.yml @@ -2,5 +2,6 @@ variables: DotNet.Sdk.Version: '8.0.x' # Backwards compatible .NET SDK version DotNet.Sdk.VersionBC: '6.0.100' + DotNet.Sdk.IncludePreviewVersions: false Project: 'Arcus.WebApi' Vm.Image: 'ubuntu-latest' \ No newline at end of file diff --git a/src/Arcus.WebApi.Logging.AzureFunctions/Arcus.WebApi.Logging.AzureFunctions.csproj b/src/Arcus.WebApi.Logging.AzureFunctions/Arcus.WebApi.Logging.AzureFunctions.csproj index 62ff5f03..66c4a637 100644 --- a/src/Arcus.WebApi.Logging.AzureFunctions/Arcus.WebApi.Logging.AzureFunctions.csproj +++ b/src/Arcus.WebApi.Logging.AzureFunctions/Arcus.WebApi.Logging.AzureFunctions.csproj @@ -17,11 +17,6 @@ true true - - - - NU5104 - @@ -30,8 +25,8 @@ - - + + diff --git a/src/Arcus.WebApi.Logging.Core/Arcus.WebApi.Logging.Core.csproj b/src/Arcus.WebApi.Logging.Core/Arcus.WebApi.Logging.Core.csproj index 3e31a578..c3cf166c 100644 --- a/src/Arcus.WebApi.Logging.Core/Arcus.WebApi.Logging.Core.csproj +++ b/src/Arcus.WebApi.Logging.Core/Arcus.WebApi.Logging.Core.csproj @@ -18,11 +18,6 @@ true - - - NU5104 - - @@ -40,9 +35,9 @@ - - - + + + diff --git a/src/Arcus.WebApi.Logging.Core/Correlation/CorrelationInfoUpstreamServiceOptions.cs b/src/Arcus.WebApi.Logging.Core/Correlation/CorrelationInfoUpstreamServiceOptions.cs index 3d55e787..90f4ba3b 100644 --- a/src/Arcus.WebApi.Logging.Core/Correlation/CorrelationInfoUpstreamServiceOptions.cs +++ b/src/Arcus.WebApi.Logging.Core/Correlation/CorrelationInfoUpstreamServiceOptions.cs @@ -6,7 +6,7 @@ namespace Arcus.WebApi.Logging.Core.Correlation { /// - /// Correlation options specific to the upstream services, used in the . + /// Correlation options specific to the upstream services, used in the . /// public class CorrelationInfoUpstreamServiceOptions { diff --git a/src/Arcus.WebApi.Logging.Core/Correlation/HttpCorrelation.cs b/src/Arcus.WebApi.Logging.Core/Correlation/HttpCorrelation.cs index 37517719..28276ff1 100644 --- a/src/Arcus.WebApi.Logging.Core/Correlation/HttpCorrelation.cs +++ b/src/Arcus.WebApi.Logging.Core/Correlation/HttpCorrelation.cs @@ -12,7 +12,7 @@ namespace Arcus.WebApi.Logging.Correlation { /// - /// Provides the functionality to correlate HTTP requests and responses according to configured , + /// Provides the functionality to correlate HTTP requests and responses according to configured , /// using the to expose the result. /// /// @@ -70,7 +70,7 @@ public void SetCorrelationInfo(CorrelationInfo correlationInfo) } /// - /// Correlate the current HTTP request according to the previously configured ; + /// Correlate the current HTTP request according to the previously configured ; /// returning an which acts as the current scope in which additional dependencies should be tracked. /// /// Thrown when the given is not available to correlate the request with the response. diff --git a/src/Arcus.WebApi.Logging.Core/Correlation/HttpCorrelationInfoOptions.cs b/src/Arcus.WebApi.Logging.Core/Correlation/HttpCorrelationInfoOptions.cs index bccd6968..261e6109 100644 --- a/src/Arcus.WebApi.Logging.Core/Correlation/HttpCorrelationInfoOptions.cs +++ b/src/Arcus.WebApi.Logging.Core/Correlation/HttpCorrelationInfoOptions.cs @@ -1,14 +1,9 @@ -using System; -using Arcus.Observability.Correlation; - -namespace Arcus.WebApi.Logging.Core.Correlation +namespace Arcus.WebApi.Logging.Core.Correlation { /// /// Options for handling correlation ID on incoming HTTP requests. /// -#pragma warning disable CS0618 - public class HttpCorrelationInfoOptions : CorrelationInfoOptions -#pragma warning restore CS0618 + public class HttpCorrelationInfoOptions { /// /// Gets or sets the format within the Arcus HTTP correlation system will correlate HTTP requests. @@ -18,20 +13,16 @@ public class HttpCorrelationInfoOptions : CorrelationInfoOptions /// /// Gets the correlation options specific for the operation ID. /// - public new HttpCorrelationInfoOperationOptions Operation { get; } = new HttpCorrelationInfoOperationOptions(); + public HttpCorrelationInfoOperationOptions Operation { get; } = new HttpCorrelationInfoOperationOptions(); /// /// Gets the correlation options specific for the transaction ID. /// - public new HttpCorrelationInfoTransactionOptions Transaction { get; } = new HttpCorrelationInfoTransactionOptions(); + public HttpCorrelationInfoTransactionOptions Transaction { get; } = new HttpCorrelationInfoTransactionOptions(); /// /// Gets the correlation options specific for the upstream service. /// public CorrelationInfoUpstreamServiceOptions UpstreamService { get; } = new CorrelationInfoUpstreamServiceOptions(); - - /// - [Obsolete("Use " + nameof(UpstreamService) + " instead")] - public new Arcus.Observability.Correlation.CorrelationInfoUpstreamServiceOptions OperationParent { get; } = new Observability.Correlation.CorrelationInfoUpstreamServiceOptions(); } } diff --git a/src/Arcus.WebApi.Logging/Arcus.WebApi.Logging.csproj b/src/Arcus.WebApi.Logging/Arcus.WebApi.Logging.csproj index 5187079a..1fc6c463 100644 --- a/src/Arcus.WebApi.Logging/Arcus.WebApi.Logging.csproj +++ b/src/Arcus.WebApi.Logging/Arcus.WebApi.Logging.csproj @@ -17,16 +17,11 @@ true true - - - - NU5104 - - + - + @@ -43,10 +38,10 @@ - - - - + + + + diff --git a/src/Arcus.WebApi.Security/Arcus.WebApi.Security.csproj b/src/Arcus.WebApi.Security/Arcus.WebApi.Security.csproj index 6031da44..3dc15716 100644 --- a/src/Arcus.WebApi.Security/Arcus.WebApi.Security.csproj +++ b/src/Arcus.WebApi.Security/Arcus.WebApi.Security.csproj @@ -18,11 +18,6 @@ true - - - NU5104 - - @@ -40,7 +35,7 @@ - + diff --git a/src/Arcus.WebApi.Tests.Integration/Arcus.WebApi.Tests.Integration.csproj b/src/Arcus.WebApi.Tests.Integration/Arcus.WebApi.Tests.Integration.csproj index 550d5d9f..ec788ded 100644 --- a/src/Arcus.WebApi.Tests.Integration/Arcus.WebApi.Tests.Integration.csproj +++ b/src/Arcus.WebApi.Tests.Integration/Arcus.WebApi.Tests.Integration.csproj @@ -19,7 +19,8 @@ - + + diff --git a/src/Arcus.WebApi.Tests.Integration/Logging/AzureFunctionsJsonFormattingDockerTests.cs b/src/Arcus.WebApi.Tests.Integration/Logging/AzureFunctionsJsonFormattingDockerTests.cs index 8d654c2f..3629be06 100644 --- a/src/Arcus.WebApi.Tests.Integration/Logging/AzureFunctionsJsonFormattingDockerTests.cs +++ b/src/Arcus.WebApi.Tests.Integration/Logging/AzureFunctionsJsonFormattingDockerTests.cs @@ -6,7 +6,6 @@ using Arcus.Testing.Logging; using Arcus.WebApi.Tests.Integration.Fixture; using Microsoft.Extensions.Logging; -using Microsoft.Rest; using Xunit; using Xunit.Abstractions; diff --git a/src/Arcus.WebApi.Tests.Unit/Arcus.WebApi.Tests.Unit.csproj b/src/Arcus.WebApi.Tests.Unit/Arcus.WebApi.Tests.Unit.csproj index 0dc97dab..c385d05c 100644 --- a/src/Arcus.WebApi.Tests.Unit/Arcus.WebApi.Tests.Unit.csproj +++ b/src/Arcus.WebApi.Tests.Unit/Arcus.WebApi.Tests.Unit.csproj @@ -9,6 +9,7 @@ +