diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9127e26aa..9c7df54e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -389,7 +389,7 @@ jobs: retention-days: 7 - name: Log in to the Container registry - uses: docker/login-action@v2.1.0 + uses: docker/login-action@v2.2.0 if: ${{ (matrix.os == 'ubuntu-latest') }} with: registry: ${{ env.REGISTRY }} @@ -398,7 +398,7 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@v4.3.0 + uses: docker/metadata-action@v4.6.0 if: ${{ (matrix.os == 'ubuntu-latest') }} with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} @@ -407,7 +407,7 @@ jobs: type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }} - name: Build and push Docker image - uses: docker/build-push-action@v4.0.0 + uses: docker/build-push-action@v4.1.1 if: ${{ (matrix.os == 'ubuntu-latest') }} with: context: . @@ -425,7 +425,7 @@ jobs: - name: Anchore container scan id: anchore-scan - uses: anchore/scan-action@v3.3.5 + uses: anchore/scan-action@v3.3.6 if: ${{ (matrix.os == 'ubuntu-latest') }} with: image: ${{ fromJSON(steps.meta.outputs.json).tags[0] }} diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index c0d442e64..d67c51611 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -69,7 +69,7 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/Docker.DotNet/raw/master/LICENSE) :versions: - - 3.125.13 + - 3.125.15 :when: 2022-08-16 23:05:32.422217566 Z - - :approve - DotNext @@ -90,7 +90,7 @@ - :who: mocsharp :why: Apache-2.0 (https://github.com/fluentassertions/fluentassertions/raw/develop/LICENSE) :versions: - - 6.10.0 + - 6.11.0 :when: 2022-08-16 23:05:33.753437127 Z - - :approve - Gherkin @@ -322,70 +322,70 @@ :why: MIT (https://github.com/microsoft/vstest/raw/main/LICENSE) :versions: - 17.4.1 - - 17.5.0 + - 17.6.3 :when: 2022-08-16 23:05:48.342748414 Z - - :approve - Microsoft.Data.Sqlite.Core - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.15 + - 6.0.20 :when: 2022-08-16 23:05:49.698463427 Z - - :approve - Microsoft.EntityFrameworkCore - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.15 + - 6.0.20 :when: 2022-08-16 23:05:50.137694970 Z - - :approve - Microsoft.EntityFrameworkCore.Abstractions - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.15 + - 6.0.20 :when: 2022-08-16 23:05:51.008105271 Z - - :approve - Microsoft.EntityFrameworkCore.Analyzers - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.15 + - 6.0.20 :when: 2022-08-16 23:05:51.445711308 Z - - :approve - Microsoft.EntityFrameworkCore.Design - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.15 + - 6.0.20 :when: 2022-08-16 23:05:51.922790944 Z - - :approve - Microsoft.EntityFrameworkCore.InMemory - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.15 + - 6.0.20 :when: 2022-08-16 23:05:52.375150938 Z - - :approve - Microsoft.EntityFrameworkCore.Relational - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.15 + - 6.0.20 :when: 2022-08-16 23:05:52.828879230 Z - - :approve - Microsoft.EntityFrameworkCore.Sqlite - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.15 + - 6.0.20 :when: 2022-08-16 23:05:53.270526921 Z - - :approve - Microsoft.EntityFrameworkCore.Sqlite.Core - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.15 + - 6.0.20 :when: 2022-08-16 23:05:53.706997823 Z - - :approve - Microsoft.Extensions.ApiDescription.Server @@ -526,16 +526,16 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 6.0.12 - 6.0.15 + - 6.0.20 :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 6.0.12 - 6.0.15 + - 6.0.20 :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore @@ -543,7 +543,7 @@ :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - 6.0.11 - - 6.0.15 + - 6.0.20 :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.FileProviders.Abstractions @@ -607,8 +607,8 @@ :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - 6.0.0 - - 6.0.2 - 6.0.3 + - 6.0.4 :when: 2022-08-16 23:06:06.728283354 Z - - :approve - Microsoft.Extensions.Logging.Configuration @@ -693,7 +693,7 @@ :why: MIT (https://raw.githubusercontent.com/microsoft/vstest/main/LICENSE) :versions: - 17.4.1 - - 17.5.0 + - 17.6.3 :when: 2022-09-01 23:06:13.008314524 Z - - :approve - Microsoft.NETCore.Platforms @@ -744,7 +744,7 @@ :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE) :versions: - 17.4.1 - - 17.5.0 + - 17.6.3 :when: 2022-08-16 23:06:16.175705981 Z - - :approve - Microsoft.TestPlatform.TestHost @@ -752,7 +752,7 @@ :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE) :versions: - 17.4.1 - - 17.5.0 + - 17.6.3 :when: 2022-08-16 23:06:17.671459450 Z - - :approve - Microsoft.Toolkit.HighPerformance @@ -795,14 +795,14 @@ - :who: neilsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - - 0.1.22 + - 0.1.23 :when: 2022-08-16 23:06:21.051573547 Z - - :approve - Monai.Deploy.Messaging.RabbitMQ - :who: neilsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - - 0.1.22 + - 0.1.23 :when: 2022-08-16 23:06:21.511789690 Z - - :approve - Monai.Deploy.Storage @@ -876,14 +876,14 @@ - :who: mocsharp :why: Apache-2.0 (https://github.com/NuGet/NuGet.Client/raw/dev/LICENSE.txt) :versions: - - 5.11.0 + - 6.5.0 :when: 2022-08-16 23:06:27.464713741 Z - - :approve - Polly - :who: mocsharp :why: New BSD License (https://github.com/App-vNext/Polly/raw/main/LICENSE.txt) :versions: - - 7.2.3 + - 7.2.4 :when: 2022-08-16 23:06:27.913122244 Z - - :approve - Portable.BouncyCastle @@ -1636,7 +1636,7 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.6.0 + - 6.0.0 :when: 2022-08-16 23:07:17.991171210 Z - - :approve - System.Text.Encoding.Extensions @@ -1659,20 +1659,13 @@ :versions: - 6.0.0 :when: 2022-08-16 23:07:19.377530263 Z -- - :approve - - System.Text.Json - - :who: mocsharp - :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) - :versions: - - 4.7.2 - :when: 2022-08-16 23:07:19.845361666 Z - - :approve - System.Text.Json - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - 6.0.7 + - 6.0.8 :when: 2022-08-16 23:07:20.787263056 Z - - :approve - System.Text.RegularExpressions @@ -1798,14 +1791,14 @@ - :who: mocsharp :why: MIT (https://github.com/coverlet-coverage/coverlet/raw/master/LICENSE) :versions: - - 3.2.0 + - 6.0.0 :when: 2022-08-16 23:07:29.112978564 Z - - :approve - fo-dicom - :who: mocsharp :why: Microsoft Public License (https://github.com/fo-dicom/fo-dicom/raw/development/License.txt) :versions: - - 5.0.3 + - 5.1.1 :when: 2022-08-16 23:07:29.574869349 Z - - :approve - runtime.any.System.Collections @@ -2232,7 +2225,7 @@ - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.1 + - 2.5.0 :when: 2022-08-16 23:07:58.264039741 Z - - :approve - xunit @@ -2253,112 +2246,70 @@ - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 0.10.0 - :when: 2022-08-16 23:07:59.702393969 Z -- - :approve - - xunit.analyzers - - :who: mocsharp - :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) - :versions: - - 1.0.0 + - 1.2.0 :when: 2022-08-16 23:08:00.165216213 Z - - :approve - xunit.assert - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.1 - :when: 2022-08-16 23:08:00.634240281 Z -- - :approve - - xunit.assert - - :who: mocsharp - :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) - :versions: - - 2.4.2 + - 2.5.0 :when: 2022-08-16 23:08:01.105384447 Z - - :approve - xunit.core - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.1 - :when: 2022-08-16 23:08:01.570300282 Z -- - :approve - - xunit.core - - :who: mocsharp - :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) - :versions: - - 2.4.2 + - 2.5.0 :when: 2022-08-16 23:08:02.057792372 Z - - :approve - xunit.extensibility.core - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.1 - :when: 2022-08-16 23:08:02.535203327 Z -- - :approve - - xunit.extensibility.core - - :who: mocsharp - :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) - :versions: - - 2.4.2 + - 2.5.0 :when: 2022-08-16 23:08:03.019024760 Z - - :approve - xunit.extensibility.execution - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.1 - :when: 2022-08-16 23:08:03.493713542 Z -- - :approve - - xunit.extensibility.execution - - :who: mocsharp - :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) - :versions: - - 2.4.2 + - 2.5.0 :when: 2022-08-16 23:08:03.959558421 Z - - :approve - xunit.runner.visualstudio - :who: mocsharp :why: MIT ( https://licenses.nuget.org/MIT) :versions: - - 2.4.3 - :when: 2022-08-16 23:08:04.429394853 Z -- - :approve - - xunit.runner.visualstudio - - :who: mocsharp - :why: MIT ( https://licenses.nuget.org/MIT) - :versions: - - 2.4.5 + - 2.5.0 :when: 2022-08-16 23:08:04.892608686 Z - - :approve - Ardalis.GuardClauses - :who: mocsharp :why: MIT (https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE) :versions: - - 4.0.1 + - 4.1.1 :when: 2022-08-16 23:10:21.184627612 Z - - :approve - NLog - :who: mocsharp :why: BSD 3-Clause License (https://github.com/NLog/NLog/raw/dev/LICENSE.txt) :versions: - - 5.1.3 + - 5.2.2 :when: 2022-10-12 03:14:06.538744982 Z - - :approve - NLog.Extensions.Logging - :who: mocsharp :why: BSD 2-Clause Simplified License (https://github.com/NLog/NLog.Extensions.Logging/raw/master/LICENSE) :versions: - - 5.2.3 + - 5.3.2 :when: 2022-10-12 03:14:06.964203977 Z - - :approve - NLog.Web.AspNetCore - :who: mocsharp :why: BSD 3-Clause License (https://github.com/NLog/NLog.Web/raw/master/LICENSE) :versions: - - 5.2.3 + - 5.3.2 :when: 2022-10-12 03:14:07.396706995 Z - - :approve - fo-dicom.NLog @@ -2400,28 +2351,28 @@ - :who: mocsharp :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) :versions: - - 2.19.1 + - 2.20.0 :when: 2022-11-16 23:38:53.891380809 Z - - :approve - MongoDB.Driver - :who: mocsharp :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) :versions: - - 2.19.1 + - 2.20.0 :when: 2022-11-16 23:38:54.213853364 Z - - :approve - MongoDB.Driver.Core - :who: mocsharp :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) :versions: - - 2.19.1 + - 2.20.0 :when: 2022-11-16 23:38:54.553730219 Z - - :approve - MongoDB.Libmongocrypt - :who: mocsharp :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) :versions: - - 1.7.0 + - 1.8.0 :when: 2022-11-16 23:38:54.863359236 Z - - :approve - SharpCompress @@ -2493,4 +2444,19 @@ :versions: - 6.0.2 :when: 2022-12-08 23:37:56.206982078 Z +- - :approve + - CommunityToolkit.HighPerformance + - :who: mocsharp + :why: MIT (https://raw.githubusercontent.com/CommunityToolkit/dotnet/main/License.md) + :versions: + - 8.2.0 + :when: 2023-08-04 0:02:30.206982078 Z +- - :approve + - Microsoft.Bcl.HashCode + - :who: mocsharp + :why: MIT (https://licenses.nuget.org/MIT) + :versions: + - 1.1.1 + :when: 2023-08-04 0:02:30.206982078 Z + diff --git a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj index 60fcb53d4..7de88721c 100644 --- a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj +++ b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/Api/Rest/InferenceRequest.cs b/src/Api/Rest/InferenceRequest.cs index cca4558a3..1a271f41f 100644 --- a/src/Api/Rest/InferenceRequest.cs +++ b/src/Api/Rest/InferenceRequest.cs @@ -230,7 +230,7 @@ private bool Validate(out string details) private void ValidateOUtputResources(List errors) { - Guard.Against.Null(errors); + Guard.Against.Null(errors, nameof(errors)); if (InputMetadata is not null && InputMetadata.Inputs.IsNullOrEmpty()) { @@ -247,7 +247,7 @@ private void ValidateOUtputResources(List errors) private void ValidateInputMetadata(List errors) { - Guard.Against.Null(errors); + Guard.Against.Null(errors, nameof(errors)); foreach (var output in OutputResources ?? Enumerable.Empty()) { @@ -264,7 +264,7 @@ private void ValidateInputMetadata(List errors) private void ValidateInputResources(List errors) { - Guard.Against.Null(errors); + Guard.Against.Null(errors, nameof(errors)); if (InputResources.IsNullOrEmpty() || !InputResources!.Any(predicate => predicate.Interface != InputInterfaceType.Algorithm)) @@ -319,8 +319,8 @@ private static void CheckInputMetadataDetails(InferenceRequestDetails details, L private static void CheckInputMetadataWithTypeFhirResource(InferenceRequestDetails details, List errors) { - Guard.Against.Null(details); - Guard.Against.Null(errors); + Guard.Against.Null(details, nameof(details)); + Guard.Against.Null(errors, nameof(errors)); if (details.Resources.IsNullOrEmpty()) { @@ -334,8 +334,8 @@ private static void CheckInputMetadataWithTypeFhirResource(InferenceRequestDetai private static void CheckInputMetadataWithTypDicomUid(InferenceRequestDetails details, List errors) { - Guard.Against.Null(details); - Guard.Against.Null(errors); + Guard.Against.Null(details, nameof(details)); + Guard.Against.Null(errors, nameof(errors)); if (details.Studies.IsNullOrEmpty()) { diff --git a/src/Api/Storage/DicomFileStorageMetadata.cs b/src/Api/Storage/DicomFileStorageMetadata.cs index da8dbccd7..2c3dfd17f 100644 --- a/src/Api/Storage/DicomFileStorageMetadata.cs +++ b/src/Api/Storage/DicomFileStorageMetadata.cs @@ -98,11 +98,11 @@ public DicomFileStorageMetadata() { } public DicomFileStorageMetadata(string associationId, string identifier, string studyInstanceUid, string seriesInstanceUid, string sopInstanceUid) : base(associationId.ToString(), identifier) { - Guard.Against.NullOrWhiteSpace(associationId); - Guard.Against.NullOrWhiteSpace(identifier); - Guard.Against.NullOrWhiteSpace(studyInstanceUid); - Guard.Against.NullOrWhiteSpace(seriesInstanceUid); - Guard.Against.NullOrWhiteSpace(sopInstanceUid); + Guard.Against.NullOrWhiteSpace(associationId, nameof(associationId)); + Guard.Against.NullOrWhiteSpace(identifier, nameof(identifier)); + Guard.Against.NullOrWhiteSpace(identifier, nameof(identifier)); + Guard.Against.NullOrWhiteSpace(identifier, nameof(identifier)); + Guard.Against.NullOrWhiteSpace(identifier, nameof(identifier)); StudyInstanceUid = studyInstanceUid; SeriesInstanceUid = seriesInstanceUid; diff --git a/src/Api/Storage/FhirFileStorageMetadata.cs b/src/Api/Storage/FhirFileStorageMetadata.cs index 91907e505..425ef0626 100644 --- a/src/Api/Storage/FhirFileStorageMetadata.cs +++ b/src/Api/Storage/FhirFileStorageMetadata.cs @@ -69,9 +69,9 @@ public FhirFileStorageMetadata() { } public FhirFileStorageMetadata(string transactionId, string resourceType, string resourceId, FhirStorageFormat fhirFileFormat) : base(transactionId, $"{resourceType}{PathSeparator}{resourceId}") { - Guard.Against.NullOrWhiteSpace(transactionId); - Guard.Against.NullOrWhiteSpace(resourceType); - Guard.Against.NullOrWhiteSpace(resourceId); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); + Guard.Against.NullOrWhiteSpace(resourceType, nameof(resourceType)); + Guard.Against.NullOrWhiteSpace(resourceId, nameof(resourceId)); Source = transactionId; ResourceType = resourceType; diff --git a/src/Api/Storage/FileStorageMetadata.cs b/src/Api/Storage/FileStorageMetadata.cs index ec3e3b310..e24ecb170 100644 --- a/src/Api/Storage/FileStorageMetadata.cs +++ b/src/Api/Storage/FileStorageMetadata.cs @@ -92,8 +92,8 @@ protected FileStorageMetadata() { } protected FileStorageMetadata(string correlationId, string identifier) { - Guard.Against.NullOrWhiteSpace(correlationId); - Guard.Against.NullOrWhiteSpace(identifier); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); + Guard.Against.NullOrWhiteSpace(identifier, nameof(identifier)); CorrelationId = correlationId; Id = identifier; @@ -107,7 +107,7 @@ protected FileStorageMetadata(string correlationId, string identifier) /// List of workflows. public void SetWorkflows(params string[] workflows) { - Guard.Against.NullOrEmpty(workflows); + Guard.Against.NullOrEmpty(workflows, nameof(workflows)); Workflows.AddRange(workflows); } diff --git a/src/Api/Storage/Hl7FileStorageMetadata.cs b/src/Api/Storage/Hl7FileStorageMetadata.cs index 1d9c8ce48..2eaf4a5ef 100644 --- a/src/Api/Storage/Hl7FileStorageMetadata.cs +++ b/src/Api/Storage/Hl7FileStorageMetadata.cs @@ -48,7 +48,7 @@ public Hl7FileStorageMetadata() { } public Hl7FileStorageMetadata(string connectionId) : base(connectionId, Guid.NewGuid().ToString()) { - Guard.Against.NullOrWhiteSpace(connectionId); + Guard.Against.NullOrWhiteSpace(connectionId, nameof(connectionId)); Source = connectionId; diff --git a/src/Api/Storage/Payload.cs b/src/Api/Storage/Payload.cs index cc305a67d..df0e859e9 100644 --- a/src/Api/Storage/Payload.cs +++ b/src/Api/Storage/Payload.cs @@ -81,7 +81,7 @@ public TimeSpan Elapsed public Payload(string key, string correlationId, uint timeout) { - Guard.Against.NullOrWhiteSpace(key); + Guard.Against.NullOrWhiteSpace(key, nameof(key)); Files = new List(); _lastReceived = new Stopwatch(); @@ -98,7 +98,7 @@ public Payload(string key, string correlationId, uint timeout) public void Add(FileStorageMetadata value) { - Guard.Against.Null(value); + Guard.Against.Null(value, nameof(value)); Files.Add(value); _lastReceived.Reset(); diff --git a/src/Api/Storage/StorageObjectMetadata.cs b/src/Api/Storage/StorageObjectMetadata.cs index 27c4399eb..1c1df2303 100644 --- a/src/Api/Storage/StorageObjectMetadata.cs +++ b/src/Api/Storage/StorageObjectMetadata.cs @@ -90,7 +90,7 @@ public class StorageObjectMetadata public StorageObjectMetadata(string fileExtension) { - Guard.Against.NullOrWhiteSpace(fileExtension); + Guard.Against.NullOrWhiteSpace(fileExtension, nameof(fileExtension)); if (fileExtension[0] != '.') { @@ -103,20 +103,20 @@ public StorageObjectMetadata(string fileExtension) public string GetTempStoragPath(string rootPath) { - Guard.Against.NullOrWhiteSpace(rootPath); + Guard.Against.NullOrWhiteSpace(rootPath, nameof(rootPath)); return $"{rootPath}{FileStorageMetadata.PathSeparator}{TemporaryPath}"; } public string GetPayloadPath(Guid payloadId) { - Guard.Against.Null(payloadId); + Guard.Against.Null(payloadId, nameof(payloadId)); return $"{payloadId}{FileStorageMetadata.PathSeparator}{UploadPath}"; } public void SetUploaded(string bucketName) { - Guard.Against.NullOrWhiteSpace(bucketName); + Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName)); TemporaryBucketName = bucketName; DateUploaded = DateTime.UtcNow; @@ -155,7 +155,7 @@ public void SetFailed() public void SetMoved(string bucketName) { - Guard.Against.NullOrEmpty(bucketName); + Guard.Against.NullOrEmpty(bucketName, nameof(bucketName)); PayloadBucketName = bucketName; DateMoved = DateTime.UtcNow; diff --git a/src/Api/Test/Monai.Deploy.InformaticsGateway.Api.Test.csproj b/src/Api/Test/Monai.Deploy.InformaticsGateway.Api.Test.csproj index 381c0e4c3..374d98fcc 100644 --- a/src/Api/Test/Monai.Deploy.InformaticsGateway.Api.Test.csproj +++ b/src/Api/Test/Monai.Deploy.InformaticsGateway.Api.Test.csproj @@ -29,15 +29,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Api/Test/packages.lock.json b/src/Api/Test/packages.lock.json index fb65e89a2..9f5ba5df2 100644 --- a/src/Api/Test/packages.lock.json +++ b/src/Api/Test/packages.lock.json @@ -4,18 +4,18 @@ "net6.0": { "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "System.IO.Abstractions.TestingHelpers": { @@ -38,28 +38,25 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -74,46 +71,53 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -134,8 +138,8 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -216,8 +220,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -226,27 +230,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -259,8 +258,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -352,8 +351,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -1094,10 +1093,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1113,13 +1112,20 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Text.RegularExpressions": { "type": "Transitive", @@ -1226,30 +1232,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1257,30 +1263,30 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } } } diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json index bf469152e..a4c29b434 100644 --- a/src/Api/packages.lock.json +++ b/src/Api/packages.lock.json @@ -10,15 +10,15 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.22, )", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "requested": "[0.1.23, )", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -46,11 +46,8 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -65,31 +62,38 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { + "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, - "Microsoft.Bcl.AsyncInterfaces": { + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -110,8 +114,8 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -190,16 +194,6 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" - }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", "resolved": "0.2.16", @@ -244,21 +238,28 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Channels": { "type": "Transitive", @@ -273,10 +274,10 @@ "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } } } diff --git a/src/CLI/Commands/AetCommand.cs b/src/CLI/Commands/AetCommand.cs index 8d8c4a0e0..829330a18 100644 --- a/src/CLI/Commands/AetCommand.cs +++ b/src/CLI/Commands/AetCommand.cs @@ -148,7 +148,7 @@ private void SetupEditAetCommand() private async Task ListAeTitlehandlerAsync(IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(host); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); @@ -216,8 +216,8 @@ private async Task ListAeTitlehandlerAsync(IHost host, bool verbose, Cancel private async Task RemoveAeTitlehandlerAsync(string name, IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(name); - Guard.Against.Null(host); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var configService = host.Services.GetRequiredService(); @@ -252,8 +252,8 @@ private async Task RemoveAeTitlehandlerAsync(string name, IHost host, bool private async Task AddAeTitlehandlerAsync(MonaiApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(entity); - Guard.Against.Null(host); + Guard.Against.Null(entity, nameof(entity)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var configService = host.Services.GetRequiredService(); @@ -304,8 +304,8 @@ private async Task AddAeTitlehandlerAsync(MonaiApplicationEntity entity, IH private async Task EditAeTitleHandlerAsync(MonaiApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(entity); - Guard.Against.Null(host); + Guard.Against.Null(entity, nameof(entity)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var configService = host.Services.GetRequiredService(); diff --git a/src/CLI/Commands/CommandBase.cs b/src/CLI/Commands/CommandBase.cs index 8748a37c0..1bbff414a 100644 --- a/src/CLI/Commands/CommandBase.cs +++ b/src/CLI/Commands/CommandBase.cs @@ -33,7 +33,7 @@ public CommandBase(string name, string description) : base(name, description) protected static ILogger CreateLogger(IHost host) { - Guard.Against.Null(host); + Guard.Against.Null(host, nameof(host)); var loggerFactory = host.Services.GetService(); return loggerFactory?.CreateLogger(); @@ -41,8 +41,8 @@ protected static ILogger CreateLogger(IHost host) protected static void LogVerbose(bool verbose, IHost host, string message) { - Guard.Against.Null(host); - Guard.Against.NullOrWhiteSpace(message); + Guard.Against.Null(host, nameof(host)); + Guard.Against.NullOrWhiteSpace(message, nameof(message)); if (verbose) { @@ -62,7 +62,7 @@ protected static void LogVerbose(bool verbose, IHost host, string message) protected static void AddConfirmationOption(Command command) { - Guard.Against.Null(command); + Guard.Against.Null(command, nameof(command)); var confirmationOption = new Option(new[] { "-y", "--yes" }, "Automatic yes to prompts"); command.AddOption(confirmationOption); @@ -70,7 +70,7 @@ protected static void AddConfirmationOption(Command command) protected static void CheckConfiguration(IConfigurationService configService) { - Guard.Against.Null(configService); + Guard.Against.Null(configService, nameof(configService)); if (!configService.IsInitialized) { diff --git a/src/CLI/Commands/ConfigCommand.cs b/src/CLI/Commands/ConfigCommand.cs index 51323b372..43e805418 100644 --- a/src/CLI/Commands/ConfigCommand.cs +++ b/src/CLI/Commands/ConfigCommand.cs @@ -84,7 +84,7 @@ private void SetupShowConfigCommand() private int ShowConfigurationHandler(IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(host); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var logger = CreateLogger(host); @@ -114,8 +114,8 @@ private int ShowConfigurationHandler(IHost host, bool verbose, CancellationToken private static int ConfigUpdateHandler(IHost host, Action updater) { - Guard.Against.Null(host); - Guard.Against.Null(updater); + Guard.Against.Null(host, nameof(host)); + Guard.Against.Null(updater, nameof(updater)); var logger = CreateLogger(host); var config = host.Services.GetRequiredService(); @@ -143,7 +143,7 @@ private static int ConfigUpdateHandler(IHost host, Action private async Task InitHandlerAsync(IHost host, bool verbose, bool yes, CancellationToken cancellationToken) { - Guard.Against.Null(host); + Guard.Against.Null(host, nameof(host)); var logger = CreateLogger(host); var configService = host.Services.GetRequiredService(); diff --git a/src/CLI/Commands/DestinationCommand.cs b/src/CLI/Commands/DestinationCommand.cs index 6e8239a87..044000b8f 100644 --- a/src/CLI/Commands/DestinationCommand.cs +++ b/src/CLI/Commands/DestinationCommand.cs @@ -116,8 +116,8 @@ private void SetupAddDestinationCommand() private async Task ListDestinationHandlerAsync(DestinationApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(entity); - Guard.Against.Null(host); + Guard.Against.Null(entity, nameof(entity)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); @@ -182,8 +182,8 @@ private async Task ListDestinationHandlerAsync(DestinationApplicationEntity private async Task CEchoDestinationHandlerAsync(string name, IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(name); - Guard.Against.Null(host); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var configService = host.Services.GetRequiredService(); @@ -218,8 +218,8 @@ private async Task CEchoDestinationHandlerAsync(string name, IHost host, bo private async Task RemoveDestinationHandlerAsync(string name, IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(name); - Guard.Against.Null(host); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var configService = host.Services.GetRequiredService(); @@ -254,8 +254,8 @@ private async Task RemoveDestinationHandlerAsync(string name, IHost host, b private async Task EditDestinationHandlerAsync(DestinationApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(entity); - Guard.Against.Null(host); + Guard.Against.Null(entity, nameof(entity)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var configService = host.Services.GetRequiredService(); @@ -292,8 +292,8 @@ private async Task EditDestinationHandlerAsync(DestinationApplicationEntity private async Task AddDestinationHandlerAsync(DestinationApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(entity); - Guard.Against.Null(host); + Guard.Against.Null(entity, nameof(entity)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var configService = host.Services.GetRequiredService(); diff --git a/src/CLI/Commands/RestartCommand.cs b/src/CLI/Commands/RestartCommand.cs index c9d06653d..ba9cc479f 100644 --- a/src/CLI/Commands/RestartCommand.cs +++ b/src/CLI/Commands/RestartCommand.cs @@ -35,7 +35,7 @@ public RestartCommand() : base("restart", $"Restart the {Strings.ApplicationName private async Task RestartCommandHandler(IHost host, bool yes, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(host); + Guard.Against.Null(host, nameof(host)); var service = host.Services.GetRequiredService(); var confirmation = host.Services.GetRequiredService(); diff --git a/src/CLI/Commands/SourceCommand.cs b/src/CLI/Commands/SourceCommand.cs index 096aa5945..2a2f27dd1 100644 --- a/src/CLI/Commands/SourceCommand.cs +++ b/src/CLI/Commands/SourceCommand.cs @@ -98,8 +98,8 @@ private void SetupUpdateSourceCommand() private async Task ListSourceHandlerAsync(SourceApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationTokena) { - Guard.Against.Null(entity); - Guard.Against.Null(host); + Guard.Against.Null(entity, nameof(entity)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); @@ -163,8 +163,8 @@ private async Task ListSourceHandlerAsync(SourceApplicationEntity entity, I private async Task RemoveSourceHandlerAsync(string name, IHost host, bool verbose, CancellationToken cancellationTokena) { - Guard.Against.NullOrWhiteSpace(name); - Guard.Against.Null(host); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var configService = host.Services.GetRequiredService(); @@ -199,8 +199,8 @@ private async Task RemoveSourceHandlerAsync(string name, IHost host, bool v private async Task AddSourceHandlerAsync(SourceApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationTokena) { - Guard.Against.Null(entity); - Guard.Against.Null(host); + Guard.Against.Null(entity, nameof(entity)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var configService = host.Services.GetRequiredService(); @@ -236,8 +236,8 @@ private async Task AddSourceHandlerAsync(SourceApplicationEntity entity, IH private async Task UpdateSourceHandlerAsync(SourceApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationTokena) { - Guard.Against.Null(entity); - Guard.Against.Null(host); + Guard.Against.Null(entity, nameof(entity)); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); var configService = host.Services.GetRequiredService(); diff --git a/src/CLI/Commands/StartCommand.cs b/src/CLI/Commands/StartCommand.cs index 3ceb4c574..c59545b6a 100644 --- a/src/CLI/Commands/StartCommand.cs +++ b/src/CLI/Commands/StartCommand.cs @@ -35,7 +35,7 @@ public StartCommand() : base("start", $"Start the {Strings.ApplicationName} serv private async Task StartCommandHandler(IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(host); + Guard.Against.Null(host, nameof(host)); var service = host.Services.GetRequiredService(); var confirmation = host.Services.GetRequiredService(); diff --git a/src/CLI/Commands/StatusCommand.cs b/src/CLI/Commands/StatusCommand.cs index 23cf0fb0a..b64573b71 100644 --- a/src/CLI/Commands/StatusCommand.cs +++ b/src/CLI/Commands/StatusCommand.cs @@ -36,7 +36,7 @@ public StatusCommand() : base("status", $"{Strings.ApplicationName} service stat private async Task StatusCommandHandlerAsync(IHost host, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(host); + Guard.Against.Null(host, nameof(host)); LogVerbose(verbose, host, "Configuring services..."); diff --git a/src/CLI/Commands/StopCommand.cs b/src/CLI/Commands/StopCommand.cs index 51a031ca1..2b4eef74f 100644 --- a/src/CLI/Commands/StopCommand.cs +++ b/src/CLI/Commands/StopCommand.cs @@ -35,7 +35,7 @@ public StopCommand() : base("stop", $"Stop the {Strings.ApplicationName} service private async Task StopCommandHandler(IHost host, bool yes, bool verbose, CancellationToken cancellationToken) { - Guard.Against.Null(host); + Guard.Against.Null(host, nameof(host)); var service = host.Services.GetRequiredService(); var confirmation = host.Services.GetRequiredService(); diff --git a/src/CLI/ControlException.cs b/src/CLI/ControlException.cs index 35f9152da..02f27f045 100644 --- a/src/CLI/ControlException.cs +++ b/src/CLI/ControlException.cs @@ -49,7 +49,7 @@ protected ControlException(SerializationInfo info, StreamingContext context) : b public override void GetObjectData(SerializationInfo info, StreamingContext context) { - Guard.Against.Null(info); + Guard.Against.Null(info, nameof(info)); info.AddValue(nameof(ErrorCode), ErrorCode); diff --git a/src/CLI/Logging/ConsoleLogger.cs b/src/CLI/Logging/ConsoleLogger.cs index 38c4f1472..0b6c25a9c 100644 --- a/src/CLI/Logging/ConsoleLogger.cs +++ b/src/CLI/Logging/ConsoleLogger.cs @@ -27,7 +27,7 @@ public class ConsoleLogger : ILogger public ConsoleLogger(string name, ConsoleLoggerConfiguration configuration) { - Guard.Against.NullOrWhiteSpace(name); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); _ = name; _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration)); diff --git a/src/CLI/Logging/ConsoleLoggerFactoryExtensions.cs b/src/CLI/Logging/ConsoleLoggerFactoryExtensions.cs index 818118b18..5536b23c5 100644 --- a/src/CLI/Logging/ConsoleLoggerFactoryExtensions.cs +++ b/src/CLI/Logging/ConsoleLoggerFactoryExtensions.cs @@ -32,7 +32,7 @@ public static class ConsoleLoggerFactoryExtensions { public static ILoggingBuilder AddInformaticsGatewayConsole(this ILoggingBuilder builder, Action configure) { - Guard.Against.Null(configure); + Guard.Against.Null(configure, nameof(configure)); builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton()); LoggerProviderOptions.RegisterProviderOptions(builder.Services); diff --git a/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj b/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj index 26e3dc377..c8ac72782 100644 --- a/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj +++ b/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj @@ -55,7 +55,7 @@ - + diff --git a/src/CLI/Services/ConfirmationPrompt.cs b/src/CLI/Services/ConfirmationPrompt.cs index 156f2c7ce..bcef296a7 100644 --- a/src/CLI/Services/ConfirmationPrompt.cs +++ b/src/CLI/Services/ConfirmationPrompt.cs @@ -28,7 +28,7 @@ internal class ConfirmationPrompt : IConfirmationPrompt { public bool ShowConfirmationPrompt(string message) { - Guard.Against.NullOrWhiteSpace(message); + Guard.Against.NullOrWhiteSpace(message, nameof(message)); Console.Write($"{message} [y/N]: "); var key = Console.ReadKey(); diff --git a/src/CLI/Services/DockerRunner.cs b/src/CLI/Services/DockerRunner.cs index 41bf03d2a..20d1c15a0 100644 --- a/src/CLI/Services/DockerRunner.cs +++ b/src/CLI/Services/DockerRunner.cs @@ -45,7 +45,7 @@ public DockerRunner(ILogger logger, IConfigurationService configur public async Task IsApplicationRunning(ImageVersion imageVersion, CancellationToken cancellationToken = default) { - Guard.Against.Null(imageVersion); + Guard.Against.Null(imageVersion, nameof(imageVersion)); _logger.CheckingExistingAppContainer(Strings.ApplicationName, imageVersion.Version); var parameters = new ContainersListParameters @@ -72,7 +72,7 @@ public async Task GetLatestApplicationVersion(CancellationToken ca public async Task GetLatestApplicationVersion(string version, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(version); + Guard.Against.NullOrWhiteSpace(version, nameof(version)); var results = await GetApplicationVersions(version, cancellationToken).ConfigureAwait(false); return results?.OrderByDescending(p => p.Created).FirstOrDefault(); @@ -83,7 +83,7 @@ public async Task> GetApplicationVersions(CancellationToken public async Task> GetApplicationVersions(string version, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(version); + Guard.Against.NullOrWhiteSpace(version, nameof(version)); _logger.ConnectingToDocker(); var parameters = new ImagesListParameters @@ -103,7 +103,7 @@ public async Task> GetApplicationVersions(string version, Ca public async Task StartApplication(ImageVersion imageVersion, CancellationToken cancellationToken = default) { - Guard.Against.Null(imageVersion); + Guard.Against.Null(imageVersion, nameof(imageVersion)); _logger.CreatingDockerContainer(Strings.ApplicationName, imageVersion.Version, imageVersion.IdShort); var createContainerParams = new CreateContainerParameters @@ -168,7 +168,7 @@ public async Task StartApplication(ImageVersion imageVersion, Cancellation public async Task StopApplication(RunnerState runnerState, CancellationToken cancellationToken = default) { - Guard.Against.Null(runnerState); + Guard.Against.Null(runnerState, nameof(runnerState)); _logger.DockerContainerStopping(Strings.ApplicationName, runnerState.IdShort); var result = await _dockerClient.Containers.StopContainerAsync(runnerState.Id, new ContainerStopParameters() { WaitBeforeKillSeconds = 60 }, cancellationToken).ConfigureAwait(false); diff --git a/src/CLI/Services/EmbeddedResource.cs b/src/CLI/Services/EmbeddedResource.cs index b723e2bee..9b21c127e 100644 --- a/src/CLI/Services/EmbeddedResource.cs +++ b/src/CLI/Services/EmbeddedResource.cs @@ -28,7 +28,7 @@ public class EmbeddedResource : IEmbeddedResource { public Stream GetManifestResourceStream(string name) { - Guard.Against.NullOrWhiteSpace(name); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); return GetType().Assembly.GetManifestResourceStream(Common.AppSettingsResourceName); } } diff --git a/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj b/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj index ea5978ae0..7b3c06124 100644 --- a/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj +++ b/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj @@ -29,17 +29,17 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/CLI/Test/packages.lock.json b/src/CLI/Test/packages.lock.json index 0cacb4101..174886f71 100644 --- a/src/CLI/Test/packages.lock.json +++ b/src/CLI/Test/packages.lock.json @@ -4,18 +4,18 @@ "net6.0": { "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "Moq": { @@ -58,28 +58,25 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -102,6 +99,11 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "Crayon": { "type": "Transitive", "resolved": "2.0.69", @@ -109,8 +111,8 @@ }, "Docker.DotNet": { "type": "Transitive", - "resolved": "3.125.13", - "contentHash": "p1DrW2Sw4ND2jFlIvpHB8/pY5o5HIkDalbGAI8tUvqjJR6n0/ubos7kDGWI+Xbx9+L3US3SUR8r59Zwq+ZxBvw==", + "resolved": "3.125.15", + "contentHash": "XN8FKxVv8Mjmwu104/Hl9lM61pLY675s70gzwSj8KR5pwblo8HfWLcCuinh9kYsqujBkMH4HVRCEcRuU6al4BQ==", "dependencies": { "Newtonsoft.Json": "13.0.1", "System.Buffers": "4.5.1", @@ -119,25 +121,22 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", @@ -153,14 +152,19 @@ } }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -169,8 +173,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -252,8 +256,8 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -464,8 +468,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -474,27 +478,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -507,8 +506,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -609,8 +608,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -1378,10 +1377,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1405,8 +1404,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1512,30 +1511,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1543,18 +1542,18 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "mig-cli": { "type": "Project", "dependencies": { "Crayon": "[2.0.69, )", - "Docker.DotNet": "[3.125.13, )", + "Docker.DotNet": "[3.125.15, )", "Microsoft.Extensions.Hosting": "[6.0.1, )", "Microsoft.Extensions.Logging": "[6.0.0, )", "Microsoft.Extensions.Logging.Console": "[6.0.0, )", @@ -1571,9 +1570,9 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -1589,17 +1588,17 @@ "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } } } diff --git a/src/CLI/packages.lock.json b/src/CLI/packages.lock.json index b511d9ff1..0a6fd4fad 100644 --- a/src/CLI/packages.lock.json +++ b/src/CLI/packages.lock.json @@ -10,9 +10,9 @@ }, "Docker.DotNet": { "type": "Direct", - "requested": "[3.125.13, )", - "resolved": "3.125.13", - "contentHash": "p1DrW2Sw4ND2jFlIvpHB8/pY5o5HIkDalbGAI8tUvqjJR6n0/ubos7kDGWI+Xbx9+L3US3SUR8r59Zwq+ZxBvw==", + "requested": "[3.125.15, )", + "resolved": "3.125.15", + "contentHash": "XN8FKxVv8Mjmwu104/Hl9lM61pLY675s70gzwSj8KR5pwblo8HfWLcCuinh9kYsqujBkMH4HVRCEcRuU6al4BQ==", "dependencies": { "Newtonsoft.Json": "13.0.1", "System.Buffers": "4.5.1", @@ -110,11 +110,8 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -129,27 +126,29 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", @@ -165,9 +164,14 @@ } }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -176,8 +180,8 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -259,8 +263,8 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -418,19 +422,14 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -443,8 +442,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -1285,10 +1284,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1312,8 +1311,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1416,9 +1415,9 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -1434,17 +1433,17 @@ "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } } } diff --git a/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj b/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj index feae9df5a..258e83315 100644 --- a/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj +++ b/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/src/Client.Common/ProblemException.cs b/src/Client.Common/ProblemException.cs index 81989b0f7..c3f1e0b08 100644 --- a/src/Client.Common/ProblemException.cs +++ b/src/Client.Common/ProblemException.cs @@ -28,7 +28,7 @@ public class ProblemException : Exception public ProblemException(ProblemDetails problemDetails) : base(problemDetails?.Detail) { - Guard.Against.Null(problemDetails); + Guard.Against.Null(problemDetails, nameof(problemDetails)); ProblemDetails = problemDetails; } diff --git a/src/Client.Common/Test/Monai.Deploy.InformaticsGateway.Client.Common.Test.csproj b/src/Client.Common/Test/Monai.Deploy.InformaticsGateway.Client.Common.Test.csproj index ec3803e7e..67826ed08 100644 --- a/src/Client.Common/Test/Monai.Deploy.InformaticsGateway.Client.Common.Test.csproj +++ b/src/Client.Common/Test/Monai.Deploy.InformaticsGateway.Client.Common.Test.csproj @@ -26,15 +26,15 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Client.Common/Test/packages.lock.json b/src/Client.Common/Test/packages.lock.json index fcdbbac9b..acf115c0c 100644 --- a/src/Client.Common/Test/packages.lock.json +++ b/src/Client.Common/Test/packages.lock.json @@ -4,27 +4,24 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Direct", - "requested": "[4.0.1, )", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "requested": "[4.1.1, )", + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "Moq": { @@ -47,20 +44,20 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Castle.Core": { "type": "Transitive", @@ -70,15 +67,10 @@ "System.Diagnostics.EventLog": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -92,19 +84,19 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, @@ -176,8 +168,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -943,8 +935,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1045,30 +1037,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1076,18 +1068,18 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } } } diff --git a/src/Client.Common/packages.lock.json b/src/Client.Common/packages.lock.json index e3b5be2b0..07d47a87b 100644 --- a/src/Client.Common/packages.lock.json +++ b/src/Client.Common/packages.lock.json @@ -4,28 +4,20 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Direct", - "requested": "[4.0.1, )", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "requested": "[4.1.1, )", + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "System.Text.Json": { "type": "Direct", - "requested": "[6.0.7, )", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "requested": "[6.0.8, )", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.0.0", diff --git a/src/Client/Services/AeTitle{T}Service.cs b/src/Client/Services/AeTitle{T}Service.cs index e804cc1be..45f5779c5 100644 --- a/src/Client/Services/AeTitle{T}Service.cs +++ b/src/Client/Services/AeTitle{T}Service.cs @@ -49,15 +49,15 @@ internal class AeTitleService : ServiceBase, IAeTitleService public AeTitleService(string route, HttpClient httpClient, ILogger logger = null) : base(httpClient, logger) { - Guard.Against.NullOrWhiteSpace(route); - Guard.Against.Null(httpClient); + Guard.Against.NullOrWhiteSpace(route, nameof(route)); + Guard.Against.Null(httpClient, nameof(httpClient)); Route = route; } public async Task Create(T item, CancellationToken cancellationToken) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); Logger.SendingRequestTo(Route); var response = await HttpClient.PostAsJsonAsync(Route, item, Configuration.JsonSerializationOptions, cancellationToken).ConfigureAwait(false); @@ -68,7 +68,7 @@ public async Task Create(T item, CancellationToken cancellationToken) public async Task Delete(string aeTitle, CancellationToken cancellationToken) { aeTitle = Uri.EscapeDataString(aeTitle); - Guard.Against.NullOrWhiteSpace(aeTitle); + Guard.Against.NullOrWhiteSpace(aeTitle, nameof(aeTitle)); Logger.SendingRequestTo($"{Route}/{aeTitle}"); var response = await HttpClient.DeleteAsync($"{Route}/{aeTitle}", cancellationToken).ConfigureAwait(false); await response.EnsureSuccessStatusCodeWithProblemDetails(Logger).ConfigureAwait(false); @@ -78,7 +78,7 @@ public async Task Delete(string aeTitle, CancellationToken cancellationToken) public async Task GetAeTitle(string aeTitle, CancellationToken cancellationToken) { aeTitle = Uri.EscapeDataString(aeTitle); - Guard.Against.NullOrWhiteSpace(aeTitle); + Guard.Against.NullOrWhiteSpace(aeTitle, nameof(aeTitle)); Logger.SendingRequestTo($"{Route}/{aeTitle}"); var response = await HttpClient.GetAsync($"{Route}/{aeTitle}", cancellationToken).ConfigureAwait(false); await response.EnsureSuccessStatusCodeWithProblemDetails(Logger).ConfigureAwait(false); @@ -101,7 +101,7 @@ public async Task CEcho(string name, CancellationToken cancellationToken) throw new NotSupportedException($"C-ECHO is not supported for {typeof(T).Name}"); } name = Uri.EscapeDataString(name); - Guard.Against.NullOrWhiteSpace(name); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); Logger.SendingRequestTo($"{Route}/{name}"); var response = await HttpClient.GetAsync($"{Route}/cecho/{name}", cancellationToken).ConfigureAwait(false); await response.EnsureSuccessStatusCodeWithProblemDetails(Logger).ConfigureAwait(false); @@ -109,7 +109,7 @@ public async Task CEcho(string name, CancellationToken cancellationToken) public async Task Update(T item, CancellationToken cancellationToken) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); Logger.SendingRequestTo(Route); var response = await HttpClient.PutAsJsonAsync(Route, item, Configuration.JsonSerializationOptions, cancellationToken).ConfigureAwait(false); diff --git a/src/Client/Services/HealthService.cs b/src/Client/Services/HealthService.cs index 7b7a5b4ab..1d9be5472 100644 --- a/src/Client/Services/HealthService.cs +++ b/src/Client/Services/HealthService.cs @@ -39,7 +39,7 @@ internal class HealthService : ServiceBase, IHealthService public HealthService(HttpClient httpClient, ILogger logger = null) : base(httpClient, logger) { - Guard.Against.Null(httpClient); + Guard.Against.Null(httpClient, nameof(httpClient)); } public async Task Live(CancellationToken cancellationToken) => await LiveReady("live", cancellationToken).ConfigureAwait(false); diff --git a/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj b/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj index 604135f06..d9fc5f10c 100644 --- a/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj +++ b/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj @@ -29,13 +29,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Client/Test/packages.lock.json b/src/Client/Test/packages.lock.json index cb1f838a6..6fda98427 100644 --- a/src/Client/Test/packages.lock.json +++ b/src/Client/Test/packages.lock.json @@ -4,18 +4,18 @@ "net6.0": { "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "Moq": { @@ -29,28 +29,25 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AspNetCore.HealthChecks.MongoDb": { "type": "Transitive", @@ -82,6 +79,11 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "Crc32.NET": { "type": "Transitive", "resolved": "1.2.0", @@ -117,39 +119,27 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "fo-dicom.NLog": { - "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "k35FD+C9IcpTLjCF5tvCkBGUxJ+YvzoBsgb2VAtGQv+aVTu+HyoCnNVqccc4lVE53fbVCwpR3gPiTAnm5fm+KQ==", - "dependencies": { - "NLog": "4.7.11", - "fo-dicom": "5.0.3" - } - }, "HL7-dotnetcore": { "type": "Transitive", "resolved": "2.35.0", "contentHash": "1yScq0Ju2O/GPBasnr9/uHziKu3CBgh4nOkgJPWatPLTcP4EzUjjaM2hkgjOBMj8pKO0g687UDnj989MvYRLfA==" }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Karambolo.Extensions.Logging.File": { "type": "Transitive", "resolved": "3.4.0", @@ -188,10 +178,15 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -200,19 +195,19 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "yE5Q7jJDuGUwS3FMV6N6oz7p7MrtqPrdanLHG6dVXPB3o4KQKLpkPPzUQPByGmBis6wIDGmbWunwjD0vH/qlFQ==", + "resolved": "6.0.20", + "contentHash": "k+namWYTxTS9t/JYDyZoTzQK95iLDrQTBTuEZu/zfbl2sm8DQ8taNJ2HkBw8tXvW2pM8yyAQbJjcPYzx/BUBuw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -222,39 +217,39 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "ouk4es/CzwxjXl33mb2hJzitluc2CD9rujZVBaUy3w3fn8qMjlktMOhf5mIAS7e3sreBikOBwaxp9/y/N/O2NQ==", + "resolved": "6.0.20", + "contentHash": "TQX6xHu1puMviW+GSfLfDO1iGe3TE43D5+oyDEZ7xSXlrPnupxJoujjCNptZoEvUo4giEJQRvT9tlDKU1LhbQQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15", + "Microsoft.EntityFrameworkCore": "6.0.20", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "4oRXU58XmoDkK27wDMmIrZG9yaOYw8URmWNQzGkfO0ZCpELX/bx6rtb99eoBOOzA+a0QYoTLlugZB7MyM1XDbw==", + "resolved": "6.0.20", + "contentHash": "PT84DIPfxpdNOr8TuuEMP+2GRbUSHBugN34c05UExPFCPd3DaksEax1cZMC9qMCx29JBPCK8lAhnfFi1V18Yng==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.15", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.20", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "30gMAP29sWQ9yTSM/VXknmv8BcH9AVO+QHCpoDoAlzPnmL6STjJ5jihlOp1mvErGVTkEgnaIxmv4j3gX6knFRw==", + "resolved": "6.0.20", + "contentHash": "Demwm93dqVo0r9rFFrjZPNwnWjVFerp92IraGImsFGd8CH+zFhYaKa20Y1tPttDk3Bwj6CscIOWdAKB4Ei3tTQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.15", - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", + "Microsoft.Data.Sqlite.Core": "6.0.20", + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -389,28 +384,28 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.20", + "contentHash": "/uw/4EXx+tOWiqTVNbO0ooaFrrp06h68hI7XhOKyHRp7rdUi7SNmIsj0CCNE6PyZanfnQDwhNyaxG25u2HWpjg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.20", + "contentHash": "qWT4ldcOylWZa+GXFePyAJSQ9d/gWzKIL2KdFCkudZpzMjeTUPpqMhIwZdJNvCupi/ercnUT3Ru1RI/rWwX8aA==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "jIWboFkp6O/G3wF6JwQq8A5AR5TcZbCRzXdBhaYgVAGiWexb95/2JkytGFrJJ44pBiWO76jpOT4vShGLAgf1HQ==", + "resolved": "6.0.20", + "contentHash": "WV5KDOKX0OmqzxZ6yA5DpcJY05ARD0TtJo47+cjSpptII8rO/KhDDQuW9RXxneTx0oVKcc50EOJhZZdEKk+M0A==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15" + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -499,8 +494,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -662,27 +657,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -708,8 +698,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -722,10 +712,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "ZJEHtM4NaX8UzvG+w1coKOivbCecoU6hx8g06PGKkg6giIeLGqCi2FDkP89kIPq7Kz1RB9cLVvYdXY9Rs+ZDSg==", + "resolved": "0.1.23", + "contentHash": "+Y1eLKz9FtPbASOVtTaM1ktyUqOxmyIjksNukZ8dUhtDJrT3CF9ISw6BGajxwJfq2jUjacli3jNSc1OAnLJRcQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.22", + "Monai.Deploy.Messaging": "0.1.23", "Polly": "7.2.3", "RabbitMQ.Client": "6.4.0", "System.Collections.Concurrent": "4.3.0" @@ -784,33 +774,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==", + "resolved": "2.20.0", + "contentHash": "IXgb+uGslHBgy+JjfwepO06Vmq5itprTPJJtQotAhLMjmuDvbA7pfAs/2hTfqYbR39l7eli5bIwA3zqZHUkVlQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==", + "resolved": "2.20.0", + "contentHash": "pAxVtrIRTTuQG3xMBF3NfWumXqf/JT0i7eEzp06k4zin8zj1sroX0J/i/qzJ9JjHQMh3BSsQ4E209G5S6zkxrg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Driver.Core": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.20.0", + "MongoDB.Driver.Core": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==", + "resolved": "2.20.0", + "contentHash": "YIRUQnl/aHjZbvwoVHhlUi5ofoZs/6HRllpxZrSseB52IJPmhYclppApAUb/TETIx7mPxcoZgHVVQKnwYQQCVg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -819,8 +809,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "NETStandard.Library": { "type": "Transitive", @@ -846,36 +836,36 @@ }, "NLog": { "type": "Transitive", - "resolved": "5.1.3", - "contentHash": "rB8hwjBf1EZCfG5iPfsv3gPksLoJLr1cOrt7PBbJu6VpJgwYJchDzTUT1dhNDdPv0QakXJQJOhE59ErupcznQQ==" + "resolved": "5.2.2", + "contentHash": "r6Q9740g29gTwmTWlsgdIFm0mhNsfNZmbvWKX/Fxmi8X89ZrpUowHM2T2X1lP7RVpND+ef+XnfKL5g6Q1iNGXA==" }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.3", - "contentHash": "TB8zPGV2nVpvWq5C8zIVHPSmnzOHMrXppjsAwHcuJq1Ehs8sC0llnAv5Ysf5Lf/vew9amV/+01MohtRFSDzKdQ==", + "resolved": "5.3.2", + "contentHash": "v6swUNj9KHH4tWKH3+eCuFsp/BfpkWmbz1XPCIXb9fnSVsEHcfyRnfXjuksfMdIULgR/i1RzbQUU8WsNVpBglg==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.3" + "NLog": "5.2.2" } }, "NLog.Web.AspNetCore": { "type": "Transitive", - "resolved": "5.2.3", - "contentHash": "uP0KekbkswuMjo1dbaqu20TxH2Dc3ox2qJDIi837ob2Fq/BliZHuQY9nJdM3UArVrLrsl+xxsx0D6h8m3fOufg==", + "resolved": "5.3.2", + "contentHash": "SLBeDj30nu1sjc3DsPhTdXSL90915eeQknYbSCZOthccxqVJS1RZna0sh746kDaD21ktnYMubXT+gNWgn3oGpA==", "dependencies": { - "NLog.Extensions.Logging": "5.2.3" + "NLog.Extensions.Logging": "5.3.2" } }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "Polly": { "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "RabbitMQ.Client": { "type": "Transitive", @@ -1554,10 +1544,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -1570,8 +1560,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1623,30 +1613,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1654,11 +1644,11 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "ZstdSharp.Port": { @@ -1669,141 +1659,140 @@ "monai.deploy.informaticsgateway": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "DotNext.Threading": "4.7.4", - "HL7-dotnetcore": "2.35.0", - "Karambolo.Extensions.Logging.File": "3.4.0", - "Microsoft.EntityFrameworkCore": "6.0.15", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "6.0.15", - "Microsoft.Extensions.Hosting": "6.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Console": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Monai.Deploy.InformaticsGateway.Database": "1.0.0", - "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "1.0.0", - "Monai.Deploy.InformaticsGateway.DicomWeb.Client": "1.0.0", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.22", - "Monai.Deploy.Security": "0.1.3", - "Monai.Deploy.Storage": "0.2.16", - "Monai.Deploy.Storage.MinIO": "0.2.16", - "NLog": "5.1.3", - "NLog.Web.AspNetCore": "5.2.3", - "Polly": "7.2.3", - "Swashbuckle.AspNetCore": "6.5.0", - "fo-dicom": "5.0.3", - "fo-dicom.NLog": "5.0.3" + "Ardalis.GuardClauses": "[4.1.1, )", + "DotNext.Threading": "[4.7.4, )", + "HL7-dotnetcore": "[2.35.0, )", + "Karambolo.Extensions.Logging.File": "[3.4.0, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", + "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.20, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.20, )", + "Microsoft.Extensions.Hosting": "[6.0.1, )", + "Microsoft.Extensions.Logging": "[6.0.0, )", + "Microsoft.Extensions.Logging.Console": "[6.0.0, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Database": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.DicomWeb.Client": "[1.0.0, )", + "Monai.Deploy.Messaging.RabbitMQ": "[0.1.23, )", + "Monai.Deploy.Security": "[0.1.3, )", + "Monai.Deploy.Storage": "[0.2.16, )", + "Monai.Deploy.Storage.MinIO": "[0.2.16, )", + "NLog": "[5.2.2, )", + "NLog.Web.AspNetCore": "[5.3.2, )", + "Polly": "[7.2.4, )", + "Swashbuckle.AspNetCore": "[6.5.0, )", + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "3.0.0", - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.22", - "Monai.Deploy.Storage": "0.2.16" + "Macross.Json.Extensions": "[3.0.0, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.client": { "type": "Project", "dependencies": { - "Microsoft.AspNet.WebApi.Client": "5.2.9", - "Microsoft.Extensions.Http": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0" + "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", + "Microsoft.Extensions.Http": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.Text.Json": "6.0.7" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "System.IO.Abstractions": "17.2.3", - "System.Threading.Tasks.Dataflow": "6.0.0", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.IO.Abstractions": "[17.2.3, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )", + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Common": "1.0.0", - "Monai.Deploy.Messaging": "0.1.22", - "Monai.Deploy.Storage": "0.2.16", - "System.IO.Abstractions": "17.2.3" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", + "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Storage": "[0.2.16, )", + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.informaticsgateway.database": { "type": "Project", "dependencies": { - "AspNetCore.HealthChecks.MongoDb": "6.0.2", - "Microsoft.EntityFrameworkCore": "6.0.15", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "6.0.15", - "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "1.0.0", - "Monai.Deploy.InformaticsGateway.Database.MongoDB": "1.0.0" + "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )", + "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", + "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.20, )", + "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Database.MongoDB": "[1.0.0, )" } }, "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Polly": "7.2.3" + "Microsoft.EntityFrameworkCore": "[6.0.20, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Polly": "[7.2.4, )" } }, "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15", - "Microsoft.EntityFrameworkCore.Sqlite": "6.0.15", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Monai.Deploy.InformaticsGateway.Api": "1.0.0", - "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", - "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0" + "Microsoft.EntityFrameworkCore": "[6.0.20, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.20, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )", + "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", + "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", + "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", + "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )" } }, "monai.deploy.informaticsgateway.database.mongodb": { "type": "Project", "dependencies": { - "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0", - "MongoDB.Driver": "2.19.1", - "MongoDB.Driver.Core": "2.19.1" + "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", + "MongoDB.Driver": "[2.20.0, )", + "MongoDB.Driver.Core": "[2.20.0, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.AspNet.WebApi.Client": "5.2.9", - "Microsoft.Extensions.Http": "6.0.0", - "Microsoft.Net.Http.Headers": "2.2.8", - "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0", - "System.Linq.Async": "6.0.1", - "fo-dicom": "5.0.3" + "Ardalis.GuardClauses": "[4.1.1, )", + "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", + "Microsoft.Extensions.Http": "[6.0.0, )", + "Microsoft.Net.Http.Headers": "[2.2.8, )", + "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", + "System.Linq.Async": "[6.0.1, )", + "fo-dicom": "[5.1.1, )" } } } diff --git a/src/Client/packages.lock.json b/src/Client/packages.lock.json index dafb40686..4cd704807 100644 --- a/src/Client/packages.lock.json +++ b/src/Client/packages.lock.json @@ -26,11 +26,8 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -45,41 +42,48 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -100,8 +104,8 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -182,19 +186,14 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -207,8 +206,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -1041,10 +1040,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1068,8 +1067,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1177,26 +1176,26 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } } } diff --git a/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj b/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj index d3215d280..5617763c0 100644 --- a/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj +++ b/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj b/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj index 160cb83b9..6621700a5 100644 --- a/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj +++ b/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj @@ -25,16 +25,16 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Common/Test/packages.lock.json b/src/Common/Test/packages.lock.json index b5fab6aab..1222d496c 100644 --- a/src/Common/Test/packages.lock.json +++ b/src/Common/Test/packages.lock.json @@ -4,18 +4,18 @@ "net6.0": { "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "Moq": { @@ -44,28 +44,25 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "Castle.Core": { "type": "Transitive", @@ -75,73 +72,96 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "dependencies": { + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { + "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, - "Microsoft.Bcl.AsyncInterfaces": { + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw==" + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + }, + "Microsoft.Extensions.Logging": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", - "Microsoft.Extensions.Primitives": "2.2.0", - "System.ComponentModel.Annotations": "4.5.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==", + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", "dependencies": { - "System.Memory": "4.5.1", - "System.Runtime.CompilerServices.Unsafe": "4.5.1" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -150,27 +170,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -239,8 +254,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -389,11 +404,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg==" - }, "System.Console": { "type": "Transitive", "resolved": "4.3.0", @@ -418,14 +428,10 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", + "resolved": "6.0.0", + "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Diagnostics.EventLog": { @@ -596,11 +602,6 @@ "System.Threading": "4.3.0" } }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "sDJYJpGtTgx+23Ayu5euxG5mAXWdkDb4+b0rD0Cab0M1oQS9H0HXGPriKcqpXuiJDTV7fTp/d+fMDJmnr6sNvA==" - }, "System.Net.Http": { "type": "Transitive", "resolved": "4.3.0", @@ -773,8 +774,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Runtime.Extensions": { "type": "Transitive", @@ -990,10 +991,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1009,13 +1010,20 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Text.RegularExpressions": { "type": "Transitive", @@ -1122,30 +1130,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1153,20 +1161,20 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } } } diff --git a/src/Common/packages.lock.json b/src/Common/packages.lock.json index b25f865a0..3f62f4970 100644 --- a/src/Common/packages.lock.json +++ b/src/Common/packages.lock.json @@ -4,27 +4,26 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Direct", - "requested": "[4.0.1, )", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "requested": "[4.1.1, )", + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "fo-dicom": { "type": "Direct", - "requested": "[5.0.3, )", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "requested": "[5.1.1, )", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -40,95 +39,111 @@ "resolved": "6.0.0", "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA==" }, - "JetBrains.Annotations": { + "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw==" + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, - "Microsoft.Extensions.Options": { + "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", - "Microsoft.Extensions.Primitives": "2.2.0", - "System.ComponentModel.Annotations": "4.5.0" + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0" } }, - "Microsoft.Extensions.Primitives": { + "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==", - "dependencies": { - "System.Memory": "4.5.1", - "System.Runtime.CompilerServices.Unsafe": "4.5.1" - } + "resolved": "6.0.0", + "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==" }, - "Microsoft.NETCore.Platforms": { + "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } }, - "Microsoft.Toolkit.HighPerformance": { + "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg==" - }, - "System.Memory": { + "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "sDJYJpGtTgx+23Ayu5euxG5mAXWdkDb4+b0rD0Cab0M1oQS9H0HXGPriKcqpXuiJDTV7fTp/d+fMDJmnr6sNvA==" + "resolved": "6.0.0", + "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Channels": { "type": "Transitive", diff --git a/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj b/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj index 97441027b..abdf0a4bf 100644 --- a/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj +++ b/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj @@ -27,9 +27,9 @@ - + - + diff --git a/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj b/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj index 1c2db96f1..84c904b68 100644 --- a/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj +++ b/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj @@ -30,15 +30,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Configuration/Test/packages.lock.json b/src/Configuration/Test/packages.lock.json index 6d012e0f0..252d73e8c 100644 --- a/src/Configuration/Test/packages.lock.json +++ b/src/Configuration/Test/packages.lock.json @@ -4,18 +4,18 @@ "net6.0": { "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "Moq": { @@ -38,28 +38,25 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -82,46 +79,53 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -142,8 +146,8 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -202,8 +206,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -224,8 +228,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -234,27 +238,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -267,8 +266,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -360,8 +359,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -1107,10 +1106,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1126,13 +1125,20 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Text.RegularExpressions": { "type": "Transitive", @@ -1239,30 +1245,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1270,40 +1276,40 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } diff --git a/src/Configuration/ValidationExtensions.cs b/src/Configuration/ValidationExtensions.cs index e136a7572..bcd76f378 100644 --- a/src/Configuration/ValidationExtensions.cs +++ b/src/Configuration/ValidationExtensions.cs @@ -30,7 +30,7 @@ public static class ValidationExtensions public static bool IsValid(this MonaiApplicationEntity monaiApplicationEntity, out IList validationErrors) { - Guard.Against.Null(monaiApplicationEntity); + Guard.Against.Null(monaiApplicationEntity, nameof(monaiApplicationEntity)); validationErrors = new List(); @@ -43,7 +43,7 @@ public static bool IsValid(this MonaiApplicationEntity monaiApplicationEntity, o public static bool IsValid(this DestinationApplicationEntity destinationApplicationEntity, out IList validationErrors) { - Guard.Against.Null(destinationApplicationEntity); + Guard.Against.Null(destinationApplicationEntity, nameof(destinationApplicationEntity)); validationErrors = new List(); @@ -58,7 +58,7 @@ public static bool IsValid(this DestinationApplicationEntity destinationApplicat public static bool IsValid(this SourceApplicationEntity sourceApplicationEntity, out IList validationErrors) { - Guard.Against.Null(sourceApplicationEntity); + Guard.Against.Null(sourceApplicationEntity, nameof(sourceApplicationEntity)); validationErrors = new List(); @@ -71,7 +71,7 @@ public static bool IsValid(this SourceApplicationEntity sourceApplicationEntity, public static bool IsValidDicomTag(string source, string grouping, IList validationErrors = null) { - Guard.Against.NullOrWhiteSpace(source); + Guard.Against.NullOrWhiteSpace(source, nameof(source)); try { @@ -93,7 +93,7 @@ public static bool IsValidDicomTag(string source, string grouping, IList public static bool IsAeTitleValid(string source, string aeTitle, IList validationErrors = null) { - Guard.Against.NullOrWhiteSpace(source); + Guard.Against.NullOrWhiteSpace(source, nameof(source)); if (!string.IsNullOrWhiteSpace(aeTitle) && aeTitle.Length <= 15 && @@ -121,7 +121,7 @@ public static bool IsValidHostNameIp(string source, string hostIp, IList public static bool IsPortValid(string source, int port, IList validationErrors = null) { - Guard.Against.NullOrWhiteSpace(source); + Guard.Against.NullOrWhiteSpace(source, nameof(source)); if (port > 0 && port <= 65535) return true; diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json index 955303f12..b030ed454 100644 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "Microsoft.Extensions.Logging.Abstractions": { "type": "Direct", - "requested": "[6.0.3, )", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "requested": "[6.0.4, )", + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Options": { "type": "Direct", @@ -20,9 +20,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.22, )", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "requested": "[0.1.23, )", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -56,11 +56,8 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -75,41 +72,48 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -130,8 +134,8 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -196,16 +200,6 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" - }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", "resolved": "0.2.16", @@ -245,21 +239,28 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Channels": { "type": "Transitive", @@ -275,19 +276,19 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } } } diff --git a/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj b/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj index f59211b03..aaeaf5e9c 100644 --- a/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj +++ b/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj @@ -36,8 +36,8 @@ - - + + diff --git a/src/Database/Api/Repositories/InferenceRequestRepositoryBase.cs b/src/Database/Api/Repositories/InferenceRequestRepositoryBase.cs index cd0c8e6d1..38c1639c3 100644 --- a/src/Database/Api/Repositories/InferenceRequestRepositoryBase.cs +++ b/src/Database/Api/Repositories/InferenceRequestRepositoryBase.cs @@ -39,13 +39,13 @@ protected InferenceRequestRepositoryBase( public virtual async Task ExistsAsync(string transactionId, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(transactionId); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); return await GetInferenceRequestAsync(transactionId, cancellationToken).ConfigureAwait(false) is not null; } public virtual async Task GetStatusAsync(string transactionId, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(transactionId); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); var response = new InferenceStatusResponse(); var item = await GetInferenceRequestAsync(transactionId, cancellationToken).ConfigureAwait(false); @@ -61,7 +61,7 @@ public virtual async Task ExistsAsync(string transactionId, CancellationTo public async Task UpdateAsync(InferenceRequest inferenceRequest, InferenceRequestStatus status, CancellationToken cancellationToken = default) { - Guard.Against.Null(inferenceRequest); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "TransactionId", inferenceRequest.TransactionId } }); diff --git a/src/Database/Api/Repositories/StorageMetadataRepositoryBase.cs b/src/Database/Api/Repositories/StorageMetadataRepositoryBase.cs index 722487010..99edd04cf 100644 --- a/src/Database/Api/Repositories/StorageMetadataRepositoryBase.cs +++ b/src/Database/Api/Repositories/StorageMetadataRepositoryBase.cs @@ -33,7 +33,7 @@ protected StorageMetadataRepositoryBase(ILogger logger) public async Task AddAsync(FileStorageMetadata metadata, CancellationToken cancellationToken = default) { - Guard.Against.Null(metadata); + Guard.Against.Null(metadata, nameof(metadata)); using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "CorrelationId", metadata.CorrelationId }, { "Identity", metadata.Id } }); var obj = new StorageMetadataWrapper(metadata); @@ -43,7 +43,7 @@ public async Task AddAsync(FileStorageMetadata metadata, CancellationToken cance public async Task AddOrUpdateAsync(FileStorageMetadata metadata, CancellationToken cancellationToken = default) { - Guard.Against.Null(metadata); + Guard.Against.Null(metadata, nameof(metadata)); var existing = await GetFileStorageMetdadataAsync(metadata.CorrelationId, metadata.Id, cancellationToken).ConfigureAwait(false); @@ -59,8 +59,8 @@ public async Task AddOrUpdateAsync(FileStorageMetadata metadata, CancellationTok public virtual async Task DeleteAsync(string correlationId, string identity, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(correlationId); - Guard.Against.NullOrWhiteSpace(identity); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); + Guard.Against.NullOrWhiteSpace(identity, nameof(identity)); using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "CorrelationId", correlationId }, { "Identity", identity } }); @@ -83,7 +83,7 @@ public virtual async Task DeleteAsync(string correlationId, string identit public virtual async Task UpdateAsync(FileStorageMetadata metadata, CancellationToken cancellationToken = default) { - Guard.Against.Null(metadata); + Guard.Against.Null(metadata, nameof(metadata)); using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "CorrelationId", metadata.CorrelationId }, { "Identity", metadata.Id } }); var obj = await FindByIds(metadata.Id, metadata.CorrelationId).ConfigureAwait(false); diff --git a/src/Database/Api/StorageMetadataWrapper.cs b/src/Database/Api/StorageMetadataWrapper.cs index 63976d023..4258e738f 100644 --- a/src/Database/Api/StorageMetadataWrapper.cs +++ b/src/Database/Api/StorageMetadataWrapper.cs @@ -47,7 +47,7 @@ private StorageMetadataWrapper() public StorageMetadataWrapper(FileStorageMetadata metadata) { - Guard.Against.Null(metadata); + Guard.Against.Null(metadata, nameof(metadata)); CorrelationId = metadata.CorrelationId; Identity = metadata.Id; @@ -56,7 +56,7 @@ public StorageMetadataWrapper(FileStorageMetadata metadata) public void Update(FileStorageMetadata metadata) { - Guard.Against.Null(metadata); + Guard.Against.Null(metadata, nameof(metadata)); IsUploaded = metadata.IsUploaded; Value = JsonSerializer.Serialize(metadata); // Must be here diff --git a/src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj b/src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj index 081dad728..dd39ee148 100644 --- a/src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj +++ b/src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj @@ -25,13 +25,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Database/Api/Test/packages.lock.json b/src/Database/Api/Test/packages.lock.json index 94e0f6020..1bd04ce2a 100644 --- a/src/Database/Api/Test/packages.lock.json +++ b/src/Database/Api/Test/packages.lock.json @@ -4,44 +4,41 @@ "net6.0": { "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -56,49 +53,56 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -108,13 +112,13 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", @@ -215,8 +219,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -237,8 +241,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -247,27 +251,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -280,8 +279,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -373,13 +372,13 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "Polly": { "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -1128,10 +1127,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1147,13 +1146,20 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Text.RegularExpressions": { "type": "Transitive", @@ -1260,30 +1266,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1291,40 +1297,40 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } @@ -1332,10 +1338,10 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Polly": "[7.2.4, )" } } } diff --git a/src/Database/Api/packages.lock.json b/src/Database/Api/packages.lock.json index c9d55d740..6474f54f4 100644 --- a/src/Database/Api/packages.lock.json +++ b/src/Database/Api/packages.lock.json @@ -4,12 +4,12 @@ "net6.0": { "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -19,17 +19,14 @@ }, "Polly": { "type": "Direct", - "requested": "[7.2.3, )", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "requested": "[7.2.4, )", + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -44,46 +41,53 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", @@ -184,8 +188,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -204,20 +208,10 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" - }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -294,21 +288,28 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Channels": { "type": "Transitive", @@ -324,29 +325,29 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } diff --git a/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj b/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj index c4a8d4f04..47da57919 100644 --- a/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj +++ b/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj @@ -42,12 +42,12 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Database/EntityFramework/Repositories/DestinationApplicationEntityRepository.cs b/src/Database/EntityFramework/Repositories/DestinationApplicationEntityRepository.cs index 182ccee0e..5209ece7b 100644 --- a/src/Database/EntityFramework/Repositories/DestinationApplicationEntityRepository.cs +++ b/src/Database/EntityFramework/Repositories/DestinationApplicationEntityRepository.cs @@ -43,8 +43,8 @@ public DestinationApplicationEntityRepository( ILogger logger, IOptions options) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -58,7 +58,7 @@ public DestinationApplicationEntityRepository( public async Task AddAsync(DestinationApplicationEntity item, CancellationToken cancellationToken = default) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); return await _retryPolicy.ExecuteAsync(async () => { @@ -79,7 +79,7 @@ public async Task ContainsAsync(Expression FindByNameAsync(string name, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(name); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); return await _retryPolicy.ExecuteAsync(async () => { @@ -89,7 +89,7 @@ public async Task ContainsAsync(Expression RemoveAsync(DestinationApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { @@ -109,7 +109,7 @@ public async Task> ToListAsync(CancellationTo public async Task UpdateAsync(DestinationApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/EntityFramework/Repositories/DicomAssociationInfoRepository.cs b/src/Database/EntityFramework/Repositories/DicomAssociationInfoRepository.cs index 814d5f577..d381e58fc 100644 --- a/src/Database/EntityFramework/Repositories/DicomAssociationInfoRepository.cs +++ b/src/Database/EntityFramework/Repositories/DicomAssociationInfoRepository.cs @@ -42,8 +42,8 @@ public DicomAssociationInfoRepository( ILogger logger, IOptions options) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -57,7 +57,7 @@ public DicomAssociationInfoRepository( public async Task AddAsync(DicomAssociationInfo item, CancellationToken cancellationToken = default) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/EntityFramework/Repositories/InferenceRequestRepository.cs b/src/Database/EntityFramework/Repositories/InferenceRequestRepository.cs index d3780c8aa..5ca49d64d 100644 --- a/src/Database/EntityFramework/Repositories/InferenceRequestRepository.cs +++ b/src/Database/EntityFramework/Repositories/InferenceRequestRepository.cs @@ -47,7 +47,7 @@ public InferenceRequestRepository( ILogger logger, IOptions options) : base(logger, options) { - Guard.Against.Null(serviceScopeFactory); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _options = options ?? throw new ArgumentNullException(nameof(options)); @@ -61,7 +61,7 @@ public InferenceRequestRepository( public override async Task AddAsync(InferenceRequest inferenceRequest, CancellationToken cancellationToken = default) { - Guard.Against.Null(inferenceRequest); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "TransactionId", inferenceRequest.TransactionId } }); await _retryPolicy.ExecuteAsync(async () => @@ -103,7 +103,7 @@ public override async Task TakeAsync(CancellationToken cancell public override async Task GetInferenceRequestAsync(string transactionId, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(transactionId); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); return await _retryPolicy.ExecuteAsync(async () => { @@ -113,7 +113,7 @@ public override async Task TakeAsync(CancellationToken cancell public override async Task GetInferenceRequestAsync(Guid inferenceRequestId, CancellationToken cancellationToken = default) { - Guard.Against.NullOrEmpty(inferenceRequestId); + Guard.Against.NullOrEmpty(inferenceRequestId, nameof(inferenceRequestId)); return await _retryPolicy.ExecuteAsync(async () => { @@ -123,7 +123,7 @@ public override async Task TakeAsync(CancellationToken cancell protected override async Task SaveAsync(InferenceRequest inferenceRequest, CancellationToken cancellationToken = default) { - Guard.Against.Null(inferenceRequest); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/EntityFramework/Repositories/MonaiApplicationEntityRepository.cs b/src/Database/EntityFramework/Repositories/MonaiApplicationEntityRepository.cs index 41148acbc..e84cb78ff 100644 --- a/src/Database/EntityFramework/Repositories/MonaiApplicationEntityRepository.cs +++ b/src/Database/EntityFramework/Repositories/MonaiApplicationEntityRepository.cs @@ -43,8 +43,8 @@ public MonaiApplicationEntityRepository( ILogger logger, IOptions options) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -58,7 +58,7 @@ public MonaiApplicationEntityRepository( public async Task AddAsync(MonaiApplicationEntity item, CancellationToken cancellationToken = default) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); return await _retryPolicy.ExecuteAsync(async () => { @@ -79,7 +79,7 @@ public async Task ContainsAsync(Expression FindByNameAsync(string name, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(name); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); return await _retryPolicy.ExecuteAsync(async () => { @@ -89,7 +89,7 @@ public async Task ContainsAsync(Expression RemoveAsync(MonaiApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { @@ -109,7 +109,7 @@ public async Task> ToListAsync(CancellationToken ca public async Task UpdateAsync(MonaiApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/EntityFramework/Repositories/PayloadRepository.cs b/src/Database/EntityFramework/Repositories/PayloadRepository.cs index e70590acc..441fe2544 100644 --- a/src/Database/EntityFramework/Repositories/PayloadRepository.cs +++ b/src/Database/EntityFramework/Repositories/PayloadRepository.cs @@ -42,8 +42,8 @@ public PayloadRepository( ILogger logger, IOptions options) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -57,7 +57,7 @@ public PayloadRepository( public async Task AddAsync(Payload item, CancellationToken cancellationToken = default) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); return await _retryPolicy.ExecuteAsync(async () => { @@ -69,7 +69,7 @@ public async Task AddAsync(Payload item, CancellationToken cancellation public async Task RemoveAsync(Payload entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { @@ -89,7 +89,7 @@ public async Task> ToListAsync(CancellationToken cancellationToken public async Task UpdateAsync(Payload entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/EntityFramework/Repositories/SourceApplicationEntityRepository.cs b/src/Database/EntityFramework/Repositories/SourceApplicationEntityRepository.cs index 9df43c899..d4abf081b 100644 --- a/src/Database/EntityFramework/Repositories/SourceApplicationEntityRepository.cs +++ b/src/Database/EntityFramework/Repositories/SourceApplicationEntityRepository.cs @@ -43,8 +43,8 @@ public SourceApplicationEntityRepository( ILogger logger, IOptions options) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -58,7 +58,7 @@ public SourceApplicationEntityRepository( public async Task AddAsync(SourceApplicationEntity item, CancellationToken cancellationToken = default) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); return await _retryPolicy.ExecuteAsync(async () => { @@ -79,7 +79,7 @@ public async Task ContainsAsync(Expression FindByNameAsync(string name, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(name); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); return await _retryPolicy.ExecuteAsync(async () => { @@ -89,7 +89,7 @@ public async Task ContainsAsync(Expression FindByAETAsync(string aeTitle, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(aeTitle); + Guard.Against.NullOrWhiteSpace(aeTitle, nameof(aeTitle)); return await _retryPolicy.ExecuteAsync(async () => { @@ -99,7 +99,7 @@ public async Task ContainsAsync(Expression RemoveAsync(SourceApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { @@ -119,7 +119,7 @@ public async Task> ToListAsync(CancellationToken c public async Task UpdateAsync(SourceApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/EntityFramework/Repositories/StorageMetadataWrapperRepository.cs b/src/Database/EntityFramework/Repositories/StorageMetadataWrapperRepository.cs index adb69a347..201730eca 100644 --- a/src/Database/EntityFramework/Repositories/StorageMetadataWrapperRepository.cs +++ b/src/Database/EntityFramework/Repositories/StorageMetadataWrapperRepository.cs @@ -45,8 +45,8 @@ public StorageMetadataWrapperRepository( ILogger logger, IOptions options) : base(logger) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -60,7 +60,7 @@ public StorageMetadataWrapperRepository( protected override async Task AddAsyncInternal(StorageMetadataWrapper metadata, CancellationToken cancellationToken = default) { - Guard.Against.Null(metadata); + Guard.Against.Null(metadata, nameof(metadata)); await _retryPolicy.ExecuteAsync(async () => { @@ -73,7 +73,7 @@ await _retryPolicy.ExecuteAsync(async () => protected override async Task UpdateInternal(StorageMetadataWrapper metadata, CancellationToken cancellationToken = default) { - Guard.Against.Null(metadata); + Guard.Against.Null(metadata, nameof(metadata)); await _retryPolicy.ExecuteAsync(async () => { @@ -95,7 +95,7 @@ await _retryPolicy.ExecuteAsync(async () => public override async Task> GetFileStorageMetdadataAsync(string correlationId, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(correlationId); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); return await _retryPolicy.ExecuteAsync(async () => { @@ -108,8 +108,8 @@ public override async Task> GetFileStorageMetdadataAs public override async Task GetFileStorageMetdadataAsync(string correlationId, string identity, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(correlationId); - Guard.Against.NullOrWhiteSpace(identity); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); + Guard.Against.NullOrWhiteSpace(identity, nameof(identity)); return await _retryPolicy.ExecuteAsync(async () => { @@ -122,7 +122,7 @@ public override async Task> GetFileStorageMetdadataAs protected override async Task DeleteInternalAsync(StorageMetadataWrapper metadata, CancellationToken cancellationToken = default) { - Guard.Against.Null(metadata); + Guard.Against.Null(metadata, nameof(metadata)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/EntityFramework/Test/Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test.csproj b/src/Database/EntityFramework/Test/Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test.csproj index 4e43d1d33..f7f684a7a 100644 --- a/src/Database/EntityFramework/Test/Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test.csproj +++ b/src/Database/EntityFramework/Test/Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test.csproj @@ -25,15 +25,15 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Database/EntityFramework/Test/packages.lock.json b/src/Database/EntityFramework/Test/packages.lock.json index f3cacb2ec..6bebbf09d 100644 --- a/src/Database/EntityFramework/Test/packages.lock.json +++ b/src/Database/EntityFramework/Test/packages.lock.json @@ -4,27 +4,27 @@ "net6.0": { "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.EntityFrameworkCore.InMemory": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "lRL5rTa6iM9SIubc75dTiQd2aYfURgEd7bz5tLA4T+++yOPFPVm9dCQ22ukGhnlJy6Xr9LAQEDOUrJmWDgByTw==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "Z3q/yJL3ODCb3zGKkNmsMDd6Az/oAN6aOPeI4le7kIX7TJBUoPvcWKuB52gPyLwYeMOTu4XVZull31DgGhXLNQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15" + "Microsoft.EntityFrameworkCore": "6.0.20" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "Moq": { @@ -38,28 +38,25 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -82,57 +79,64 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "yE5Q7jJDuGUwS3FMV6N6oz7p7MrtqPrdanLHG6dVXPB3o4KQKLpkPPzUQPByGmBis6wIDGmbWunwjD0vH/qlFQ==", + "resolved": "6.0.20", + "contentHash": "k+namWYTxTS9t/JYDyZoTzQK95iLDrQTBTuEZu/zfbl2sm8DQ8taNJ2HkBw8tXvW2pM8yyAQbJjcPYzx/BUBuw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -142,39 +146,39 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "ouk4es/CzwxjXl33mb2hJzitluc2CD9rujZVBaUy3w3fn8qMjlktMOhf5mIAS7e3sreBikOBwaxp9/y/N/O2NQ==", + "resolved": "6.0.20", + "contentHash": "TQX6xHu1puMviW+GSfLfDO1iGe3TE43D5+oyDEZ7xSXlrPnupxJoujjCNptZoEvUo4giEJQRvT9tlDKU1LhbQQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15", + "Microsoft.EntityFrameworkCore": "6.0.20", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "4oRXU58XmoDkK27wDMmIrZG9yaOYw8URmWNQzGkfO0ZCpELX/bx6rtb99eoBOOzA+a0QYoTLlugZB7MyM1XDbw==", + "resolved": "6.0.20", + "contentHash": "PT84DIPfxpdNOr8TuuEMP+2GRbUSHBugN34c05UExPFCPd3DaksEax1cZMC9qMCx29JBPCK8lAhnfFi1V18Yng==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.15", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.20", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "30gMAP29sWQ9yTSM/VXknmv8BcH9AVO+QHCpoDoAlzPnmL6STjJ5jihlOp1mvErGVTkEgnaIxmv4j3gX6knFRw==", + "resolved": "6.0.20", + "contentHash": "Demwm93dqVo0r9rFFrjZPNwnWjVFerp92IraGImsFGd8CH+zFhYaKa20Y1tPttDk3Bwj6CscIOWdAKB4Ei3tTQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.15", - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", + "Microsoft.Data.Sqlite.Core": "6.0.20", + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -328,8 +332,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -350,8 +354,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -360,27 +364,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -393,8 +392,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -486,13 +485,13 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "Polly": { "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -1281,10 +1280,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1308,8 +1307,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==", + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1420,30 +1419,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1451,40 +1450,40 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } @@ -1492,17 +1491,17 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Polly": "[7.2.4, )" } }, "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.20, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", diff --git a/src/Database/EntityFramework/packages.lock.json b/src/Database/EntityFramework/packages.lock.json index 83b19f909..242bb21a4 100644 --- a/src/Database/EntityFramework/packages.lock.json +++ b/src/Database/EntityFramework/packages.lock.json @@ -4,12 +4,12 @@ "net6.0": { "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -19,21 +19,21 @@ }, "Microsoft.EntityFrameworkCore.Design": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "fpK/x5BgGYxO0Uz1E8X/eiCZulsIvkWCPhFDaM54jiiRwlkWzE5mW+tzXpPWy7oY6rrd5JKXmvo2AqkRsNjKhQ==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "+rPqPMzfjM+f9jrT6jww1ixtxgQJ85TyPgEdZUEl5xbu5tKFwZgHngY0ESOJsUyE3+84xPDblwXnVvlw8oO4lw==", "dependencies": { "Humanizer.Core": "2.8.26", - "Microsoft.EntityFrameworkCore.Relational": "6.0.15" + "Microsoft.EntityFrameworkCore.Relational": "6.0.20" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "4oRXU58XmoDkK27wDMmIrZG9yaOYw8URmWNQzGkfO0ZCpELX/bx6rtb99eoBOOzA+a0QYoTLlugZB7MyM1XDbw==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "PT84DIPfxpdNOr8TuuEMP+2GRbUSHBugN34c05UExPFCPd3DaksEax1cZMC9qMCx29JBPCK8lAhnfFi1V18Yng==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.15", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.20", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, @@ -75,11 +75,8 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -94,19 +91,26 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -115,55 +119,55 @@ "resolved": "2.8.26", "contentHash": "OiKusGL20vby4uDEswj2IgkdchC1yQ6rwbIkZDVBPIR6al2b7n3pC91elBul9q33KaBgRKhbZH3+2Ur4fnWx2A==" }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "yE5Q7jJDuGUwS3FMV6N6oz7p7MrtqPrdanLHG6dVXPB3o4KQKLpkPPzUQPByGmBis6wIDGmbWunwjD0vH/qlFQ==", + "resolved": "6.0.20", + "contentHash": "k+namWYTxTS9t/JYDyZoTzQK95iLDrQTBTuEZu/zfbl2sm8DQ8taNJ2HkBw8tXvW2pM8yyAQbJjcPYzx/BUBuw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "ouk4es/CzwxjXl33mb2hJzitluc2CD9rujZVBaUy3w3fn8qMjlktMOhf5mIAS7e3sreBikOBwaxp9/y/N/O2NQ==", + "resolved": "6.0.20", + "contentHash": "TQX6xHu1puMviW+GSfLfDO1iGe3TE43D5+oyDEZ7xSXlrPnupxJoujjCNptZoEvUo4giEJQRvT9tlDKU1LhbQQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15", + "Microsoft.EntityFrameworkCore": "6.0.20", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "30gMAP29sWQ9yTSM/VXknmv8BcH9AVO+QHCpoDoAlzPnmL6STjJ5jihlOp1mvErGVTkEgnaIxmv4j3gX6knFRw==", + "resolved": "6.0.20", + "contentHash": "Demwm93dqVo0r9rFFrjZPNwnWjVFerp92IraGImsFGd8CH+zFhYaKa20Y1tPttDk3Bwj6CscIOWdAKB4Ei3tTQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.15", - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", + "Microsoft.Data.Sqlite.Core": "6.0.20", + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -284,8 +288,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -304,20 +308,10 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" - }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -358,8 +352,8 @@ }, "Polly": { "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -434,10 +428,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -450,8 +444,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==", + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -471,29 +465,29 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } @@ -501,10 +495,10 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Polly": "[7.2.4, )" } } } diff --git a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj index fc64c2873..8067ef6ce 100644 --- a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj +++ b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj @@ -68,11 +68,11 @@ - + - + diff --git a/src/Database/MongoDB/Integration.Test/Monai.Deploy.InformaticsGateway.Database.MongoDB.Integration.Test.csproj b/src/Database/MongoDB/Integration.Test/Monai.Deploy.InformaticsGateway.Database.MongoDB.Integration.Test.csproj index 305162131..b66f3136a 100644 --- a/src/Database/MongoDB/Integration.Test/Monai.Deploy.InformaticsGateway.Database.MongoDB.Integration.Test.csproj +++ b/src/Database/MongoDB/Integration.Test/Monai.Deploy.InformaticsGateway.Database.MongoDB.Integration.Test.csproj @@ -26,15 +26,15 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Database/MongoDB/Integration.Test/packages.lock.json b/src/Database/MongoDB/Integration.Test/packages.lock.json index 6232d5932..a5451c02c 100644 --- a/src/Database/MongoDB/Integration.Test/packages.lock.json +++ b/src/Database/MongoDB/Integration.Test/packages.lock.json @@ -4,27 +4,27 @@ "net6.0": { "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "FluentAssertions": { "type": "Direct", - "requested": "[6.10.0, )", - "resolved": "6.10.0", - "contentHash": "Da3YsiRDnOHKBfxutjnupL1rOX0K/jnG6crn5AgwukeqZ/yi+HNCOFshic01ke0ztZFWzpfQMXH8fO9aAbG0Gw==", + "requested": "[6.11.0, )", + "resolved": "6.11.0", + "contentHash": "aBaagwdNtVKkug1F3imGXUlmoBd8ZUZX8oQ5niThaJhF79SpESe1Gzq7OFuZkQdKD5Pa4Mone+jrbas873AT4g==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "Moq": { @@ -38,28 +38,25 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -82,6 +79,11 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", @@ -92,47 +94,49 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -142,13 +146,13 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", @@ -249,8 +253,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -281,27 +285,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -323,8 +322,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -360,33 +359,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==", + "resolved": "2.20.0", + "contentHash": "IXgb+uGslHBgy+JjfwepO06Vmq5itprTPJJtQotAhLMjmuDvbA7pfAs/2hTfqYbR39l7eli5bIwA3zqZHUkVlQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==", + "resolved": "2.20.0", + "contentHash": "pAxVtrIRTTuQG3xMBF3NfWumXqf/JT0i7eEzp06k4zin8zj1sroX0J/i/qzJ9JjHQMh3BSsQ4E209G5S6zkxrg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Driver.Core": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.20.0", + "MongoDB.Driver.Core": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==", + "resolved": "2.20.0", + "contentHash": "YIRUQnl/aHjZbvwoVHhlUi5ofoZs/6HRllpxZrSseB52IJPmhYclppApAUb/TETIx7mPxcoZgHVVQKnwYQQCVg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -395,8 +394,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "NETStandard.Library": { "type": "Transitive", @@ -456,13 +455,13 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "Polly": { "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -1253,10 +1252,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1272,13 +1271,20 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Text.RegularExpressions": { "type": "Transitive", @@ -1385,30 +1391,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1416,11 +1422,11 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "ZstdSharp.Port": { @@ -1432,29 +1438,29 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } @@ -1462,18 +1468,18 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Polly": "[7.2.4, )" } }, "monai.deploy.informaticsgateway.database.mongodb": { "type": "Project", "dependencies": { "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "MongoDB.Driver": "[2.19.1, )", - "MongoDB.Driver.Core": "[2.19.1, )" + "MongoDB.Driver": "[2.20.0, )", + "MongoDB.Driver.Core": "[2.20.0, )" } } } diff --git a/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj b/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj index 73a94a27f..8c4308ebf 100644 --- a/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj +++ b/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj @@ -42,8 +42,8 @@ - - + + diff --git a/src/Database/MongoDB/Repositories/DestinationApplicationEntityRepository.cs b/src/Database/MongoDB/Repositories/DestinationApplicationEntityRepository.cs index 0807986b6..4e10ef186 100644 --- a/src/Database/MongoDB/Repositories/DestinationApplicationEntityRepository.cs +++ b/src/Database/MongoDB/Repositories/DestinationApplicationEntityRepository.cs @@ -45,9 +45,9 @@ public DestinationApplicationEntityRepository( IOptions options, IOptions mongoDbOptions) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); - Guard.Against.Null(mongoDbOptions); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); + Guard.Against.Null(mongoDbOptions, nameof(mongoDbOptions)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -88,7 +88,7 @@ public async Task> ToListAsync(CancellationTo public async Task FindByNameAsync(string name, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(name); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); return await _retryPolicy.ExecuteAsync(async () => { @@ -100,7 +100,7 @@ public async Task> ToListAsync(CancellationTo public async Task AddAsync(DestinationApplicationEntity item, CancellationToken cancellationToken = default) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); return await _retryPolicy.ExecuteAsync(async () => { @@ -111,7 +111,7 @@ public async Task AddAsync(DestinationApplicationE public async Task UpdateAsync(DestinationApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { @@ -126,7 +126,7 @@ public async Task UpdateAsync(DestinationApplicati public async Task RemoveAsync(DestinationApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/MongoDB/Repositories/DicomAssociationInfoRepository.cs b/src/Database/MongoDB/Repositories/DicomAssociationInfoRepository.cs index 3ce0b7061..350bf1d47 100644 --- a/src/Database/MongoDB/Repositories/DicomAssociationInfoRepository.cs +++ b/src/Database/MongoDB/Repositories/DicomAssociationInfoRepository.cs @@ -43,9 +43,9 @@ public DicomAssociationInfoRepository( IOptions options, IOptions mongoDbOptions) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); - Guard.Against.Null(mongoDbOptions); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); + Guard.Against.Null(mongoDbOptions, nameof(mongoDbOptions)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -61,7 +61,7 @@ public DicomAssociationInfoRepository( public async Task AddAsync(DicomAssociationInfo item, CancellationToken cancellationToken = default) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/MongoDB/Repositories/InferenceRequestRepository.cs b/src/Database/MongoDB/Repositories/InferenceRequestRepository.cs index d064eb93b..1686ec48d 100644 --- a/src/Database/MongoDB/Repositories/InferenceRequestRepository.cs +++ b/src/Database/MongoDB/Repositories/InferenceRequestRepository.cs @@ -49,7 +49,7 @@ public InferenceRequestRepository( IOptions options, IOptions mongoDbOptions) : base(logger, options) { - Guard.Against.Null(serviceScopeFactory); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _options = options ?? throw new ArgumentNullException(nameof(options)); @@ -79,7 +79,7 @@ private void CreateIndexes() public override async Task AddAsync(InferenceRequest inferenceRequest, CancellationToken cancellationToken = default) { - Guard.Against.Null(inferenceRequest); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "TransactionId", inferenceRequest.TransactionId } }); await _retryPolicy.ExecuteAsync(async () => @@ -123,7 +123,7 @@ public override async Task TakeAsync(CancellationToken cancell public override async Task GetInferenceRequestAsync(string transactionId, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(transactionId); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); return await _retryPolicy.ExecuteAsync(async () => { @@ -135,7 +135,7 @@ public override async Task TakeAsync(CancellationToken cancell public override async Task GetInferenceRequestAsync(Guid inferenceRequestId, CancellationToken cancellationToken = default) { - Guard.Against.NullOrEmpty(inferenceRequestId); + Guard.Against.NullOrEmpty(inferenceRequestId, nameof(inferenceRequestId)); return await _retryPolicy.ExecuteAsync(async () => { @@ -147,7 +147,7 @@ public override async Task TakeAsync(CancellationToken cancell protected override async Task SaveAsync(InferenceRequest inferenceRequest, CancellationToken cancellationToken = default) { - Guard.Against.Null(inferenceRequest); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/MongoDB/Repositories/MonaiApplicationEntityRepository.cs b/src/Database/MongoDB/Repositories/MonaiApplicationEntityRepository.cs index f160457a1..c4e67cb20 100644 --- a/src/Database/MongoDB/Repositories/MonaiApplicationEntityRepository.cs +++ b/src/Database/MongoDB/Repositories/MonaiApplicationEntityRepository.cs @@ -45,9 +45,9 @@ public MonaiApplicationEntityRepository( IOptions options, IOptions mongoDbOptions) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); - Guard.Against.Null(mongoDbOptions); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); + Guard.Against.Null(mongoDbOptions, nameof(mongoDbOptions)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -81,7 +81,7 @@ public async Task> ToListAsync(CancellationToken ca public async Task FindByNameAsync(string name, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(name); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); return await _retryPolicy.ExecuteAsync(async () => { @@ -93,7 +93,7 @@ public async Task> ToListAsync(CancellationToken ca public async Task AddAsync(MonaiApplicationEntity item, CancellationToken cancellationToken = default) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); return await _retryPolicy.ExecuteAsync(async () => { @@ -104,7 +104,7 @@ public async Task AddAsync(MonaiApplicationEntity item, public async Task UpdateAsync(MonaiApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { @@ -119,7 +119,7 @@ public async Task UpdateAsync(MonaiApplicationEntity ent public async Task RemoveAsync(MonaiApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/MongoDB/Repositories/PayloadRepository.cs b/src/Database/MongoDB/Repositories/PayloadRepository.cs index 6a3f50dbf..f48714e8a 100644 --- a/src/Database/MongoDB/Repositories/PayloadRepository.cs +++ b/src/Database/MongoDB/Repositories/PayloadRepository.cs @@ -45,9 +45,9 @@ public PayloadRepository( IOptions options, IOptions mongoDbOptions) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); - Guard.Against.Null(mongoDbOptions); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); + Guard.Against.Null(mongoDbOptions, nameof(mongoDbOptions)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -73,7 +73,7 @@ private void CreateIndexes() public async Task AddAsync(Payload item, CancellationToken cancellationToken = default) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); return await _retryPolicy.ExecuteAsync(async () => { @@ -84,7 +84,7 @@ public async Task AddAsync(Payload item, CancellationToken cancellation public async Task RemoveAsync(Payload entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { @@ -107,7 +107,7 @@ public async Task> ToListAsync(CancellationToken cancellationToken public async Task UpdateAsync(Payload entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/MongoDB/Repositories/SourceApplicationEntityRepository.cs b/src/Database/MongoDB/Repositories/SourceApplicationEntityRepository.cs index 11cedd1db..997378042 100644 --- a/src/Database/MongoDB/Repositories/SourceApplicationEntityRepository.cs +++ b/src/Database/MongoDB/Repositories/SourceApplicationEntityRepository.cs @@ -45,9 +45,9 @@ public SourceApplicationEntityRepository( IOptions options, IOptions mongoDbOptions) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); - Guard.Against.Null(mongoDbOptions); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); + Guard.Against.Null(mongoDbOptions, nameof(mongoDbOptions)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -87,7 +87,7 @@ public async Task> ToListAsync(CancellationToken c public async Task FindByNameAsync(string name, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(name); + Guard.Against.NullOrWhiteSpace(name, nameof(name)); return await _retryPolicy.ExecuteAsync(async () => { @@ -109,7 +109,7 @@ public async Task> ToListAsync(CancellationToken c public async Task AddAsync(SourceApplicationEntity item, CancellationToken cancellationToken = default) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); return await _retryPolicy.ExecuteAsync(async () => { @@ -120,7 +120,7 @@ public async Task AddAsync(SourceApplicationEntity item public async Task UpdateAsync(SourceApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { @@ -135,7 +135,7 @@ public async Task UpdateAsync(SourceApplicationEntity e public async Task RemoveAsync(SourceApplicationEntity entity, CancellationToken cancellationToken = default) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); return await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/MongoDB/Repositories/StorageMetadataWrapperRepository.cs b/src/Database/MongoDB/Repositories/StorageMetadataWrapperRepository.cs index 25d51a47f..da1a97a66 100644 --- a/src/Database/MongoDB/Repositories/StorageMetadataWrapperRepository.cs +++ b/src/Database/MongoDB/Repositories/StorageMetadataWrapperRepository.cs @@ -47,9 +47,9 @@ public StorageMetadataWrapperRepository( IOptions options, IOptions mongoDbOptions) : base(logger) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(options); - Guard.Against.Null(mongoDbOptions); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(options, nameof(options)); + Guard.Against.Null(mongoDbOptions, nameof(mongoDbOptions)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -75,7 +75,7 @@ private void CreateIndexes() protected override async Task DeleteInternalAsync(StorageMetadataWrapper toBeDeleted, CancellationToken cancellationToken) { - Guard.Against.Null(toBeDeleted); + Guard.Against.Null(toBeDeleted, nameof(toBeDeleted)); return await _retryPolicy.ExecuteAsync(async () => { @@ -94,7 +94,7 @@ await _retryPolicy.ExecuteAsync(async () => public override async Task> GetFileStorageMetdadataAsync(string correlationId, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(correlationId); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); return await _retryPolicy.ExecuteAsync(async () => { @@ -107,7 +107,7 @@ public override async Task> GetFileStorageMetdadataAs public override async Task GetFileStorageMetdadataAsync(string correlationId, string identity, CancellationToken cancellationToken = default) { - Guard.Against.NullOrWhiteSpace(correlationId); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); return await _retryPolicy.ExecuteAsync(async () => { @@ -120,7 +120,7 @@ public override async Task> GetFileStorageMetdadataAs protected override async Task UpdateInternal(StorageMetadataWrapper metadata, CancellationToken cancellationToken = default) { - Guard.Against.Null(metadata); + Guard.Against.Null(metadata, nameof(metadata)); await _retryPolicy.ExecuteAsync(async () => { @@ -145,7 +145,7 @@ await _collection.ReplaceOneAsync( protected override async Task AddAsyncInternal(StorageMetadataWrapper metadata, CancellationToken cancellationToken = default) { - Guard.Against.Null(metadata); + Guard.Against.Null(metadata, nameof(metadata)); await _retryPolicy.ExecuteAsync(async () => { diff --git a/src/Database/MongoDB/packages.lock.json b/src/Database/MongoDB/packages.lock.json index 4971a9653..9ea1e8c41 100644 --- a/src/Database/MongoDB/packages.lock.json +++ b/src/Database/MongoDB/packages.lock.json @@ -4,27 +4,27 @@ "net6.0": { "MongoDB.Driver": { "type": "Direct", - "requested": "[2.19.1, )", - "resolved": "2.19.1", - "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==", + "requested": "[2.20.0, )", + "resolved": "2.20.0", + "contentHash": "pAxVtrIRTTuQG3xMBF3NfWumXqf/JT0i7eEzp06k4zin8zj1sroX0J/i/qzJ9JjHQMh3BSsQ4E209G5S6zkxrg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Driver.Core": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.20.0", + "MongoDB.Driver.Core": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Direct", - "requested": "[2.19.1, )", - "resolved": "2.19.1", - "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==", + "requested": "[2.20.0, )", + "resolved": "2.20.0", + "contentHash": "YIRUQnl/aHjZbvwoVHhlUi5ofoZs/6HRllpxZrSseB52IJPmhYclppApAUb/TETIx7mPxcoZgHVVQKnwYQQCVg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -33,11 +33,8 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -52,6 +49,11 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", @@ -62,42 +64,44 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -107,13 +111,13 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", @@ -214,8 +218,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -239,11 +243,6 @@ "resolved": "5.0.0", "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -255,8 +254,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -292,16 +291,16 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==", + "resolved": "2.20.0", + "contentHash": "IXgb+uGslHBgy+JjfwepO06Vmq5itprTPJJtQotAhLMjmuDvbA7pfAs/2hTfqYbR39l7eli5bIwA3zqZHUkVlQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -310,8 +309,8 @@ }, "Polly": { "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "SharpCompress": { "type": "Transitive", @@ -375,21 +374,28 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Channels": { "type": "Transitive", @@ -410,29 +416,29 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } @@ -440,10 +446,10 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Polly": "[7.2.4, )" } } } diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json index ceeec7977..9994d6858 100644 --- a/src/Database/packages.lock.json +++ b/src/Database/packages.lock.json @@ -14,12 +14,12 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -65,13 +65,13 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "jIWboFkp6O/G3wF6JwQq8A5AR5TcZbCRzXdBhaYgVAGiWexb95/2JkytGFrJJ44pBiWO76jpOT4vShGLAgf1HQ==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "WV5KDOKX0OmqzxZ6yA5DpcJY05ARD0TtJo47+cjSpptII8rO/KhDDQuW9RXxneTx0oVKcc50EOJhZZdEKk+M0A==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15" + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -89,11 +89,8 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -108,6 +105,11 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", @@ -118,78 +120,80 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", "contentHash": "AkNshs6dopj8FXsmkkJxvLivN2SyDJQDbjcds5lo9+Y6L4zpcoXdmzXQ3VVN+AIWQr0CTD5A7vkuHGAr2aypZg==" }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "yE5Q7jJDuGUwS3FMV6N6oz7p7MrtqPrdanLHG6dVXPB3o4KQKLpkPPzUQPByGmBis6wIDGmbWunwjD0vH/qlFQ==", + "resolved": "6.0.20", + "contentHash": "k+namWYTxTS9t/JYDyZoTzQK95iLDrQTBTuEZu/zfbl2sm8DQ8taNJ2HkBw8tXvW2pM8yyAQbJjcPYzx/BUBuw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "ouk4es/CzwxjXl33mb2hJzitluc2CD9rujZVBaUy3w3fn8qMjlktMOhf5mIAS7e3sreBikOBwaxp9/y/N/O2NQ==", + "resolved": "6.0.20", + "contentHash": "TQX6xHu1puMviW+GSfLfDO1iGe3TE43D5+oyDEZ7xSXlrPnupxJoujjCNptZoEvUo4giEJQRvT9tlDKU1LhbQQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15", + "Microsoft.EntityFrameworkCore": "6.0.20", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "4oRXU58XmoDkK27wDMmIrZG9yaOYw8URmWNQzGkfO0ZCpELX/bx6rtb99eoBOOzA+a0QYoTLlugZB7MyM1XDbw==", + "resolved": "6.0.20", + "contentHash": "PT84DIPfxpdNOr8TuuEMP+2GRbUSHBugN34c05UExPFCPd3DaksEax1cZMC9qMCx29JBPCK8lAhnfFi1V18Yng==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.15", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.20", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "30gMAP29sWQ9yTSM/VXknmv8BcH9AVO+QHCpoDoAlzPnmL6STjJ5jihlOp1mvErGVTkEgnaIxmv4j3gX6knFRw==", + "resolved": "6.0.20", + "contentHash": "Demwm93dqVo0r9rFFrjZPNwnWjVFerp92IraGImsFGd8CH+zFhYaKa20Y1tPttDk3Bwj6CscIOWdAKB4Ei3tTQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.15", - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", + "Microsoft.Data.Sqlite.Core": "6.0.20", + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -257,19 +261,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.20", + "contentHash": "/uw/4EXx+tOWiqTVNbO0ooaFrrp06h68hI7XhOKyHRp7rdUi7SNmIsj0CCNE6PyZanfnQDwhNyaxG25u2HWpjg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.20", + "contentHash": "qWT4ldcOylWZa+GXFePyAJSQ9d/gWzKIL2KdFCkudZpzMjeTUPpqMhIwZdJNvCupi/ercnUT3Ru1RI/rWwX8aA==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -318,8 +322,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -343,11 +347,6 @@ "resolved": "5.0.0", "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -359,8 +358,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -396,33 +395,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==", + "resolved": "2.20.0", + "contentHash": "IXgb+uGslHBgy+JjfwepO06Vmq5itprTPJJtQotAhLMjmuDvbA7pfAs/2hTfqYbR39l7eli5bIwA3zqZHUkVlQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==", + "resolved": "2.20.0", + "contentHash": "pAxVtrIRTTuQG3xMBF3NfWumXqf/JT0i7eEzp06k4zin8zj1sroX0J/i/qzJ9JjHQMh3BSsQ4E209G5S6zkxrg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Driver.Core": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.20.0", + "MongoDB.Driver.Core": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==", + "resolved": "2.20.0", + "contentHash": "YIRUQnl/aHjZbvwoVHhlUi5ofoZs/6HRllpxZrSseB52IJPmhYclppApAUb/TETIx7mPxcoZgHVVQKnwYQQCVg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -431,8 +430,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -441,8 +440,8 @@ }, "Polly": { "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "SharpCompress": { "type": "Transitive", @@ -541,10 +540,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -557,8 +556,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==", + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -583,29 +582,29 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } @@ -613,17 +612,17 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Polly": "[7.2.4, )" } }, "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.20, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", @@ -636,8 +635,8 @@ "type": "Project", "dependencies": { "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "MongoDB.Driver": "[2.19.1, )", - "MongoDB.Driver.Core": "[2.19.1, )" + "MongoDB.Driver": "[2.20.0, )", + "MongoDB.Driver.Core": "[2.20.0, )" } } } diff --git a/src/DicomWebClient/CLI/Monai.Deploy.InformaticsGateway.DicomWeb.Client.CLI.csproj b/src/DicomWebClient/CLI/Monai.Deploy.InformaticsGateway.DicomWeb.Client.CLI.csproj index ef693bdf8..0bf63ca38 100644 --- a/src/DicomWebClient/CLI/Monai.Deploy.InformaticsGateway.DicomWeb.Client.CLI.csproj +++ b/src/DicomWebClient/CLI/Monai.Deploy.InformaticsGateway.DicomWeb.Client.CLI.csproj @@ -40,7 +40,7 @@ - + diff --git a/src/DicomWebClient/CLI/Qido.cs b/src/DicomWebClient/CLI/Qido.cs index f02b6a461..2748e39a6 100644 --- a/src/DicomWebClient/CLI/Qido.cs +++ b/src/DicomWebClient/CLI/Qido.cs @@ -87,8 +87,8 @@ private Dictionary ParseQueryString(string query) private async Task SaveJson(string outputDir, IAsyncEnumerable enumerable) { - Guard.Against.NullOrWhiteSpace(outputDir); - Guard.Against.Null(enumerable); + Guard.Against.NullOrWhiteSpace(outputDir, nameof(outputDir)); + Guard.Against.Null(enumerable, nameof(enumerable)); await foreach (var item in enumerable) { @@ -98,7 +98,7 @@ private async Task SaveJson(string outputDir, IAsyncEnumerable enumerabl private void ValidateOutputDirectory(ref string outputDir) { - Guard.Against.NullOrWhiteSpace(outputDir); + Guard.Against.NullOrWhiteSpace(outputDir, nameof(outputDir)); if (outputDir == ".") { @@ -112,7 +112,7 @@ private void ValidateOutputDirectory(ref string outputDir) private void ValidateOptions(string rootUrl, out Uri rootUri) { - Guard.Against.NullOrWhiteSpace(rootUrl); + Guard.Against.NullOrWhiteSpace(rootUrl, nameof(rootUri)); _logger.LogInformation("Checking arguments..."); rootUri = new Uri(rootUrl); diff --git a/src/DicomWebClient/CLI/Stow.cs b/src/DicomWebClient/CLI/Stow.cs index fa673121b..460b5d9e7 100644 --- a/src/DicomWebClient/CLI/Stow.cs +++ b/src/DicomWebClient/CLI/Stow.cs @@ -132,7 +132,7 @@ private void AddValidFiles(List dicomFiles, params string[] files) private void ValidateOptions(string rootUrl, out Uri rootUri) { - Guard.Against.NullOrWhiteSpace(rootUrl); + Guard.Against.NullOrWhiteSpace(rootUrl, nameof(rootUrl)); _logger.LogInformation("Checking arguments..."); rootUri = new Uri(rootUrl); diff --git a/src/DicomWebClient/CLI/Utils.cs b/src/DicomWebClient/CLI/Utils.cs index 583903e30..a44315fa3 100644 --- a/src/DicomWebClient/CLI/Utils.cs +++ b/src/DicomWebClient/CLI/Utils.cs @@ -31,8 +31,8 @@ internal static class Utils { public static void CheckAndConfirmOverwriteOutputFilename(ILogger logger, string filename) { - Guard.Against.Null(logger); - Guard.Against.NullOrWhiteSpace(filename); + Guard.Against.Null(logger, nameof(logger)); + Guard.Against.NullOrWhiteSpace(filename, nameof(filename)); if (File.Exists(filename)) { @@ -52,8 +52,8 @@ public static void CheckAndConfirmOverwriteOutputFilename(ILogger logger, public static void CheckAndConfirmOverwriteOutput(ILogger logger, string outputDir) { - Guard.Against.Null(logger); - Guard.Against.NullOrWhiteSpace(outputDir); + Guard.Against.Null(logger, nameof(logger)); + Guard.Against.NullOrWhiteSpace(outputDir, nameof(outputDir)); if (Directory.Exists(outputDir)) { @@ -78,8 +78,8 @@ public static void CheckAndConfirmOverwriteOutput(ILogger logger, string o public static AuthenticationHeaderValue GenerateFromUsernamePassword(string username, string password) { - Guard.Against.NullOrWhiteSpace(username); - Guard.Against.NullOrWhiteSpace(password); + Guard.Against.NullOrWhiteSpace(username, nameof(username)); + Guard.Against.NullOrWhiteSpace(username, nameof(username)); var authToken = Encoding.ASCII.GetBytes($"{username}:{password}"); return new AuthenticationHeaderValue("Basic", Convert.ToBase64String(authToken)); @@ -93,9 +93,9 @@ public static async Task SaveFiles(ILogger logger, string outputDirectory, public static async Task SaveFiles(ILogger logger, DicomFile dicomFile, string filename) { - Guard.Against.Null(logger); - Guard.Against.Null(dicomFile); - Guard.Against.NullOrWhiteSpace(filename); + Guard.Against.Null(logger, nameof(logger)); + Guard.Against.Null(dicomFile, nameof(dicomFile)); + Guard.Against.NullOrWhiteSpace(filename, nameof(filename)); logger.LogInformation($"Saving {filename}..."); await dicomFile.SaveAsync(filename).ConfigureAwait(false); @@ -103,9 +103,9 @@ public static async Task SaveFiles(ILogger logger, DicomFile dicomFile, st internal static async Task SaveJson(ILogger logger, string outputDir, string item, DicomTag filenameSourceTag) { - Guard.Against.Null(logger); - Guard.Against.NullOrWhiteSpace(outputDir); - Guard.Against.NullOrWhiteSpace(item); + Guard.Against.Null(logger, nameof(logger)); + Guard.Against.NullOrWhiteSpace(outputDir, nameof(outputDir)); + Guard.Against.NullOrWhiteSpace(item, nameof(item)); var token = JToken.Parse(item); var value = GetTagValueFromJson(token, filenameSourceTag); @@ -125,9 +125,9 @@ internal static async Task SaveJson(ILogger logger, string outputDir, string ite internal static async Task SaveJson(ILogger logger, string outputFilename, string text) { - Guard.Against.Null(logger); - Guard.Against.NullOrWhiteSpace(outputFilename); - Guard.Against.NullOrWhiteSpace(text); + Guard.Against.Null(logger, nameof(logger)); + Guard.Against.NullOrWhiteSpace(outputFilename, nameof(outputFilename)); + Guard.Against.NullOrWhiteSpace(text, nameof(text)); var token = JToken.Parse(text); logger.LogInformation($"Saving JSON {outputFilename}..."); @@ -136,8 +136,8 @@ internal static async Task SaveJson(ILogger logger, string outputFilename, strin private static string GetTagValueFromJson(JToken token, DicomTag dicomTag, string defaultValue = "unknown") { - Guard.Against.Null(token); - Guard.Against.Null(dicomTag); + Guard.Against.Null(token, nameof(token)); + Guard.Against.Null(dicomTag, nameof(dicomTag)); var tag = $"{dicomTag.Group:X4}{dicomTag.Element:X4}"; diff --git a/src/DicomWebClient/CLI/Wado.cs b/src/DicomWebClient/CLI/Wado.cs index c2e343d99..fa209dde2 100644 --- a/src/DicomWebClient/CLI/Wado.cs +++ b/src/DicomWebClient/CLI/Wado.cs @@ -176,8 +176,8 @@ public async Task Bulk( private async Task SaveJson(string outputDir, IAsyncEnumerable enumerable) { - Guard.Against.NullOrWhiteSpace(outputDir); - Guard.Against.Null(enumerable); + Guard.Against.NullOrWhiteSpace(outputDir, nameof(outputDir)); + Guard.Against.Null(enumerable, nameof(enumerable)); await foreach (var item in enumerable) { @@ -187,8 +187,8 @@ private async Task SaveJson(string outputDir, IAsyncEnumerable enumerabl private async Task SaveFiles(string outputDir, IAsyncEnumerable enumerable) { - Guard.Against.NullOrWhiteSpace(outputDir); - Guard.Against.Null(enumerable); + Guard.Against.NullOrWhiteSpace(outputDir, nameof(outputDir)); + Guard.Against.Null(enumerable, nameof(enumerable)); var count = 0; await foreach (var file in enumerable) @@ -201,7 +201,7 @@ private async Task SaveFiles(string outputDir, IAsyncEnumerable enume private void ValidateOutputFilename(ref string filename) { - Guard.Against.NullOrWhiteSpace(filename); + Guard.Against.NullOrWhiteSpace(filename, nameof(filename)); try { @@ -216,7 +216,7 @@ private void ValidateOutputFilename(ref string filename) private void ValidateOutputDirectory(ref string outputDir) { - Guard.Against.NullOrWhiteSpace(outputDir); + Guard.Against.NullOrWhiteSpace(outputDir, nameof(outputDir)); if (outputDir == ".") { @@ -230,8 +230,8 @@ private void ValidateOutputDirectory(ref string outputDir) private void ValidateOptions(string rootUrl, string transferSyntaxes, out Uri rootUri, out List dicomTransferSyntaxes) { - Guard.Against.NullOrWhiteSpace(rootUrl); - Guard.Against.NullOrWhiteSpace(transferSyntaxes); + Guard.Against.NullOrWhiteSpace(rootUrl, nameof(rootUrl)); + Guard.Against.NullOrWhiteSpace(transferSyntaxes, nameof(transferSyntaxes)); _logger.LogInformation("Checking arguments..."); rootUri = new Uri(rootUrl); diff --git a/src/DicomWebClient/CLI/packages.lock.json b/src/DicomWebClient/CLI/packages.lock.json index dcd37d8e5..ff158518a 100644 --- a/src/DicomWebClient/CLI/packages.lock.json +++ b/src/DicomWebClient/CLI/packages.lock.json @@ -14,18 +14,20 @@ }, "fo-dicom": { "type": "Direct", - "requested": "[5.0.3, )", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "requested": "[5.1.1, )", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "dependencies": { + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -43,16 +45,13 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, - "JetBrains.Annotations": { + "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, "Microsoft.AspNet.WebApi.Client": { "type": "Transitive", @@ -68,6 +67,11 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, "Microsoft.CSharp": { "type": "Transitive", "resolved": "4.3.0", @@ -171,8 +175,8 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -365,19 +369,14 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1327,10 +1326,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1354,8 +1353,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1474,20 +1473,20 @@ "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", "Microsoft.Extensions.Http": "[6.0.0, )", "Microsoft.Net.Http.Headers": "[2.2.8, )", "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", "System.Linq.Async": "[6.0.1, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } } } diff --git a/src/DicomWebClient/Common/HttpResponseMessageExtension.cs b/src/DicomWebClient/Common/HttpResponseMessageExtension.cs index 016f2a5ec..a4e729527 100644 --- a/src/DicomWebClient/Common/HttpResponseMessageExtension.cs +++ b/src/DicomWebClient/Common/HttpResponseMessageExtension.cs @@ -31,7 +31,7 @@ internal static class HttpMessageExtension { public static void AddRange(this HttpRequestMessage request, Tuple byteRange = null) { - Guard.Against.Null(request); + Guard.Against.Null(request, nameof(request)); if (byteRange is null) { request.Headers.Add(HeaderNames.Range, "byte=0-"); @@ -45,7 +45,7 @@ public static void AddRange(this HttpRequestMessage request, Tuple by public static async IAsyncEnumerable ToDicomAsyncEnumerable(this HttpResponseMessage response) { - Guard.Against.Null(response); + Guard.Against.Null(response, nameof(response)); Guard.Against.Null(response.Content, nameof(response.Content)); await foreach (var buffer in DecodeMultipartMessage(response)) { @@ -58,7 +58,7 @@ public static async IAsyncEnumerable ToDicomAsyncEnumerable(this Http public static async Task ToBinaryData(this HttpResponseMessage response) { - Guard.Against.Null(response); + Guard.Against.Null(response, nameof(response)); using (var memoryStream = new MemoryStream()) { await foreach (var buffer in DecodeMultipartMessage(response)) @@ -71,7 +71,7 @@ public static async Task ToBinaryData(this HttpResponseMessage response) private static async IAsyncEnumerable DecodeMultipartMessage(HttpResponseMessage response) { - Guard.Against.Null(response); + Guard.Against.Null(response, nameof(response)); var contentType = response.Content.Headers.ContentType; if (contentType.MediaType != MimeMappings.MultiPartRelated) { diff --git a/src/DicomWebClient/DicomWebClient.cs b/src/DicomWebClient/DicomWebClient.cs index ddb89a968..d86ccfd22 100644 --- a/src/DicomWebClient/DicomWebClient.cs +++ b/src/DicomWebClient/DicomWebClient.cs @@ -49,7 +49,7 @@ public class DicomWebClient : IDicomWebClient /// Optional logger for capturing client logs. public DicomWebClient(HttpClient httpClient, ILogger logger) { - Guard.Against.Null(httpClient); + Guard.Against.Null(httpClient, nameof(httpClient)); _httpClient = httpClient; _logger = logger; @@ -83,7 +83,7 @@ public void ConfigureServiceUris(Uri uriRoot) public void ConfigureServicePrefix(DicomWebServiceType serviceType, string urlPrefix) #pragma warning restore CA1054 { - Guard.Against.NullOrWhiteSpace(urlPrefix); + Guard.Against.NullOrWhiteSpace(urlPrefix, nameof(urlPrefix)); switch (serviceType) { @@ -113,7 +113,7 @@ public void ConfigureServicePrefix(DicomWebServiceType serviceType, string urlPr /// public void ConfigureAuthentication(AuthenticationHeaderValue value) { - Guard.Against.Null(value); + Guard.Against.Null(value, nameof(value)); _httpClient.DefaultRequestHeaders.Authorization = value; } diff --git a/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj b/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj index 8aeb062df..094b56a91 100644 --- a/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj +++ b/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj @@ -48,8 +48,8 @@ - - + + diff --git a/src/DicomWebClient/Services/QidoService.cs b/src/DicomWebClient/Services/QidoService.cs index 8d2e3dc98..73d3c248c 100644 --- a/src/DicomWebClient/Services/QidoService.cs +++ b/src/DicomWebClient/Services/QidoService.cs @@ -71,7 +71,7 @@ public async IAsyncEnumerable SearchForStudies(IReadOnlyDictionary queries, bool fuzzyMatching, int limit, int offset) { - Guard.Against.Null(queries); + Guard.Against.Null(queries, nameof(queries)); if (fuzzyMatching) { queries.Add("fuzzymatching=true"); @@ -90,7 +90,7 @@ private void AppendQueryOptions(List queries, bool fuzzyMatching, int li private void AppendAdditionalFields(List queries, IReadOnlyList fieldsToInclude) { - Guard.Against.Null(queries); + Guard.Against.Null(queries, nameof(queries)); if (fieldsToInclude is null || fieldsToInclude.Count == 0) { @@ -105,7 +105,7 @@ private void AppendAdditionalFields(List queries, IReadOnlyList private void AppendQueryParameters(List queries, IReadOnlyDictionary queryParameters) { - Guard.Against.Null(queries); + Guard.Against.Null(queries, nameof(queries)); if (queryParameters is null || queryParameters.Count == 0) { diff --git a/src/DicomWebClient/Services/ServiceBase.cs b/src/DicomWebClient/Services/ServiceBase.cs index 6425c559e..cbe1f2154 100644 --- a/src/DicomWebClient/Services/ServiceBase.cs +++ b/src/DicomWebClient/Services/ServiceBase.cs @@ -44,7 +44,7 @@ protected ServiceBase(HttpClient httpClient, ILogger logger = null) public bool TryConfigureServiceUriPrefix(string uriPrefix) { - Guard.Against.NullOrWhiteSpace(uriPrefix); + Guard.Against.NullOrWhiteSpace(uriPrefix, nameof(uriPrefix)); if (HttpClient.BaseAddress is null) { diff --git a/src/DicomWebClient/Services/StowService.cs b/src/DicomWebClient/Services/StowService.cs index c64986a75..44e44dbef 100644 --- a/src/DicomWebClient/Services/StowService.cs +++ b/src/DicomWebClient/Services/StowService.cs @@ -45,7 +45,7 @@ public StowService(HttpClient httpClient, ILogger logger = null) /// public async Task> Store(string studyInstanceUid, IEnumerable dicomFiles, CancellationToken cancellationToken = default) { - Guard.Against.NullOrEmpty(dicomFiles); + Guard.Against.NullOrEmpty(dicomFiles, nameof(dicomFiles)); var postUri = GetStudiesUri(studyInstanceUid); diff --git a/src/DicomWebClient/Services/WadoService.cs b/src/DicomWebClient/Services/WadoService.cs index 67250e67a..175a36f52 100644 --- a/src/DicomWebClient/Services/WadoService.cs +++ b/src/DicomWebClient/Services/WadoService.cs @@ -41,7 +41,7 @@ public async IAsyncEnumerable Retrieve( string studyInstanceUid, params DicomTransferSyntax[] transferSyntaxes) { - Guard.Against.NullOrWhiteSpace(studyInstanceUid); + Guard.Against.NullOrWhiteSpace(studyInstanceUid, nameof(studyInstanceUid)); DicomValidation.ValidateUI(studyInstanceUid); var studyUri = GetStudiesUri(studyInstanceUid); @@ -66,9 +66,9 @@ public async IAsyncEnumerable Retrieve( string seriesInstanceUid, params DicomTransferSyntax[] transferSyntaxes) { - Guard.Against.NullOrWhiteSpace(studyInstanceUid); + Guard.Against.NullOrWhiteSpace(studyInstanceUid, nameof(studyInstanceUid)); DicomValidation.ValidateUI(studyInstanceUid); - Guard.Against.NullOrWhiteSpace(seriesInstanceUid); + Guard.Against.NullOrWhiteSpace(seriesInstanceUid, nameof(seriesInstanceUid)); DicomValidation.ValidateUI(seriesInstanceUid); var seriesUri = GetSeriesUri(studyInstanceUid, seriesInstanceUid); @@ -94,11 +94,11 @@ public async Task Retrieve( string sopInstanceUid, params DicomTransferSyntax[] transferSyntaxes) { - Guard.Against.NullOrWhiteSpace(studyInstanceUid); + Guard.Against.NullOrWhiteSpace(studyInstanceUid, nameof(studyInstanceUid)); DicomValidation.ValidateUI(studyInstanceUid); - Guard.Against.NullOrWhiteSpace(seriesInstanceUid); + Guard.Against.NullOrWhiteSpace(seriesInstanceUid, nameof(seriesInstanceUid)); DicomValidation.ValidateUI(seriesInstanceUid); - Guard.Against.NullOrWhiteSpace(sopInstanceUid); + Guard.Against.NullOrWhiteSpace(sopInstanceUid, nameof(sopInstanceUid)); DicomValidation.ValidateUI(sopInstanceUid); var instanceUri = GetInstanceUri(studyInstanceUid, seriesInstanceUid, sopInstanceUid); @@ -153,11 +153,11 @@ public async Task Retrieve( Tuple byteRange = null, params DicomTransferSyntax[] transferSyntaxes) { - Guard.Against.NullOrWhiteSpace(studyInstanceUid); + Guard.Against.NullOrWhiteSpace(studyInstanceUid, nameof(studyInstanceUid)); DicomValidation.ValidateUI(studyInstanceUid); - Guard.Against.NullOrWhiteSpace(seriesInstanceUid); + Guard.Against.NullOrWhiteSpace(seriesInstanceUid, nameof(seriesInstanceUid)); DicomValidation.ValidateUI(seriesInstanceUid); - Guard.Against.NullOrWhiteSpace(sopInstanceUid); + Guard.Against.NullOrWhiteSpace(sopInstanceUid, nameof(sopInstanceUid)); DicomValidation.ValidateUI(sopInstanceUid); return await Retrieve(new Uri($"{RequestServicePrefix}studies/{studyInstanceUid}/series/{seriesInstanceUid}/instances/{sopInstanceUid}/bulk/{dicomTag.Group:X4}{dicomTag.Element:X4}", UriKind.Relative), byteRange, transferSyntaxes); @@ -175,7 +175,7 @@ public async Task Retrieve( Tuple byteRange = null, params DicomTransferSyntax[] transferSyntaxes) { - Guard.Against.Null(bulkdataUri); + Guard.Against.Null(bulkdataUri, nameof(bulkdataUri)); if (bulkdataUri.IsAbsoluteUri) { @@ -200,7 +200,7 @@ public async Task Retrieve( public async IAsyncEnumerable RetrieveMetadata( string studyInstanceUid) { - Guard.Against.NullOrWhiteSpace(studyInstanceUid); + Guard.Against.NullOrWhiteSpace(studyInstanceUid, nameof(studyInstanceUid)); DicomValidation.ValidateUI(studyInstanceUid); var studyUri = GetStudiesUri(studyInstanceUid); var studyMetadataUri = new Uri($"{studyUri}metadata", UriKind.Relative); @@ -217,9 +217,9 @@ public async IAsyncEnumerable RetrieveMetadata( string studyInstanceUid, string seriesInstanceUid) { - Guard.Against.NullOrWhiteSpace(studyInstanceUid); + Guard.Against.NullOrWhiteSpace(studyInstanceUid, nameof(studyInstanceUid)); DicomValidation.ValidateUI(studyInstanceUid); - Guard.Against.NullOrWhiteSpace(seriesInstanceUid); + Guard.Against.NullOrWhiteSpace(seriesInstanceUid, nameof(seriesInstanceUid)); DicomValidation.ValidateUI(seriesInstanceUid); var seriesUri = GetSeriesUri(studyInstanceUid, seriesInstanceUid); @@ -237,11 +237,11 @@ public async Task RetrieveMetadata( string seriesInstanceUid, string sopInstanceUid) { - Guard.Against.NullOrWhiteSpace(studyInstanceUid); + Guard.Against.NullOrWhiteSpace(studyInstanceUid, nameof(studyInstanceUid)); DicomValidation.ValidateUI(studyInstanceUid); - Guard.Against.NullOrWhiteSpace(seriesInstanceUid); + Guard.Against.NullOrWhiteSpace(seriesInstanceUid, nameof(seriesInstanceUid)); DicomValidation.ValidateUI(seriesInstanceUid); - Guard.Against.NullOrWhiteSpace(sopInstanceUid); + Guard.Against.NullOrWhiteSpace(sopInstanceUid, nameof(sopInstanceUid)); DicomValidation.ValidateUI(sopInstanceUid); var instanceUri = GetInstanceUri(studyInstanceUid, seriesInstanceUid, sopInstanceUid); diff --git a/src/DicomWebClient/Test/Monai.Deploy.InformaticsGateway.DicomWeb.Client.Test.csproj b/src/DicomWebClient/Test/Monai.Deploy.InformaticsGateway.DicomWeb.Client.Test.csproj index 192edecc2..c017fb8c4 100644 --- a/src/DicomWebClient/Test/Monai.Deploy.InformaticsGateway.DicomWeb.Client.Test.csproj +++ b/src/DicomWebClient/Test/Monai.Deploy.InformaticsGateway.DicomWeb.Client.Test.csproj @@ -26,15 +26,15 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/DicomWebClient/Test/packages.lock.json b/src/DicomWebClient/Test/packages.lock.json index 098074af8..a350cefc5 100644 --- a/src/DicomWebClient/Test/packages.lock.json +++ b/src/DicomWebClient/Test/packages.lock.json @@ -4,27 +4,24 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Direct", - "requested": "[4.0.1, )", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "requested": "[4.1.1, )", + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "Moq": { @@ -47,20 +44,20 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Castle.Core": { "type": "Transitive", @@ -70,27 +67,29 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Microsoft.AspNet.WebApi.Client": { "type": "Transitive", "resolved": "5.2.9", @@ -105,15 +104,20 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -180,8 +184,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -190,27 +194,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -288,8 +287,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -1033,10 +1032,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1060,8 +1059,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1167,30 +1166,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1198,30 +1197,30 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", "Microsoft.Extensions.Http": "[6.0.0, )", "Microsoft.Net.Http.Headers": "[2.2.8, )", "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", "System.Linq.Async": "[6.0.1, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } } } diff --git a/src/DicomWebClient/packages.lock.json b/src/DicomWebClient/packages.lock.json index de6c58765..4ed38c716 100644 --- a/src/DicomWebClient/packages.lock.json +++ b/src/DicomWebClient/packages.lock.json @@ -4,27 +4,26 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Direct", - "requested": "[4.0.1, )", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "requested": "[4.1.1, )", + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "fo-dicom": { "type": "Direct", - "requested": "[5.0.3, )", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "requested": "[5.1.1, )", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "dependencies": { + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -69,16 +68,21 @@ "Microsoft.Bcl.AsyncInterfaces": "6.0.0" } }, - "JetBrains.Annotations": { + "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, "Microsoft.CSharp": { "type": "Transitive", "resolved": "4.3.0", @@ -104,8 +108,8 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -152,19 +156,14 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1101,10 +1100,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1128,8 +1127,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1248,8 +1247,8 @@ "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } } } diff --git a/src/InformaticsGateway/Common/DicomExtensions.cs b/src/InformaticsGateway/Common/DicomExtensions.cs index 958faaadc..bd9eddb66 100644 --- a/src/InformaticsGateway/Common/DicomExtensions.cs +++ b/src/InformaticsGateway/Common/DicomExtensions.cs @@ -54,7 +54,7 @@ public static DicomTransferSyntax[] ToDicomTransferSyntaxArray(this IEnumerable< public static string ToJson(this DicomFile dicomFile, DicomJsonOptions dicomJsonOptions, bool validateDicom) { - Guard.Against.Null(dicomFile); + Guard.Against.Null(dicomFile, nameof(dicomFile)); var options = new JsonSerializerOptions(); options.Converters.Add(new DicomJsonConverter( diff --git a/src/InformaticsGateway/Common/DicomToolkit.cs b/src/InformaticsGateway/Common/DicomToolkit.cs index d78455a73..6f861731b 100644 --- a/src/InformaticsGateway/Common/DicomToolkit.cs +++ b/src/InformaticsGateway/Common/DicomToolkit.cs @@ -19,6 +19,7 @@ using System.Threading.Tasks; using Ardalis.GuardClauses; using FellowOakDicom; +using SharpCompress.Compressors.Xz; namespace Monai.Deploy.InformaticsGateway.Common { @@ -26,14 +27,14 @@ public class DicomToolkit : IDicomToolkit { public Task OpenAsync(Stream stream, FileReadOption fileReadOption = FileReadOption.Default) { - Guard.Against.Null(stream); + Guard.Against.Null(stream, nameof(stream)); return DicomFile.OpenAsync(stream, fileReadOption); } public DicomFile Load(byte[] fileContent) { - Guard.Against.NullOrEmpty(fileContent); + Guard.Against.NullOrEmpty(fileContent, nameof(fileContent)); using var stream = new MemoryStream(fileContent); var dicomFile = DicomFile.Open(stream, FileReadOption.ReadAll); @@ -47,7 +48,7 @@ public DicomFile Load(byte[] fileContent) public StudySerieSopUids GetStudySeriesSopInstanceUids(DicomFile dicomFile) { - Guard.Against.Null(dicomFile); + Guard.Against.Null(dicomFile, nameof(dicomFile)); return new StudySerieSopUids { diff --git a/src/InformaticsGateway/Common/FileStorageMetadataExtensions.cs b/src/InformaticsGateway/Common/FileStorageMetadataExtensions.cs index 7e7abc489..c610680fe 100644 --- a/src/InformaticsGateway/Common/FileStorageMetadataExtensions.cs +++ b/src/InformaticsGateway/Common/FileStorageMetadataExtensions.cs @@ -19,6 +19,7 @@ using System.Threading.Tasks; using Ardalis.GuardClauses; using FellowOakDicom; +using FellowOakDicom.Serialization; using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Configuration; @@ -34,14 +35,14 @@ public static async Task SetDataStreams( IFileSystem fileSystem = null, string temporaryStoragePath = "") { - Guard.Against.Null(dicomFile); - Guard.Against.Null(dicomJson); // allow empty here + Guard.Against.Null(dicomFile, nameof(dicomFile)); + Guard.Against.Null(dicomJson, nameof(dicomJson)); // allow empty here switch (storageLocation) { case TemporaryDataStorageLocation.Disk: - Guard.Against.Null(fileSystem); - Guard.Against.NullOrWhiteSpace(temporaryStoragePath); + Guard.Against.Null(fileSystem, nameof(fileSystem)); + Guard.Against.NullOrWhiteSpace(temporaryStoragePath, nameof(temporaryStoragePath)); var tempFile = fileSystem.Path.Combine(temporaryStoragePath, $@"{fileSystem.Path.GetRandomFileName()}"); dicomFileStorageMetadata.File.Data = fileSystem.File.Create(tempFile); @@ -81,13 +82,13 @@ private static async Task SetTextStream( IFileSystem fileSystem = null, string temporaryStoragePath = "") { - Guard.Against.Null(message); // allow empty here + Guard.Against.Null(message, nameof(message)); // allow empty here switch (storageLocation) { case TemporaryDataStorageLocation.Disk: - Guard.Against.Null(fileSystem); - Guard.Against.NullOrWhiteSpace(temporaryStoragePath); + Guard.Against.Null(fileSystem, nameof(fileSystem)); + Guard.Against.NullOrWhiteSpace(temporaryStoragePath, nameof(temporaryStoragePath)); var tempFile = fileSystem.Path.Combine(temporaryStoragePath, $@"{fileSystem.Path.GetRandomFileName()}"); var stream = fileSystem.File.Create(tempFile); diff --git a/src/InformaticsGateway/Logging/FoDicomLogManager.cs b/src/InformaticsGateway/Logging/FoDicomLogManager.cs deleted file mode 100644 index 4a5fea845..000000000 --- a/src/InformaticsGateway/Logging/FoDicomLogManager.cs +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2022 MONAI Consortium - * Copyright 2019-2021 NVIDIA Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using Ardalis.GuardClauses; -using FellowOakDicom.Log; -using Microsoft.Extensions.Logging; - -namespace Monai.Deploy.InformaticsGateway.Logging -{ - public class FoDicomLogManager : LogManager - { - private readonly ILoggerFactory _loggerFactory; - - public FoDicomLogManager(ILoggerFactory loggerFactory) - { - _loggerFactory = loggerFactory ?? throw new System.ArgumentNullException(nameof(loggerFactory)); - } - - protected override Logger GetLoggerImpl(string name) - { - Guard.Against.NullOrWhiteSpace(name); - - return new MicrosoftLoggerAdapter(_loggerFactory.CreateLogger(name)); - } - } -} diff --git a/src/InformaticsGateway/Logging/LoggingExtensions.cs b/src/InformaticsGateway/Logging/LoggingExtensions.cs deleted file mode 100644 index ca48bc359..000000000 --- a/src/InformaticsGateway/Logging/LoggingExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2022 MONAI Consortium - * Copyright 2019-2021 NVIDIA Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -namespace Monai.Deploy.InformaticsGateway.Logging -{ - public static class LoggingExtensions - { - public static Microsoft.Extensions.Logging.LogLevel ToMicrosoftExtensionsLogLevel(this FellowOakDicom.Log.LogLevel dicomLogLevel) - { - return dicomLogLevel switch - { - FellowOakDicom.Log.LogLevel.Error => Microsoft.Extensions.Logging.LogLevel.Error, - FellowOakDicom.Log.LogLevel.Fatal => Microsoft.Extensions.Logging.LogLevel.Critical, - FellowOakDicom.Log.LogLevel.Info => Microsoft.Extensions.Logging.LogLevel.Information, - FellowOakDicom.Log.LogLevel.Warning => Microsoft.Extensions.Logging.LogLevel.Warning, - _ => Microsoft.Extensions.Logging.LogLevel.Debug - }; - } - } -} diff --git a/src/InformaticsGateway/Logging/MicrosoftLoggerAdapter.cs b/src/InformaticsGateway/Logging/MicrosoftLoggerAdapter.cs deleted file mode 100644 index 886bca461..000000000 --- a/src/InformaticsGateway/Logging/MicrosoftLoggerAdapter.cs +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2021-2022 MONAI Consortium - * Copyright 2019-2021 NVIDIA Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using System; -using Ardalis.GuardClauses; -using FellowOakDicom.Log; -using Microsoft.Extensions.Logging; - -namespace Monai.Deploy.InformaticsGateway.Logging -{ - /// - /// Implementation of for Microsoft.Extensions.Logging. - /// - public class MicrosoftLoggerAdapter : Logger - { - private readonly Microsoft.Extensions.Logging.ILogger _logger; - - public MicrosoftLoggerAdapter(Microsoft.Extensions.Logging.ILogger logger) => _logger = logger ?? throw new ArgumentNullException(nameof(logger)); - - public override void Log(FellowOakDicom.Log.LogLevel level, string msg, params object[] args) - { - Guard.Against.NullOrWhiteSpace(msg); - - _logger.Log(level.ToMicrosoftExtensionsLogLevel(), msg, args); - } - } -} diff --git a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj index 86c02d30c..546588921 100644 --- a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj +++ b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj @@ -35,27 +35,26 @@ - + - - + - + - - + + - + - - - + + + diff --git a/src/InformaticsGateway/Program.cs b/src/InformaticsGateway/Program.cs index 3c3e04ee4..5cdfb97f6 100644 --- a/src/InformaticsGateway/Program.cs +++ b/src/InformaticsGateway/Program.cs @@ -18,7 +18,6 @@ using System.IO; using System.IO.Abstractions; using System.Reflection; -using FellowOakDicom.Log; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -122,7 +121,6 @@ internal static IHostBuilder CreateHostBuilder(string[] args) => services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); @@ -177,7 +175,6 @@ private static NLog.Logger ConfigureNLog(string assemblyVersionNumber) LayoutRenderer.Register("servicename", logEvent => typeof(Program).Namespace); LayoutRenderer.Register("serviceversion", logEvent => assemblyVersionNumber); LayoutRenderer.Register("machinename", logEvent => Environment.MachineName); - return LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger(); } } diff --git a/src/InformaticsGateway/Repositories/MonaiServiceLocator.cs b/src/InformaticsGateway/Repositories/MonaiServiceLocator.cs index e94c9eeea..8e42fa2d7 100644 --- a/src/InformaticsGateway/Repositories/MonaiServiceLocator.cs +++ b/src/InformaticsGateway/Repositories/MonaiServiceLocator.cs @@ -49,7 +49,7 @@ public Dictionary GetServiceStatus() private IMonaiService GetService(Type type) { - Guard.Against.Null(type); + Guard.Against.Null(type, nameof(type)); return _serviceProvider.GetService(type) as IMonaiService; } diff --git a/src/InformaticsGateway/Services/Common/ITcpListener.cs b/src/InformaticsGateway/Services/Common/ITcpListener.cs index 83fac6edb..d3e37bda3 100644 --- a/src/InformaticsGateway/Services/Common/ITcpListener.cs +++ b/src/InformaticsGateway/Services/Common/ITcpListener.cs @@ -36,7 +36,7 @@ internal class TcpListener : ITcpListener public TcpListener(IPAddress ipAddress, int port) { - Guard.Against.Null(ipAddress); + Guard.Against.Null(ipAddress, nameof(ipAddress)); _tcpListener = new System.Net.Sockets.TcpListener(ipAddress, port); } diff --git a/src/InformaticsGateway/Services/Connectors/DataRetrievalService.cs b/src/InformaticsGateway/Services/Connectors/DataRetrievalService.cs index c664e9aeb..744baf7eb 100644 --- a/src/InformaticsGateway/Services/Connectors/DataRetrievalService.cs +++ b/src/InformaticsGateway/Services/Connectors/DataRetrievalService.cs @@ -154,7 +154,7 @@ private async Task BackgroundProcessing(CancellationToken cancellationToken) private async Task ProcessRequest(InferenceRequest inferenceRequest, CancellationToken cancellationToken) { - Guard.Against.Null(inferenceRequest); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); var retrievedFiles = new Dictionary(StringComparer.OrdinalIgnoreCase); await RestoreExistingInstances(inferenceRequest, retrievedFiles, cancellationToken).ConfigureAwait(false); @@ -185,7 +185,7 @@ private async Task ProcessRequest(InferenceRequest inferenceRequest, Cancellatio private async Task NotifyNewInstance(InferenceRequest inferenceRequest, Dictionary retrievedFiles) { - Guard.Against.Null(inferenceRequest); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); if (retrievedFiles.IsNullOrEmpty()) { @@ -208,8 +208,8 @@ private async Task NotifyNewInstance(InferenceRequest inferenceRequest, Dictiona private async Task RestoreExistingInstances(InferenceRequest inferenceRequest, Dictionary retrievedInstances, CancellationToken cancellationToken) { - Guard.Against.Null(inferenceRequest); - Guard.Against.Null(retrievedInstances); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); + Guard.Against.Null(retrievedInstances, nameof(retrievedInstances)); using var scope = _serviceScopeFactory.CreateScope(); @@ -239,8 +239,8 @@ private async Task RestoreExistingInstances(InferenceRequest inferenceRequest, D private async Task RetrieveViaFhir(InferenceRequest inferenceRequest, RequestInputDataResource source, Dictionary retrievedResources, CancellationToken cancellationToken) { - Guard.Against.Null(inferenceRequest); - Guard.Against.Null(retrievedResources); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); + Guard.Against.Null(retrievedResources, nameof(retrievedResources)); foreach (var input in inferenceRequest.InputMetadata.Inputs) { @@ -258,10 +258,10 @@ private async Task RetrieveViaFhir(InferenceRequest inferenceRequest, RequestInp private async Task RetrieveFhirResources(string transactionId, InferenceRequestDetails requestDetails, RequestInputDataResource source, Dictionary retrievedResources, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(transactionId); - Guard.Against.Null(requestDetails); - Guard.Against.Null(source); - Guard.Against.Null(retrievedResources); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); + Guard.Against.Null(requestDetails, nameof(requestDetails)); + Guard.Against.Null(source, nameof(source)); + Guard.Against.Null(retrievedResources, nameof(retrievedResources)); var pendingResources = new Queue(requestDetails.Resources.Where(p => !p.IsRetrieved)); @@ -307,12 +307,12 @@ private async Task RetrieveFhirResources(string transactionId, InferenceRequestD private async Task RetrieveFhirResource(string transactionId, HttpClient httpClient, FhirResource resource, RequestInputDataResource source, Dictionary retrievedResources, FhirStorageFormat fhirFormat, string acceptHeader, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(transactionId); - Guard.Against.Null(httpClient); - Guard.Against.Null(resource); - Guard.Against.Null(source); - Guard.Against.Null(retrievedResources); - Guard.Against.NullOrWhiteSpace(acceptHeader); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); + Guard.Against.Null(httpClient, nameof(httpClient)); + Guard.Against.Null(resource, nameof(resource)); + Guard.Against.Null(source, nameof(source)); + Guard.Against.Null(retrievedResources, nameof(retrievedResources)); + Guard.Against.NullOrWhiteSpace(acceptHeader, nameof(acceptHeader)); var id = $"{resource.Type}/{resource.Id}"; if (retrievedResources.ContainsKey(id)) @@ -358,8 +358,8 @@ private async Task RetrieveFhirResource(string transactionId, HttpClient h private async Task RetrieveViaDicomWeb(InferenceRequest inferenceRequest, RequestInputDataResource source, Dictionary retrievedInstance, CancellationToken cancellationToken) { - Guard.Against.Null(inferenceRequest); - Guard.Against.Null(retrievedInstance); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); + Guard.Against.Null(retrievedInstance, nameof(retrievedInstance)); var authenticationHeaderValue = AuthenticationHeaderValueExtensions.ConvertFrom(source.ConnectionDetails.AuthType, source.ConnectionDetails.AuthId); @@ -405,12 +405,12 @@ private async Task RetrieveViaDicomWeb(InferenceRequest inferenceRequest, Reques private async Task QueryStudies(string transactionId, DicomWebClient dicomWebClient, InferenceRequest inferenceRequest, Dictionary retrievedInstance, string dicomTag, string queryValue, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(transactionId); - Guard.Against.Null(dicomWebClient); - Guard.Against.Null(inferenceRequest); - Guard.Against.Null(retrievedInstance); - Guard.Against.NullOrWhiteSpace(dicomTag); - Guard.Against.NullOrWhiteSpace(queryValue); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); + Guard.Against.Null(dicomWebClient, nameof(dicomWebClient)); + Guard.Against.Null(inferenceRequest, nameof(inferenceRequest)); + Guard.Against.Null(retrievedInstance, nameof(retrievedInstance)); + Guard.Against.NullOrWhiteSpace(dicomTag, nameof(dicomTag)); + Guard.Against.NullOrWhiteSpace(queryValue, nameof(queryValue)); _logger.PerformQido(dicomTag, queryValue); var queryParams = new Dictionary(StringComparer.OrdinalIgnoreCase) @@ -448,9 +448,9 @@ private async Task QueryStudies(string transactionId, DicomWebClient dicomWebCli private async Task RetrieveStudies(string transactionId, IDicomWebClient dicomWebClient, IList studies, Dictionary retrievedInstance, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(transactionId); - Guard.Against.Null(studies); - Guard.Against.Null(retrievedInstance); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); + Guard.Against.Null(studies, nameof(studies)); + Guard.Against.Null(retrievedInstance, nameof(retrievedInstance)); foreach (var study in studies) { @@ -473,9 +473,9 @@ private async Task RetrieveStudies(string transactionId, IDicomWebClient dicomWe private async Task RetrieveSeries(string transactionId, IDicomWebClient dicomWebClient, RequestedStudy study, Dictionary retrievedInstance, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(transactionId); - Guard.Against.Null(study); - Guard.Against.Null(retrievedInstance); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); + Guard.Against.Null(study, nameof(study)); + Guard.Against.Null(retrievedInstance, nameof(retrievedInstance)); foreach (var series in study.Series) { @@ -498,10 +498,10 @@ private async Task RetrieveSeries(string transactionId, IDicomWebClient dicomWeb private async Task RetrieveInstances(string transactionId, IDicomWebClient dicomWebClient, string studyInstanceUid, RequestedSeries series, Dictionary retrievedInstance, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(transactionId); - Guard.Against.NullOrWhiteSpace(studyInstanceUid); - Guard.Against.Null(series); - Guard.Against.Null(retrievedInstance); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); + Guard.Against.NullOrWhiteSpace(studyInstanceUid, nameof(studyInstanceUid)); + Guard.Against.Null(series, nameof(series)); + Guard.Against.Null(retrievedInstance, nameof(retrievedInstance)); var count = retrievedInstance.Count; foreach (var instance in series.Instances) @@ -533,9 +533,9 @@ private async Task RetrieveInstances(string transactionId, IDicomWebClient dicom private async Task SaveFiles(string transactionId, IAsyncEnumerable files, Dictionary retrievedInstance, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(transactionId); - Guard.Against.Null(files); - Guard.Against.Null(retrievedInstance); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); + Guard.Against.Null(files, nameof(files)); + Guard.Against.Null(retrievedInstance, nameof(retrievedInstance)); var count = retrievedInstance.Count; await foreach (var file in files) @@ -561,8 +561,8 @@ private async Task SaveFiles(string transactionId, IAsyncEnumerable f private static DicomFileStorageMetadata SaveFile(string transactionId, DicomFile file, StudySerieSopUids uids) { - Guard.Against.Null(transactionId); - Guard.Against.Null(file); + Guard.Against.Null(transactionId, nameof(transactionId)); + Guard.Against.Null(file, nameof(file)); return new DicomFileStorageMetadata(transactionId, uids.Identifier, uids.StudyInstanceUid, uids.SeriesInstanceUid, uids.SopInstanceUid) { diff --git a/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs b/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs index 83bf3973e..0e7aed93c 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs @@ -97,7 +97,7 @@ private async Task RemovePendingPayloads() /// Number of seconds the bucket shall wait before sending the payload to be processed. Note: timeout cannot be modified once the bucket is created. public async Task Queue(string bucket, FileStorageMetadata file, uint timeout) { - Guard.Against.Null(file); + Guard.Against.Null(file, nameof(file)); await _intializedTask.ConfigureAwait(false); diff --git a/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs b/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs index 0906f8f4f..a951dc21e 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs @@ -65,9 +65,9 @@ public PayloadMoveActionHandler(IServiceScopeFactory serviceScopeFactory, public async Task MoveFilesAsync(Payload payload, ActionBlock moveQueue, ActionBlock notificationQueue, CancellationToken cancellationToken = default) { - Guard.Against.Null(payload); - Guard.Against.Null(moveQueue); - Guard.Against.Null(notificationQueue); + Guard.Against.Null(payload, nameof(payload)); + Guard.Against.Null(moveQueue, nameof(moveQueue)); + Guard.Against.Null(notificationQueue, nameof(notificationQueue)); if (payload.State != Payload.PayloadState.Move) { @@ -100,8 +100,8 @@ public async Task MoveFilesAsync(Payload payload, ActionBlock moveQueue private async Task NotifyIfCompleted(Payload payload, ActionBlock notificationQueue, CancellationToken cancellationToken = default) { - Guard.Against.Null(payload); - Guard.Against.Null(notificationQueue); + Guard.Against.Null(payload, nameof(payload)); + Guard.Against.Null(notificationQueue, nameof(notificationQueue)); if (payload.IsMoveCompleted()) { @@ -128,7 +128,7 @@ private async Task NotifyIfCompleted(Payload payload, ActionBlock notif private async Task UpdatePayloadState(Payload payload, Exception ex, CancellationToken cancellationToken = default) { - Guard.Against.Null(payload); + Guard.Against.Null(payload, nameof(payload)); var scope = _serviceScopeFactory.CreateScope(); var repository = scope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IPayloadRepository)); diff --git a/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs b/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs index cc685665f..9d6e2d670 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs @@ -61,8 +61,8 @@ public PayloadNotificationActionHandler(IServiceScopeFactory serviceScopeFactory public async Task NotifyAsync(Payload payload, ActionBlock notificationQueue, CancellationToken cancellationToken = default) { - Guard.Against.Null(payload); - Guard.Against.Null(notificationQueue); + Guard.Against.Null(payload, nameof(payload)); + Guard.Against.Null(notificationQueue, nameof(notificationQueue)); if (payload.State != Payload.PayloadState.Notify) { @@ -91,7 +91,7 @@ public async Task NotifyAsync(Payload payload, ActionBlock notification private async Task DeletePayload(Payload payload, CancellationToken cancellationToken = default) { - Guard.Against.Null(payload); + Guard.Against.Null(payload, nameof(payload)); var scope = _serviceScopeFactory.CreateScope(); var repository = scope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IPayloadRepository)); @@ -100,7 +100,7 @@ private async Task DeletePayload(Payload payload, CancellationToken cancellation private async Task NotifyPayloadReady(Payload payload) { - Guard.Against.Null(payload); + Guard.Against.Null(payload, nameof(payload)); _logger.GenerateWorkflowRequest(payload.PayloadId); @@ -136,7 +136,7 @@ await messageBrokerPublisherService.Publish( private async Task UpdatePayloadState(Payload payload, CancellationToken cancellationToken = default) { - Guard.Against.Null(payload); + Guard.Against.Null(payload, nameof(payload)); var scope = _serviceScopeFactory.CreateScope(); var repository = scope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IPayloadRepository)); diff --git a/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs b/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs index 1b429f9be..a190ddfad 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs @@ -151,7 +151,7 @@ private void ResetMoveQueue(CancellationToken cancellationToken) private async Task NotificationHandler(Payload payload) { - Guard.Against.Null(payload); + Guard.Against.Null(payload, nameof(payload)); using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "Payload", payload.PayloadId }, { "CorrelationId", payload.CorrelationId } }); @@ -179,7 +179,7 @@ private async Task NotificationHandler(Payload payload) private async Task MoveActionHandler(Payload payload) { - Guard.Against.Null(payload); + Guard.Against.Null(payload, nameof(payload)); using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "Payload", payload.PayloadId }, { "CorrelationId", payload.CorrelationId } }); @@ -207,7 +207,7 @@ private async Task MoveActionHandler(Payload payload) private void HandlePostPayloadException(PostPayloadException ex) { - Guard.Against.Null(ex); + Guard.Against.Null(ex, nameof(ex)); if (ex.TargetQueue == Payload.PayloadState.Move) { @@ -265,8 +265,8 @@ private void BackgroundProcessing(CancellationToken cancellationToken) private static void ResetIfFaultedOrCancelled(ActionBlock queue, Action resetFunction, CancellationToken cancellationToken) { - Guard.Against.Null(queue); - Guard.Against.Null(resetFunction); + Guard.Against.Null(queue, nameof(queue)); + Guard.Against.Null(resetFunction, nameof(resetFunction)); if (queue.Completion.IsCanceledOrFaulted()) { diff --git a/src/InformaticsGateway/Services/DicomWeb/DicomInstanceReaderBase.cs b/src/InformaticsGateway/Services/DicomWeb/DicomInstanceReaderBase.cs index 3452dbf85..ae83d4cc7 100644 --- a/src/InformaticsGateway/Services/DicomWeb/DicomInstanceReaderBase.cs +++ b/src/InformaticsGateway/Services/DicomWeb/DicomInstanceReaderBase.cs @@ -51,7 +51,7 @@ protected DicomInstanceReaderBase( protected static void ValidateSupportedMediaTypes(string contentType, out MediaTypeHeaderValue mediaTypeHeaderValue, params string[] contentTypes) { - Guard.Against.Null(contentType); + Guard.Against.Null(contentType, nameof(contentType)); if (MediaTypeHeaderValue.TryParse(contentType, out var mediaType) && contentTypes.Any(p => p.Equals(mediaType.MediaType.ToString(), StringComparison.OrdinalIgnoreCase))) @@ -65,8 +65,8 @@ protected static void ValidateSupportedMediaTypes(string contentType, out MediaT protected async Task ConvertStream(HttpContext httpContext, Stream sourceStream, CancellationToken cancellationToken = default) { - Guard.Against.Null(httpContext); - Guard.Against.Null(sourceStream); + Guard.Against.Null(httpContext, nameof(httpContext)); + Guard.Against.Null(sourceStream, nameof(sourceStream)); Stream seekableStream; if (!sourceStream.CanSeek) diff --git a/src/InformaticsGateway/Services/DicomWeb/IStreamsWriter.cs b/src/InformaticsGateway/Services/DicomWeb/IStreamsWriter.cs index 1c3cfad60..a9956ef0a 100644 --- a/src/InformaticsGateway/Services/DicomWeb/IStreamsWriter.cs +++ b/src/InformaticsGateway/Services/DicomWeb/IStreamsWriter.cs @@ -74,9 +74,9 @@ public StreamsWriter( public async Task Save(IList streams, string studyInstanceUid, string workflowName, string correlationId, string dataSource, CancellationToken cancellationToken = default) { - Guard.Against.NullOrEmpty(streams); - Guard.Against.NullOrWhiteSpace(correlationId); - Guard.Against.NullOrWhiteSpace(dataSource); + Guard.Against.NullOrEmpty(streams, nameof(streams)); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); + Guard.Against.NullOrWhiteSpace(dataSource, nameof(dataSource)); foreach (var stream in streams) { @@ -127,9 +127,9 @@ private int GetStatusCode(int instancesReceived) private async Task SaveInstance(Stream stream, string studyInstanceUid, string workflowName, string correlationId, string dataSource, CancellationToken cancellationToken = default) { - Guard.Against.Null(stream); - Guard.Against.NullOrWhiteSpace(correlationId); - Guard.Against.NullOrWhiteSpace(dataSource); + Guard.Against.Null(stream, nameof(stream)); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); + Guard.Against.NullOrWhiteSpace(dataSource, nameof(dataSource)); stream.Seek(0, SeekOrigin.Begin); DicomFile dicomFile; @@ -212,7 +212,7 @@ private void AddSuccess(DicomStatus warningStatus = null, StudySerieSopUids uids /// private void AddFailure(DicomStatus dicomStatus, StudySerieSopUids uids = default) { - Guard.Against.Null(dicomStatus); + Guard.Against.Null(dicomStatus, nameof(dicomStatus)); _failureCount++; diff --git a/src/InformaticsGateway/Services/DicomWeb/MultipartDicomInstanceReader.cs b/src/InformaticsGateway/Services/DicomWeb/MultipartDicomInstanceReader.cs index efb14a834..f844cf1a3 100644 --- a/src/InformaticsGateway/Services/DicomWeb/MultipartDicomInstanceReader.cs +++ b/src/InformaticsGateway/Services/DicomWeb/MultipartDicomInstanceReader.cs @@ -40,8 +40,8 @@ public MultipartDicomInstanceReader(InformaticsGatewayConfiguration configuratio public async Task> GetStreams(HttpRequest request, MediaTypeHeaderValue mediaTypeHeaderValue, CancellationToken cancellationToken) { - Guard.Against.Null(request); - Guard.Against.Null(mediaTypeHeaderValue); + Guard.Against.Null(request, nameof(request)); + Guard.Against.Null(mediaTypeHeaderValue, nameof(mediaTypeHeaderValue)); var boundary = HeaderUtilities.RemoveQuotes(mediaTypeHeaderValue.Boundary).ToString(); diff --git a/src/InformaticsGateway/Services/DicomWeb/SingleDicomInstanceReader.cs b/src/InformaticsGateway/Services/DicomWeb/SingleDicomInstanceReader.cs index d9f8b5d8a..4b5b13a30 100644 --- a/src/InformaticsGateway/Services/DicomWeb/SingleDicomInstanceReader.cs +++ b/src/InformaticsGateway/Services/DicomWeb/SingleDicomInstanceReader.cs @@ -37,8 +37,8 @@ public SingleDicomInstanceReader(InformaticsGatewayConfiguration configuration, public async Task> GetStreams(HttpRequest request, MediaTypeHeaderValue mediaTypeHeaderValue, CancellationToken cancellationToken) { - Guard.Against.Null(request); - Guard.Against.Null(mediaTypeHeaderValue); + Guard.Against.Null(request, nameof(request)); + Guard.Against.Null(mediaTypeHeaderValue, nameof(mediaTypeHeaderValue)); try { diff --git a/src/InformaticsGateway/Services/DicomWeb/StowService.cs b/src/InformaticsGateway/Services/DicomWeb/StowService.cs index 6ec038ca9..956d80913 100644 --- a/src/InformaticsGateway/Services/DicomWeb/StowService.cs +++ b/src/InformaticsGateway/Services/DicomWeb/StowService.cs @@ -49,8 +49,8 @@ public StowService(IServiceScopeFactory serviceScopeFactory, IOptions StoreAsync(HttpRequest request, string studyInstanceUid, string workflowName, string correlationId, CancellationToken cancellationToken) { - Guard.Against.Null(request); - Guard.Against.NullOrWhiteSpace(correlationId); + Guard.Against.Null(request, nameof(request)); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); if (!string.IsNullOrWhiteSpace(studyInstanceUid)) { @@ -76,7 +76,7 @@ public async Task StoreAsync(HttpRequest request, string studyInstan private IStowRequestReader GetRequestReader(MediaTypeHeaderValue mediaTypeHeaderValue) { - Guard.Against.Null(mediaTypeHeaderValue); + Guard.Against.Null(mediaTypeHeaderValue, nameof(mediaTypeHeaderValue)); var scope = _serviceScopeFactory.CreateScope(); var fileSystem = scope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IFileSystem)); diff --git a/src/InformaticsGateway/Services/Export/DicomWebExportService.cs b/src/InformaticsGateway/Services/Export/DicomWebExportService.cs index 08139b9d6..ec19c1f71 100644 --- a/src/InformaticsGateway/Services/Export/DicomWebExportService.cs +++ b/src/InformaticsGateway/Services/Export/DicomWebExportService.cs @@ -90,9 +90,9 @@ protected override async Task ExportDataBlockCallback( private async Task HandleTransaction(ExportRequestDataMessage exportRequestData, IInferenceRequestRepository repository, string transaction, CancellationToken cancellationToken) { - Guard.Against.Null(exportRequestData); - Guard.Against.Null(repository); - Guard.Against.NullOrWhiteSpace(transaction); + Guard.Against.Null(exportRequestData, nameof(exportRequestData)); + Guard.Against.Null(repository, nameof(repository)); + Guard.Against.NullOrWhiteSpace(transaction, nameof(transaction)); var inferenceRequest = await repository.GetInferenceRequestAsync(transaction, cancellationToken).ConfigureAwait(false); if (inferenceRequest is null) @@ -166,7 +166,7 @@ await Policy private void CheckAndLogResult(DicomWebResponse result) { - Guard.Against.Null(result); + Guard.Against.Null(result, nameof(result)); switch (result.StatusCode) { case System.Net.HttpStatusCode.OK: diff --git a/src/InformaticsGateway/Services/Export/ExportRequestDataMessage.cs b/src/InformaticsGateway/Services/Export/ExportRequestDataMessage.cs index 7f319c9d5..4b0a3baf0 100644 --- a/src/InformaticsGateway/Services/Export/ExportRequestDataMessage.cs +++ b/src/InformaticsGateway/Services/Export/ExportRequestDataMessage.cs @@ -58,13 +58,13 @@ public ExportRequestDataMessage(ExportRequestEvent exportRequest, string filenam public void SetData(byte[] data) { - Guard.Against.Null(data); + Guard.Against.Null(data, nameof(data)); FileContent = data; } public void SetFailed(FileExportStatus fileExportStatus, string errorMessage) { - Guard.Against.NullOrWhiteSpace(errorMessage); + Guard.Against.NullOrWhiteSpace(errorMessage, nameof(errorMessage)); ExportStatus = fileExportStatus; IsFailed = true; diff --git a/src/InformaticsGateway/Services/Export/ExportServiceBase.cs b/src/InformaticsGateway/Services/Export/ExportServiceBase.cs index 55f3ee3f6..a87748e9b 100644 --- a/src/InformaticsGateway/Services/Export/ExportServiceBase.cs +++ b/src/InformaticsGateway/Services/Export/ExportServiceBase.cs @@ -222,7 +222,7 @@ private async Task OnMessageReceivedCallback(MessageReceivedEventArgs eventArgs) // https://github.com/dotnet/runtime/issues/30863 private IEnumerable DownloadPayloadActionCallback(ExportRequestEventDetails exportRequest, CancellationToken cancellationToken) { - Guard.Against.Null(exportRequest); + Guard.Against.Null(exportRequest, nameof(exportRequest)); using var loggerScope = _logger.BeginScope(new Api.LoggingDataDictionary { { "ExportTaskId", exportRequest.ExportTaskId }, { "CorrelationId", exportRequest.CorrelationId } }); var scope = _serviceScopeFactory.CreateScope(); var storageService = scope.ServiceProvider.GetRequiredService(); diff --git a/src/InformaticsGateway/Services/Export/ScuExportService.cs b/src/InformaticsGateway/Services/Export/ScuExportService.cs index 231687e49..c704c859b 100644 --- a/src/InformaticsGateway/Services/Export/ScuExportService.cs +++ b/src/InformaticsGateway/Services/Export/ScuExportService.cs @@ -77,7 +77,7 @@ protected override async Task ExportDataBlockCallback( private async Task HandleDesination(ExportRequestDataMessage exportRequestData, string destinationName, CancellationToken cancellationToken) { - Guard.Against.Null(exportRequestData); + Guard.Against.Null(exportRequestData, nameof(exportRequestData)); var manualResetEvent = new ManualResetEvent(false); DestinationApplicationEntity destination = null; diff --git a/src/InformaticsGateway/Services/Fhir/FhirJsonReader.cs b/src/InformaticsGateway/Services/Fhir/FhirJsonReader.cs index 1f976b8a8..d489ff5d0 100644 --- a/src/InformaticsGateway/Services/Fhir/FhirJsonReader.cs +++ b/src/InformaticsGateway/Services/Fhir/FhirJsonReader.cs @@ -48,8 +48,8 @@ public FhirJsonReader(ILogger logger, IOptions GetContentAsync(HttpRequest request, string correlationId, string resourceType, MediaTypeHeaderValue mediaTypeHeaderValue, CancellationToken cancellationToken) { - Guard.Against.Null(request); - Guard.Against.NullOrWhiteSpace(correlationId); + Guard.Against.Null(request, nameof(request)); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); Guard.Against.NullOrInvalidInput(mediaTypeHeaderValue, nameof(mediaTypeHeaderValue), (value) => { return value.MediaType.Value.Equals(ContentTypes.ApplicationFhirJson, StringComparison.OrdinalIgnoreCase); @@ -83,8 +83,8 @@ public async Task GetContentAsync(HttpRequest request, string c private static string SetIdIfMIssing(string correlationId, JsonNode jsonDoc) { - Guard.Against.NullOrWhiteSpace(correlationId); - Guard.Against.Null(jsonDoc); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); + Guard.Against.Null(jsonDoc, nameof(jsonDoc)); if (string.IsNullOrWhiteSpace(jsonDoc[Resources.PropertyId]?.GetValue())) { diff --git a/src/InformaticsGateway/Services/Fhir/FhirResourceTypesRouteConstraint.cs b/src/InformaticsGateway/Services/Fhir/FhirResourceTypesRouteConstraint.cs index 1c5d30d5b..7a7a54190 100644 --- a/src/InformaticsGateway/Services/Fhir/FhirResourceTypesRouteConstraint.cs +++ b/src/InformaticsGateway/Services/Fhir/FhirResourceTypesRouteConstraint.cs @@ -15,6 +15,7 @@ */ using Ardalis.GuardClauses; +using FellowOakDicom; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; @@ -24,10 +25,10 @@ internal class FhirResourceTypesRouteConstraint : IRouteConstraint { public bool Match(HttpContext httpContext, IRouter route, string routeKey, RouteValueDictionary values, RouteDirection routeDirection) { - Guard.Against.Null(httpContext); - Guard.Against.Null(route); - Guard.Against.NullOrWhiteSpace(routeKey); - Guard.Against.Null(values); + Guard.Against.Null(httpContext, nameof(httpContext)); + Guard.Against.Null(route, nameof(route)); + Guard.Against.NullOrWhiteSpace(routeKey, nameof(routeKey)); + Guard.Against.Null(values, nameof(values)); return (values.TryGetValue(Resources.RouteNameResourceType, out var resourceTypeObject) && resourceTypeObject is string resourceType && diff --git a/src/InformaticsGateway/Services/Fhir/FhirService.cs b/src/InformaticsGateway/Services/Fhir/FhirService.cs index 45b706ce9..9c5158ad0 100644 --- a/src/InformaticsGateway/Services/Fhir/FhirService.cs +++ b/src/InformaticsGateway/Services/Fhir/FhirService.cs @@ -58,8 +58,8 @@ public FhirService(IServiceScopeFactory serviceScopeFactory, IOptions StoreAsync(HttpRequest request, string correlationId, string resourceType, CancellationToken cancellationToken) { - Guard.Against.Null(request); - Guard.Against.NullOrWhiteSpace(correlationId); + Guard.Against.Null(request, nameof(request)); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); if (!MediaTypeHeaderValue.TryParse(request.ContentType, out var mediaTypeHeaderValue)) { @@ -98,7 +98,7 @@ public async Task StoreAsync(HttpRequest request, string correl private IFHirRequestReader GetRequestReader(MediaTypeHeaderValue mediaTypeHeaderValue) { - Guard.Against.Null(mediaTypeHeaderValue); + Guard.Against.Null(mediaTypeHeaderValue, nameof(mediaTypeHeaderValue)); var scope = _serviceScopeFactory.CreateScope(); if (mediaTypeHeaderValue.MediaType.Equals(ContentTypes.ApplicationFhirJson, StringComparison.OrdinalIgnoreCase)) diff --git a/src/InformaticsGateway/Services/Fhir/FhirXmlReader.cs b/src/InformaticsGateway/Services/Fhir/FhirXmlReader.cs index 123e24e20..d936e8d44 100644 --- a/src/InformaticsGateway/Services/Fhir/FhirXmlReader.cs +++ b/src/InformaticsGateway/Services/Fhir/FhirXmlReader.cs @@ -48,8 +48,8 @@ public FhirXmlReader(ILogger logger, IOptions GetContentAsync(HttpRequest request, string correlationId, string resourceType, MediaTypeHeaderValue mediaTypeHeaderValue, CancellationToken cancellationToken) { - Guard.Against.Null(request); - Guard.Against.NullOrWhiteSpace(correlationId); + Guard.Against.Null(request, nameof(request)); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); Guard.Against.NullOrInvalidInput(mediaTypeHeaderValue, nameof(mediaTypeHeaderValue), (value) => { return value.MediaType.Value.Equals(ContentTypes.ApplicationFhirXml, StringComparison.OrdinalIgnoreCase); @@ -95,9 +95,9 @@ public async Task GetContentAsync(HttpRequest request, string c private static string SetIdIfMIssing(string correlationId, XmlNamespaceManager xmlNamespaceManager, XmlElement rootNode) { - Guard.Against.NullOrWhiteSpace(correlationId); - Guard.Against.Null(xmlNamespaceManager); - Guard.Against.Null(rootNode); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); + Guard.Against.Null(xmlNamespaceManager, nameof(xmlNamespaceManager)); + Guard.Against.Null(rootNode, nameof(rootNode)); var idNode = rootNode.SelectSingleNode($"{Resources.XmlNamespacePrefix}:{Resources.PropertyId}", xmlNamespaceManager); if (idNode is null) diff --git a/src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs b/src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs index 4160b8ba9..99d31de31 100644 --- a/src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs +++ b/src/InformaticsGateway/Services/HealthLevel7/MllpClient.cs @@ -72,7 +72,7 @@ public async Task Start(Func onDisconnect, private async Task> ReceiveData(INetworkStream clientStream, CancellationToken cancellationToken) { - Guard.Against.Null(clientStream); + Guard.Against.Null(clientStream, nameof(clientStream)); var data = string.Empty; var messages = new List(); @@ -143,8 +143,8 @@ private async Task> ReceiveData(INetworkStream clientStream, Canc private async Task SendAcknowledgment(INetworkStream clientStream, Message message, CancellationToken cancellationToken) { - Guard.Against.Null(clientStream); - Guard.Against.Null(message); + Guard.Against.Null(clientStream, nameof(clientStream)); + Guard.Against.Null(message, nameof(message)); if (!_configurations.SendAcknowledgment) { @@ -171,7 +171,7 @@ private async Task SendAcknowledgment(INetworkStream clientStream, Message messa private bool ShouldSendAcknowledgment(Message message) { - Guard.Against.Null(message); + Guard.Against.Null(message, nameof(message)); try { var value = message.DefaultSegment(Resources.MessageHeaderSegment).Fields(Resources.AcceptAcknowledgementType); diff --git a/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs b/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs index 5746a9ba6..cb2cde24f 100644 --- a/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs +++ b/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs @@ -25,6 +25,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using Minio.DataModel; using Monai.Deploy.InformaticsGateway.Api.Rest; using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Common; @@ -161,8 +162,8 @@ private async Task BackgroundProcessing(CancellationToken cancellationToken) private async Task OnDisconnect(IMllpClient client, MllpClientResult result) { - Guard.Against.Null(client); - Guard.Against.Null(result); + Guard.Against.Null(client, nameof(client)); + Guard.Against.Null(result, nameof(result)); try { diff --git a/src/InformaticsGateway/Services/Http/InferenceController.cs b/src/InformaticsGateway/Services/Http/InferenceController.cs index d0a588bb5..0d599795c 100644 --- a/src/InformaticsGateway/Services/Http/InferenceController.cs +++ b/src/InformaticsGateway/Services/Http/InferenceController.cs @@ -19,6 +19,7 @@ using System.Net; using System.Threading.Tasks; using Ardalis.GuardClauses; +using DotNext; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; @@ -51,7 +52,7 @@ public InferenceController( [ProducesResponseType(StatusCodes.Status500InternalServerError)] public async Task JobStatus(string transactionId) { - Guard.Against.NullOrWhiteSpace(transactionId); + Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId)); try { @@ -80,7 +81,7 @@ public async Task JobStatus(string transactionId) [ProducesResponseType(StatusCodes.Status500InternalServerError)] public async Task NewInferenceRequest([FromBody] InferenceRequest request) { - Guard.Against.Null(request); + Guard.Against.Null(request, nameof(request)); if (!request.IsValid(out var details)) { diff --git a/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs b/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs index dd74bd426..0a0dac2b6 100644 --- a/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs +++ b/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs @@ -19,6 +19,7 @@ using System.Linq; using System.Net.Mime; using System.Threading.Tasks; +using Amazon.Runtime.Internal; using Ardalis.GuardClauses; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -206,7 +207,7 @@ public async Task> Delete(string name) private async Task ValidateCreateAsync(MonaiApplicationEntity item) { - Guard.Against.Null(item); + Guard.Against.Null(item, nameof(item)); if (await _repository.ContainsAsync(p => p.Name.Equals(item.Name), HttpContext.RequestAborted).ConfigureAwait(false)) { diff --git a/src/InformaticsGateway/Services/Scp/ApplicationEntityHandler.cs b/src/InformaticsGateway/Services/Scp/ApplicationEntityHandler.cs index a668bdfcc..291ba46b4 100644 --- a/src/InformaticsGateway/Services/Scp/ApplicationEntityHandler.cs +++ b/src/InformaticsGateway/Services/Scp/ApplicationEntityHandler.cs @@ -20,6 +20,7 @@ using System.Threading.Tasks; using Ardalis.GuardClauses; using FellowOakDicom.Network; +using Microsoft.AspNetCore.Components.Web; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -54,7 +55,7 @@ public ApplicationEntityHandler( ILogger logger, IOptions options) { - Guard.Against.Null(serviceScopeFactory); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _options = options ?? throw new ArgumentNullException(nameof(options)); @@ -67,7 +68,7 @@ public ApplicationEntityHandler( public void Configure(MonaiApplicationEntity monaiApplicationEntity, DicomJsonOptions dicomJsonOptions, bool validateDicomValuesOnJsonSerialization) { - Guard.Against.Null(monaiApplicationEntity); + Guard.Against.Null(monaiApplicationEntity, nameof(monaiApplicationEntity)); if (_configuration is not null && (_configuration.Name != monaiApplicationEntity.Name || @@ -92,11 +93,11 @@ public async Task HandleInstanceAsync(DicomCStoreRequest request, string calledA throw new NotSupportedException("Must call Configure(...) first."); } - Guard.Against.Null(request); - Guard.Against.NullOrWhiteSpace(calledAeTitle); - Guard.Against.NullOrWhiteSpace(callingAeTitle); - Guard.Against.Null(associationId); - Guard.Against.Null(uids); + Guard.Against.Null(request, nameof(request)); + Guard.Against.NullOrWhiteSpace(calledAeTitle, nameof(calledAeTitle)); + Guard.Against.NullOrWhiteSpace(callingAeTitle, nameof(callingAeTitle)); + Guard.Against.Null(associationId, nameof(associationId)); + Guard.Against.Null(uids, nameof(uids)); if (!AcceptsSopClass(uids.SopClassUid)) { @@ -131,7 +132,7 @@ public async Task HandleInstanceAsync(DicomCStoreRequest request, string calledA private bool AcceptsSopClass(string sopClassUid) { - Guard.Against.NullOrWhiteSpace(sopClassUid); + Guard.Against.NullOrWhiteSpace(sopClassUid, nameof(sopClassUid)); if (_configuration.IgnoredSopClasses.Any()) { diff --git a/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs b/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs index 1e6c777de..42037956c 100644 --- a/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs +++ b/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs @@ -94,7 +94,7 @@ private void OnApplicationStopping() public async Task HandleCStoreRequest(DicomCStoreRequest request, string calledAeTitle, string callingAeTitle, Guid associationId) { - Guard.Against.Null(request); + Guard.Against.Null(request, nameof(request)); await _initializeTask.ConfigureAwait(false); @@ -125,7 +125,7 @@ private async Task HandleInstance(DicomCStoreRequest request, string calledAeTit public async Task IsAeTitleConfiguredAsync(string calledAe) { - Guard.Against.NullOrWhiteSpace(calledAe); + Guard.Against.NullOrWhiteSpace(calledAe, nameof(calledAe)); await _initializeTask.ConfigureAwait(false); return _aeTitles.ContainsKey(calledAe); @@ -136,11 +136,6 @@ public T GetService() return (T)_serviceScope.ServiceProvider.GetService(typeof(T)); } - public ILogger GetLogger(string calledAeTitle) - { - return _loggerFactory.CreateLogger(calledAeTitle); - } - private async Task InitializeMonaiAeTitlesAsync() { _logger.LoadingMonaiAeTitles(); @@ -155,7 +150,7 @@ private async Task InitializeMonaiAeTitlesAsync() private void AddNewAeTitle(MonaiApplicationEntity entity) { - Guard.Against.Null(entity); + Guard.Against.Null(entity, nameof(entity)); var scope = _serviceScopeFactory.CreateScope(); var handler = scope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IApplicationEntityHandler)); @@ -202,7 +197,7 @@ public void OnError(Exception error) public void OnNext(MonaiApplicationentityChangedEvent applicationChangedEvent) { - Guard.Against.Null(applicationChangedEvent); + Guard.Against.Null(applicationChangedEvent, nameof(applicationChangedEvent)); switch (applicationChangedEvent.Event) { diff --git a/src/InformaticsGateway/Services/Scp/IApplicationEntityManager.cs b/src/InformaticsGateway/Services/Scp/IApplicationEntityManager.cs index 5681e98fc..098473f90 100644 --- a/src/InformaticsGateway/Services/Scp/IApplicationEntityManager.cs +++ b/src/InformaticsGateway/Services/Scp/IApplicationEntityManager.cs @@ -51,11 +51,6 @@ public interface IApplicationEntityManager /// T GetService(); - /// - /// Wrapper to get a typed logger. - /// - ILogger GetLogger(string calledAeTitle); - /// /// Checks if source AE Title is configured. /// diff --git a/src/InformaticsGateway/Services/Scp/MonaiAeChangedNotificationService.cs b/src/InformaticsGateway/Services/Scp/MonaiAeChangedNotificationService.cs index daa4650a8..970e1e635 100644 --- a/src/InformaticsGateway/Services/Scp/MonaiAeChangedNotificationService.cs +++ b/src/InformaticsGateway/Services/Scp/MonaiAeChangedNotificationService.cs @@ -18,6 +18,7 @@ using System; using System.Collections.Generic; using Ardalis.GuardClauses; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Logging; @@ -38,7 +39,7 @@ public MonaiAeChangedNotificationService(ILogger observer) { - Guard.Against.Null(observer); + Guard.Against.Null(observer, nameof(observer)); if (!_observers.Contains(observer)) { @@ -50,7 +51,7 @@ public IDisposable Subscribe(IObserver obser public void Notify(MonaiApplicationentityChangedEvent monaiApplicationChangedEvent) { - Guard.Against.Null(monaiApplicationChangedEvent); + Guard.Against.Null(monaiApplicationChangedEvent, nameof(monaiApplicationChangedEvent)); _logger.NotifyAeChanged(_observers.Count, monaiApplicationChangedEvent.Event); diff --git a/src/InformaticsGateway/Services/Scp/ScpService.cs b/src/InformaticsGateway/Services/Scp/ScpService.cs index 0edfd269e..757515d9e 100644 --- a/src/InformaticsGateway/Services/Scp/ScpService.cs +++ b/src/InformaticsGateway/Services/Scp/ScpService.cs @@ -20,6 +20,7 @@ using System.Threading.Tasks; using Ardalis.GuardClauses; using FellowOakDicom; +using FellowOakDicom.Network; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -41,6 +42,7 @@ internal sealed class ScpService : IHostedService, IDisposable, IMonaiService private readonly IServiceScope _serviceScope; private readonly IApplicationEntityManager _associationDataProvider; private readonly ILogger _logger; + private readonly ILogger _scpServiceInternalLogger; private readonly IHostApplicationLifetime _appLifetime; private readonly IOptions _configuration; private FoDicomNetwork.IDicomServer _server; @@ -52,10 +54,10 @@ public ScpService(IServiceScopeFactory serviceScopeFactory, IHostApplicationLifetime appLifetime, IOptions configuration) { - Guard.Against.Null(serviceScopeFactory); - Guard.Against.Null(applicationEntityManager); - Guard.Against.Null(appLifetime); - Guard.Against.Null(configuration); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); + Guard.Against.Null(applicationEntityManager, nameof(applicationEntityManager)); + Guard.Against.Null(appLifetime, nameof(appLifetime)); + Guard.Against.Null(configuration, nameof(configuration)); _serviceScope = serviceScopeFactory.CreateScope(); _associationDataProvider = applicationEntityManager; @@ -63,6 +65,7 @@ public ScpService(IServiceScopeFactory serviceScopeFactory, var logginFactory = _serviceScope.ServiceProvider.GetService(); _logger = logginFactory.CreateLogger(); + _scpServiceInternalLogger = logginFactory.CreateLogger(); _appLifetime = appLifetime; _configuration = configuration; _ = DicomDictionary.Default; @@ -82,9 +85,10 @@ public Task StartAsync(CancellationToken cancellationToken) try { _logger.ServiceStarting(ServiceName); - _server = FoDicomNetwork.DicomServerFactory.Create( - FoDicomNetwork.NetworkManager.IPv4Any, + _server = DicomServerFactory.Create( + NetworkManager.IPv4Any, _configuration.Value.Dicom.Scp.Port, + logger: _scpServiceInternalLogger, userState: _associationDataProvider); _server.Options.IgnoreUnsupportedTransferSyntaxChange = true; diff --git a/src/InformaticsGateway/Services/Scp/ScpServiceInternal.cs b/src/InformaticsGateway/Services/Scp/ScpServiceInternal.cs index 682ba86f5..60dd79958 100644 --- a/src/InformaticsGateway/Services/Scp/ScpServiceInternal.cs +++ b/src/InformaticsGateway/Services/Scp/ScpServiceInternal.cs @@ -22,6 +22,7 @@ using System.Threading.Tasks; using FellowOakDicom; using FellowOakDicom.Network; +using Microsoft.Extensions.Logging; using Monai.Deploy.InformaticsGateway.Api; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Database.Api.Repositories; @@ -39,15 +40,17 @@ internal class ScpServiceInternal : IDicomCStoreProvider { private readonly DicomAssociationInfo _associationInfo; - private Microsoft.Extensions.Logging.ILogger _logger; + private readonly ILogger _logger; private IApplicationEntityManager _associationDataProvider; private IDisposable _loggerScope; private Guid _associationId; private DateTimeOffset? _associationReceived; - public ScpServiceInternal(INetworkStream stream, Encoding fallbackEncoding, FellowOakDicom.Log.ILogger log, DicomServiceDependencies dicomServiceDependencies) - : base(stream, fallbackEncoding, log, dicomServiceDependencies) + + public ScpServiceInternal(INetworkStream stream, Encoding fallbackEncoding, ILogger logger, DicomServiceDependencies dicomServiceDependencies) + : base(stream, fallbackEncoding, logger, dicomServiceDependencies) { + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _associationInfo = new DicomAssociationInfo(); } @@ -148,8 +151,6 @@ public async Task OnReceiveAssociationRequestAsync(DicomAssociation association) throw new ServiceException($"{nameof(UserState)} must be an instance of IAssociationDataProvider"); } - _logger = _associationDataProvider.GetLogger(Association.CalledAE); - _associationId = Guid.NewGuid(); var associationIdStr = $"#{_associationId} {association.RemoteHost}:{association.RemotePort}"; diff --git a/src/InformaticsGateway/Services/Scu/ScuQueue.cs b/src/InformaticsGateway/Services/Scu/ScuQueue.cs index 8213931b4..9fd0a7984 100644 --- a/src/InformaticsGateway/Services/Scu/ScuQueue.cs +++ b/src/InformaticsGateway/Services/Scu/ScuQueue.cs @@ -41,7 +41,7 @@ public ScuWorkRequest Dequeue(CancellationToken cancellationToken) public async Task Queue(ScuWorkRequest request, CancellationToken cancellationToken) { - Guard.Against.Null(request); + Guard.Against.Null(request, nameof(request)); _workItems.Add(request, cancellationToken); return await request.WaitAsync(cancellationToken).ConfigureAwait(false); diff --git a/src/InformaticsGateway/Services/Scu/ScuService.cs b/src/InformaticsGateway/Services/Scu/ScuService.cs index e2b663e03..c20a9f8e9 100644 --- a/src/InformaticsGateway/Services/Scu/ScuService.cs +++ b/src/InformaticsGateway/Services/Scu/ScuService.cs @@ -47,7 +47,7 @@ public ScuService(IServiceScopeFactory serviceScopeFactory, ILogger logger, IOptions configuration) { - Guard.Against.Null(serviceScopeFactory); + Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory)); _scope = serviceScopeFactory.CreateScope(); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -114,7 +114,7 @@ private async Task Process(ScuWorkRequest request, CancellationToken cancellatio private async Task HandleCEchoRequest(ScuWorkRequest request, CancellationToken cancellationToken) { - Guard.Against.Null(request); + Guard.Against.Null(request, nameof(request)); var scuResponse = new ScuWorkResponse(); var manualResetEvent = new ManualResetEventSlim(); diff --git a/src/InformaticsGateway/Services/Scu/ScuWorkRequest.cs b/src/InformaticsGateway/Services/Scu/ScuWorkRequest.cs index 49e825471..7925c396f 100644 --- a/src/InformaticsGateway/Services/Scu/ScuWorkRequest.cs +++ b/src/InformaticsGateway/Services/Scu/ScuWorkRequest.cs @@ -37,9 +37,9 @@ public class ScuWorkRequest : IDisposable public ScuWorkRequest(string correlationId, RequestType requestType, string hostIp, int port, string aeTitle, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(correlationId); - Guard.Against.NullOrWhiteSpace(hostIp); - Guard.Against.NullOrWhiteSpace(aeTitle); + Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId)); + Guard.Against.NullOrWhiteSpace(hostIp, nameof(hostIp)); + Guard.Against.NullOrWhiteSpace(aeTitle, nameof(aeTitle)); CorrelationId = correlationId; RequestType = requestType; diff --git a/src/InformaticsGateway/Services/Storage/ObjectUploadQueue.cs b/src/InformaticsGateway/Services/Storage/ObjectUploadQueue.cs index 5040eab68..27f728c95 100644 --- a/src/InformaticsGateway/Services/Storage/ObjectUploadQueue.cs +++ b/src/InformaticsGateway/Services/Storage/ObjectUploadQueue.cs @@ -39,7 +39,7 @@ public ObjectUploadQueue(ILogger logger) public void Queue(FileStorageMetadata file) { - Guard.Against.Null(file); + Guard.Against.Null(file, nameof(file)); _workItems.Enqueue(file); var process = Process.GetCurrentProcess(); diff --git a/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs b/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs index fb30a5d30..7bad9747f 100644 --- a/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs +++ b/src/InformaticsGateway/Services/Storage/ObjectUploadService.cs @@ -145,7 +145,7 @@ public Task StopAsync(CancellationToken cancellationToken) private async Task ProcessObject(int thread, FileStorageMetadata blob) { - Guard.Against.Null(blob); + Guard.Against.Null(blob, nameof(blob)); using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "Thread", thread }, { "File ID", blob.Id }, { "CorrelationId", blob.CorrelationId } }); var stopwatch = new Stopwatch(); @@ -179,10 +179,10 @@ private async Task ProcessObject(int thread, FileStorageMetadata blob) private async Task UploadFileAndConfirm(string identifier, StorageObjectMetadata storageObjectMetadata, string source, List workflows, string payloadId, CancellationToken cancellationToken) { - Guard.Against.NullOrWhiteSpace(identifier); - Guard.Against.Null(storageObjectMetadata); - Guard.Against.NullOrWhiteSpace(source); - Guard.Against.Null(workflows); + Guard.Against.NullOrWhiteSpace(identifier, nameof(identifier)); + Guard.Against.Null(storageObjectMetadata, nameof(storageObjectMetadata)); + Guard.Against.NullOrWhiteSpace(source, nameof(source)); + Guard.Against.Null(workflows, nameof(workflows)); if (storageObjectMetadata.IsUploaded) { diff --git a/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj b/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj index 52256569c..2387ec3f9 100644 --- a/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj +++ b/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj @@ -31,18 +31,18 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/InformaticsGateway/Test/Services/Export/DicomWebExportServiceTest.cs b/src/InformaticsGateway/Test/Services/Export/DicomWebExportServiceTest.cs index 36b2a83f6..cdc7a73c2 100644 --- a/src/InformaticsGateway/Test/Services/Export/DicomWebExportServiceTest.cs +++ b/src/InformaticsGateway/Test/Services/Export/DicomWebExportServiceTest.cs @@ -413,7 +413,7 @@ public async Task CompletesDataflow(HttpStatusCode httpStatusCode) private bool CheckMessage(Message message, ExportStatus exportStatus, FileExportStatus fileExportStatus) { - Guard.Against.Null(message); + Guard.Against.Null(message, nameof(message)); var exportEvent = message.ConvertTo(); return exportEvent.Status == exportStatus && diff --git a/src/InformaticsGateway/Test/Services/Export/ScuExportServiceTest.cs b/src/InformaticsGateway/Test/Services/Export/ScuExportServiceTest.cs index 920d3253d..de253695d 100644 --- a/src/InformaticsGateway/Test/Services/Export/ScuExportServiceTest.cs +++ b/src/InformaticsGateway/Test/Services/Export/ScuExportServiceTest.cs @@ -511,7 +511,7 @@ public async Task ExportCompletes() private bool CheckMessage(Message message, ExportStatus exportStatus, FileExportStatus fileExportStatus) { - Guard.Against.Null(message); + Guard.Against.Null(message, nameof(message)); var exportEvent = message.ConvertTo(); return exportEvent.Status == exportStatus && diff --git a/src/InformaticsGateway/Test/Services/Scp/ScpServiceTest.cs b/src/InformaticsGateway/Test/Services/Scp/ScpServiceTest.cs index 1c3dcde04..d4d8bace5 100644 --- a/src/InformaticsGateway/Test/Services/Scp/ScpServiceTest.cs +++ b/src/InformaticsGateway/Test/Services/Scp/ScpServiceTest.cs @@ -44,7 +44,6 @@ public class ScpServiceTest private readonly Mock _associationDataProvider; private readonly Mock _loggerFactory; private readonly Mock> _logger; - private readonly Mock _loggerInternal; private readonly Mock _appLifetime; private readonly IOptions _configuration; private readonly CancellationTokenSource _cancellationTokenSource; @@ -56,7 +55,6 @@ public ScpServiceTest() _associationDataProvider = new Mock(); _loggerFactory = new Mock(); _logger = new Mock>(); - _loggerInternal = new Mock(); _appLifetime = new Mock(); _configuration = Options.Create(new InformaticsGatewayConfiguration()); _cancellationTokenSource = new CancellationTokenSource(); @@ -67,10 +65,8 @@ public ScpServiceTest() _serviceScope.Setup(x => x.ServiceProvider).Returns(serviceProvider.Object); _serviceScopeFactory.Setup(p => p.CreateScope()).Returns(_serviceScope.Object); _loggerFactory.Setup(p => p.CreateLogger(It.IsAny())).Returns(_logger.Object); - _associationDataProvider.Setup(p => p.GetLogger(It.IsAny())).Returns(_loggerInternal.Object); _associationDataProvider.Setup(p => p.Configuration).Returns(_configuration); _logger.Setup(p => p.IsEnabled(It.IsAny())).Returns(true); - _loggerInternal.Setup(p => p.IsEnabled(It.IsAny())).Returns(true); } [RetryFact(5, 250, DisplayName = "StartAsync - shall stop application if failed to start SCP listner")] @@ -122,7 +118,7 @@ public async Task CEcho_ShallRejectCEchoRequests() Assert.Equal(DicomRejectSource.ServiceUser, exception.RejectSource); Assert.Equal(DicomRejectResult.Permanent, exception.RejectResult); - _loggerInternal.VerifyLogging($"Verification service is disabled: rejecting association.", LogLevel.Warning, Times.Once()); + _logger.VerifyLogging($"Verification service is disabled: rejecting association.", LogLevel.Warning, Times.Once()); Assert.True(countdownEvent.Wait(1000)); } @@ -381,7 +377,7 @@ public async Task CStore_OnClientAbort() await client.SendAsync(_cancellationTokenSource.Token, DicomClientCancellationMode.ImmediatelyAbortAssociation); Assert.True(countdownEvent.Wait(2000)); - _loggerInternal.VerifyLogging($"Aborted {DicomAbortSource.ServiceUser} with reason {DicomAbortReason.NotSpecified}.", LogLevel.Warning, Times.Once()); + _logger.VerifyLogging($"Aborted {DicomAbortSource.ServiceUser} with reason {DicomAbortReason.NotSpecified}.", LogLevel.Warning, Times.Once()); } private ScpService CreateService() diff --git a/src/InformaticsGateway/Test/Shared/DicomScpFixture.cs b/src/InformaticsGateway/Test/Shared/DicomScpFixture.cs index 63bbb01bc..28f4a7f8d 100644 --- a/src/InformaticsGateway/Test/Shared/DicomScpFixture.cs +++ b/src/InformaticsGateway/Test/Shared/DicomScpFixture.cs @@ -82,8 +82,8 @@ public void Dispose() public class CStoreScp : DicomService, IDicomServiceProvider, IDicomCStoreProvider, IDicomCEchoProvider { - public CStoreScp(INetworkStream stream, Encoding fallbackEncoding, FellowOakDicom.Log.ILogger log, DicomServiceDependencies dicomServiceDependencies) - : base(stream, fallbackEncoding, log, dicomServiceDependencies) + public CStoreScp(INetworkStream stream, Encoding fallbackEncoding, ILogger logger, DicomServiceDependencies dicomServiceDependencies) + : base(stream, fallbackEncoding, logger, dicomServiceDependencies) { } diff --git a/src/InformaticsGateway/Test/packages.lock.json b/src/InformaticsGateway/Test/packages.lock.json index c01b8d746..cd5b4d361 100644 --- a/src/InformaticsGateway/Test/packages.lock.json +++ b/src/InformaticsGateway/Test/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.AspNetCore.Mvc.WebApiCompatShim": { "type": "Direct", @@ -22,21 +22,21 @@ }, "Microsoft.EntityFrameworkCore.InMemory": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "lRL5rTa6iM9SIubc75dTiQd2aYfURgEd7bz5tLA4T+++yOPFPVm9dCQ22ukGhnlJy6Xr9LAQEDOUrJmWDgByTw==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "Z3q/yJL3ODCb3zGKkNmsMDd6Az/oAN6aOPeI4le7kIX7TJBUoPvcWKuB52gPyLwYeMOTu4XVZull31DgGhXLNQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15" + "Microsoft.EntityFrameworkCore": "6.0.20" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "Moq": { @@ -80,28 +80,25 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AspNetCore.HealthChecks.MongoDb": { "type": "Transitive", @@ -133,6 +130,11 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "Crc32.NET": { "type": "Transitive", "resolved": "1.2.0", @@ -168,39 +170,27 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "fo-dicom.NLog": { - "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "k35FD+C9IcpTLjCF5tvCkBGUxJ+YvzoBsgb2VAtGQv+aVTu+HyoCnNVqccc4lVE53fbVCwpR3gPiTAnm5fm+KQ==", - "dependencies": { - "NLog": "4.7.11", - "fo-dicom": "5.0.3" - } - }, "HL7-dotnetcore": { "type": "Transitive", "resolved": "2.35.0", "contentHash": "1yScq0Ju2O/GPBasnr9/uHziKu3CBgh4nOkgJPWatPLTcP4EzUjjaM2hkgjOBMj8pKO0g687UDnj989MvYRLfA==" }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Karambolo.Extensions.Logging.File": { "type": "Transitive", "resolved": "3.4.0", @@ -422,10 +412,15 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -434,19 +429,19 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "yE5Q7jJDuGUwS3FMV6N6oz7p7MrtqPrdanLHG6dVXPB3o4KQKLpkPPzUQPByGmBis6wIDGmbWunwjD0vH/qlFQ==", + "resolved": "6.0.20", + "contentHash": "k+namWYTxTS9t/JYDyZoTzQK95iLDrQTBTuEZu/zfbl2sm8DQ8taNJ2HkBw8tXvW2pM8yyAQbJjcPYzx/BUBuw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -456,39 +451,39 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "ouk4es/CzwxjXl33mb2hJzitluc2CD9rujZVBaUy3w3fn8qMjlktMOhf5mIAS7e3sreBikOBwaxp9/y/N/O2NQ==", + "resolved": "6.0.20", + "contentHash": "TQX6xHu1puMviW+GSfLfDO1iGe3TE43D5+oyDEZ7xSXlrPnupxJoujjCNptZoEvUo4giEJQRvT9tlDKU1LhbQQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15", + "Microsoft.EntityFrameworkCore": "6.0.20", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "4oRXU58XmoDkK27wDMmIrZG9yaOYw8URmWNQzGkfO0ZCpELX/bx6rtb99eoBOOzA+a0QYoTLlugZB7MyM1XDbw==", + "resolved": "6.0.20", + "contentHash": "PT84DIPfxpdNOr8TuuEMP+2GRbUSHBugN34c05UExPFCPd3DaksEax1cZMC9qMCx29JBPCK8lAhnfFi1V18Yng==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.15", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.20", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "30gMAP29sWQ9yTSM/VXknmv8BcH9AVO+QHCpoDoAlzPnmL6STjJ5jihlOp1mvErGVTkEgnaIxmv4j3gX6knFRw==", + "resolved": "6.0.20", + "contentHash": "Demwm93dqVo0r9rFFrjZPNwnWjVFerp92IraGImsFGd8CH+zFhYaKa20Y1tPttDk3Bwj6CscIOWdAKB4Ei3tTQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.15", - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", + "Microsoft.Data.Sqlite.Core": "6.0.20", + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -623,28 +618,28 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.20", + "contentHash": "/uw/4EXx+tOWiqTVNbO0ooaFrrp06h68hI7XhOKyHRp7rdUi7SNmIsj0CCNE6PyZanfnQDwhNyaxG25u2HWpjg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.20", + "contentHash": "qWT4ldcOylWZa+GXFePyAJSQ9d/gWzKIL2KdFCkudZpzMjeTUPpqMhIwZdJNvCupi/ercnUT3Ru1RI/rWwX8aA==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "jIWboFkp6O/G3wF6JwQq8A5AR5TcZbCRzXdBhaYgVAGiWexb95/2JkytGFrJJ44pBiWO76jpOT4vShGLAgf1HQ==", + "resolved": "6.0.20", + "contentHash": "WV5KDOKX0OmqzxZ6yA5DpcJY05ARD0TtJo47+cjSpptII8rO/KhDDQuW9RXxneTx0oVKcc50EOJhZZdEKk+M0A==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15" + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -733,8 +728,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -901,27 +896,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -947,8 +937,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -961,10 +951,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "ZJEHtM4NaX8UzvG+w1coKOivbCecoU6hx8g06PGKkg6giIeLGqCi2FDkP89kIPq7Kz1RB9cLVvYdXY9Rs+ZDSg==", + "resolved": "0.1.23", + "contentHash": "+Y1eLKz9FtPbASOVtTaM1ktyUqOxmyIjksNukZ8dUhtDJrT3CF9ISw6BGajxwJfq2jUjacli3jNSc1OAnLJRcQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.22", + "Monai.Deploy.Messaging": "0.1.23", "Polly": "7.2.3", "RabbitMQ.Client": "6.4.0", "System.Collections.Concurrent": "4.3.0" @@ -1023,33 +1013,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==", + "resolved": "2.20.0", + "contentHash": "IXgb+uGslHBgy+JjfwepO06Vmq5itprTPJJtQotAhLMjmuDvbA7pfAs/2hTfqYbR39l7eli5bIwA3zqZHUkVlQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==", + "resolved": "2.20.0", + "contentHash": "pAxVtrIRTTuQG3xMBF3NfWumXqf/JT0i7eEzp06k4zin8zj1sroX0J/i/qzJ9JjHQMh3BSsQ4E209G5S6zkxrg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Driver.Core": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.20.0", + "MongoDB.Driver.Core": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==", + "resolved": "2.20.0", + "contentHash": "YIRUQnl/aHjZbvwoVHhlUi5ofoZs/6HRllpxZrSseB52IJPmhYclppApAUb/TETIx7mPxcoZgHVVQKnwYQQCVg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -1058,8 +1048,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "NETStandard.Library": { "type": "Transitive", @@ -1085,36 +1075,36 @@ }, "NLog": { "type": "Transitive", - "resolved": "5.1.3", - "contentHash": "rB8hwjBf1EZCfG5iPfsv3gPksLoJLr1cOrt7PBbJu6VpJgwYJchDzTUT1dhNDdPv0QakXJQJOhE59ErupcznQQ==" + "resolved": "5.2.2", + "contentHash": "r6Q9740g29gTwmTWlsgdIFm0mhNsfNZmbvWKX/Fxmi8X89ZrpUowHM2T2X1lP7RVpND+ef+XnfKL5g6Q1iNGXA==" }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.3", - "contentHash": "TB8zPGV2nVpvWq5C8zIVHPSmnzOHMrXppjsAwHcuJq1Ehs8sC0llnAv5Ysf5Lf/vew9amV/+01MohtRFSDzKdQ==", + "resolved": "5.3.2", + "contentHash": "v6swUNj9KHH4tWKH3+eCuFsp/BfpkWmbz1XPCIXb9fnSVsEHcfyRnfXjuksfMdIULgR/i1RzbQUU8WsNVpBglg==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.3" + "NLog": "5.2.2" } }, "NLog.Web.AspNetCore": { "type": "Transitive", - "resolved": "5.2.3", - "contentHash": "uP0KekbkswuMjo1dbaqu20TxH2Dc3ox2qJDIi837ob2Fq/BliZHuQY9nJdM3UArVrLrsl+xxsx0D6h8m3fOufg==", + "resolved": "5.3.2", + "contentHash": "SLBeDj30nu1sjc3DsPhTdXSL90915eeQknYbSCZOthccxqVJS1RZna0sh746kDaD21ktnYMubXT+gNWgn3oGpA==", "dependencies": { - "NLog.Extensions.Logging": "5.2.3" + "NLog.Extensions.Logging": "5.3.2" } }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "Polly": { "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "RabbitMQ.Client": { "type": "Transitive", @@ -1782,10 +1772,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -1798,8 +1788,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1851,30 +1841,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1882,11 +1872,11 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "ZstdSharp.Port": { @@ -1897,14 +1887,14 @@ "monai.deploy.informaticsgateway": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "DotNext.Threading": "[4.7.4, )", "HL7-dotnetcore": "[2.35.0, )", "Karambolo.Extensions.Logging.File": "[3.4.0, )", - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.20, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.20, )", "Microsoft.Extensions.Hosting": "[6.0.1, )", "Microsoft.Extensions.Logging": "[6.0.0, )", "Microsoft.Extensions.Logging.Console": "[6.0.0, )", @@ -1916,52 +1906,51 @@ "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.DicomWeb.Client": "[1.0.0, )", - "Monai.Deploy.Messaging.RabbitMQ": "[0.1.22, )", + "Monai.Deploy.Messaging.RabbitMQ": "[0.1.23, )", "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage": "[0.2.16, )", "Monai.Deploy.Storage.MinIO": "[0.2.16, )", - "NLog": "[5.1.3, )", - "NLog.Web.AspNetCore": "[5.2.3, )", - "Polly": "[7.2.3, )", + "NLog": "[5.2.2, )", + "NLog.Web.AspNetCore": "[5.3.2, )", + "Polly": "[7.2.4, )", "Swashbuckle.AspNetCore": "[6.5.0, )", - "fo-dicom": "[5.0.3, )", - "fo-dicom.NLog": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } @@ -1970,11 +1959,11 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.20, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -1986,17 +1975,17 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Polly": "[7.2.4, )" } }, "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.20, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", @@ -2009,20 +1998,20 @@ "type": "Project", "dependencies": { "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "MongoDB.Driver": "[2.19.1, )", - "MongoDB.Driver.Core": "[2.19.1, )" + "MongoDB.Driver": "[2.20.0, )", + "MongoDB.Driver.Core": "[2.20.0, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", "Microsoft.Extensions.Http": "[6.0.0, )", "Microsoft.Net.Http.Headers": "[2.2.8, )", "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", "System.Linq.Async": "[6.0.1, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.test.plugins": { diff --git a/src/InformaticsGateway/appsettings.Development.json b/src/InformaticsGateway/appsettings.Development.json index 0f7a87d93..544cb9858 100644 --- a/src/InformaticsGateway/appsettings.Development.json +++ b/src/InformaticsGateway/appsettings.Development.json @@ -16,16 +16,16 @@ }, "messaging": { "publisherSettings": { - "endpoint": "localhost", - "username": "admin", - "password": "admin", + "endpoint": "127.0.0.1", + "username": "rabbitmq", + "password": "rabbitmq", "virtualHost": "monaideploy", "exchange": "monaideploy" }, "subscriberSettings": { - "endpoint": "localhost", - "username": "admin", - "password": "admin", + "endpoint": "127.0.0.1", + "username": "rabbitmq", + "password": "rabbitmq", "virtualHost": "monaideploy", "exchange": "monaideploy", "exportRequestQueue": "export_tasks" @@ -35,7 +35,7 @@ "concurrentUploads": 5, "localTemporaryStoragePath": "./payloads", "settings": { - "endpoint": "localhost:9000", + "endpoint": "127.0.0.1:9000", "accessKey": "minioadmin", "accessToken": "minioadmin", "securedConnection": false diff --git a/src/InformaticsGateway/packages.lock.json b/src/InformaticsGateway/packages.lock.json index 5c5e8d40f..f2a4bee04 100644 --- a/src/InformaticsGateway/packages.lock.json +++ b/src/InformaticsGateway/packages.lock.json @@ -4,12 +4,9 @@ "net6.0": { "Ardalis.GuardClauses": { "type": "Direct", - "requested": "[4.0.1, )", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "requested": "[4.1.1, )", + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "DotNext.Threading": { "type": "Direct", @@ -23,31 +20,23 @@ }, "fo-dicom": { "type": "Direct", - "requested": "[5.0.3, )", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "requested": "[5.1.1, )", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "dependencies": { + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "fo-dicom.NLog": { - "type": "Direct", - "requested": "[5.0.3, )", - "resolved": "5.0.3", - "contentHash": "k35FD+C9IcpTLjCF5tvCkBGUxJ+YvzoBsgb2VAtGQv+aVTu+HyoCnNVqccc4lVE53fbVCwpR3gPiTAnm5fm+KQ==", - "dependencies": { - "NLog": "4.7.11", - "fo-dicom": "5.0.3" - } - }, "HL7-dotnetcore": { "type": "Direct", "requested": "[2.35.0, )", @@ -68,12 +57,12 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -89,19 +78,19 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "qWT4ldcOylWZa+GXFePyAJSQ9d/gWzKIL2KdFCkudZpzMjeTUPpqMhIwZdJNvCupi/ercnUT3Ru1RI/rWwX8aA==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "jIWboFkp6O/G3wF6JwQq8A5AR5TcZbCRzXdBhaYgVAGiWexb95/2JkytGFrJJ44pBiWO76jpOT4vShGLAgf1HQ==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "WV5KDOKX0OmqzxZ6yA5DpcJY05ARD0TtJo47+cjSpptII8rO/KhDDQuW9RXxneTx0oVKcc50EOJhZZdEKk+M0A==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15" + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20" } }, "Microsoft.Extensions.Hosting": { @@ -172,11 +161,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.22, )", - "resolved": "0.1.22", - "contentHash": "ZJEHtM4NaX8UzvG+w1coKOivbCecoU6hx8g06PGKkg6giIeLGqCi2FDkP89kIPq7Kz1RB9cLVvYdXY9Rs+ZDSg==", + "requested": "[0.1.23, )", + "resolved": "0.1.23", + "contentHash": "+Y1eLKz9FtPbASOVtTaM1ktyUqOxmyIjksNukZ8dUhtDJrT3CF9ISw6BGajxwJfq2jUjacli3jNSc1OAnLJRcQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.22", + "Monai.Deploy.Messaging": "0.1.23", "Polly": "7.2.3", "RabbitMQ.Client": "6.4.0", "System.Collections.Concurrent": "4.3.0" @@ -229,24 +218,24 @@ }, "NLog": { "type": "Direct", - "requested": "[5.1.3, )", - "resolved": "5.1.3", - "contentHash": "rB8hwjBf1EZCfG5iPfsv3gPksLoJLr1cOrt7PBbJu6VpJgwYJchDzTUT1dhNDdPv0QakXJQJOhE59ErupcznQQ==" + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "r6Q9740g29gTwmTWlsgdIFm0mhNsfNZmbvWKX/Fxmi8X89ZrpUowHM2T2X1lP7RVpND+ef+XnfKL5g6Q1iNGXA==" }, "NLog.Web.AspNetCore": { "type": "Direct", - "requested": "[5.2.3, )", - "resolved": "5.2.3", - "contentHash": "uP0KekbkswuMjo1dbaqu20TxH2Dc3ox2qJDIi837ob2Fq/BliZHuQY9nJdM3UArVrLrsl+xxsx0D6h8m3fOufg==", + "requested": "[5.3.2, )", + "resolved": "5.3.2", + "contentHash": "SLBeDj30nu1sjc3DsPhTdXSL90915eeQknYbSCZOthccxqVJS1RZna0sh746kDaD21ktnYMubXT+gNWgn3oGpA==", "dependencies": { - "NLog.Extensions.Logging": "5.2.3" + "NLog.Extensions.Logging": "5.3.2" } }, "Polly": { "type": "Direct", - "requested": "[7.2.3, )", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "requested": "[7.2.4, )", + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "Swashbuckle.AspNetCore": { "type": "Direct", @@ -282,6 +271,11 @@ "AWSSDK.Core": "[3.7.105.20, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "Crc32.NET": { "type": "Transitive", "resolved": "1.2.0", @@ -306,11 +300,6 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Macross.Json.Extensions": { "type": "Transitive", "resolved": "3.0.0", @@ -338,6 +327,11 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, "Microsoft.CSharp": { "type": "Transitive", "resolved": "4.7.0", @@ -345,47 +339,47 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "yE5Q7jJDuGUwS3FMV6N6oz7p7MrtqPrdanLHG6dVXPB3o4KQKLpkPPzUQPByGmBis6wIDGmbWunwjD0vH/qlFQ==", + "resolved": "6.0.20", + "contentHash": "k+namWYTxTS9t/JYDyZoTzQK95iLDrQTBTuEZu/zfbl2sm8DQ8taNJ2HkBw8tXvW2pM8yyAQbJjcPYzx/BUBuw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "ouk4es/CzwxjXl33mb2hJzitluc2CD9rujZVBaUy3w3fn8qMjlktMOhf5mIAS7e3sreBikOBwaxp9/y/N/O2NQ==", + "resolved": "6.0.20", + "contentHash": "TQX6xHu1puMviW+GSfLfDO1iGe3TE43D5+oyDEZ7xSXlrPnupxJoujjCNptZoEvUo4giEJQRvT9tlDKU1LhbQQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15", + "Microsoft.EntityFrameworkCore": "6.0.20", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "4oRXU58XmoDkK27wDMmIrZG9yaOYw8URmWNQzGkfO0ZCpELX/bx6rtb99eoBOOzA+a0QYoTLlugZB7MyM1XDbw==", + "resolved": "6.0.20", + "contentHash": "PT84DIPfxpdNOr8TuuEMP+2GRbUSHBugN34c05UExPFCPd3DaksEax1cZMC9qMCx29JBPCK8lAhnfFi1V18Yng==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.15", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.20", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "30gMAP29sWQ9yTSM/VXknmv8BcH9AVO+QHCpoDoAlzPnmL6STjJ5jihlOp1mvErGVTkEgnaIxmv4j3gX6knFRw==", + "resolved": "6.0.20", + "contentHash": "Demwm93dqVo0r9rFFrjZPNwnWjVFerp92IraGImsFGd8CH+zFhYaKa20Y1tPttDk3Bwj6CscIOWdAKB4Ei3tTQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.15", - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", + "Microsoft.Data.Sqlite.Core": "6.0.20", + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -515,12 +509,12 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.20", + "contentHash": "/uw/4EXx+tOWiqTVNbO0ooaFrrp06h68hI7XhOKyHRp7rdUi7SNmIsj0CCNE6PyZanfnQDwhNyaxG25u2HWpjg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, @@ -570,8 +564,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -709,11 +703,6 @@ "resolved": "1.2.3", "contentHash": "Nug3rO+7Kl5/SBAadzSMAVgqDlfGjJZ0GenQrLywJ84XGKO0uRqkunz5Wyl0SDwcR71bAATXvSdbdzPrYRYKGw==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -739,8 +728,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -762,33 +751,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==", + "resolved": "2.20.0", + "contentHash": "IXgb+uGslHBgy+JjfwepO06Vmq5itprTPJJtQotAhLMjmuDvbA7pfAs/2hTfqYbR39l7eli5bIwA3zqZHUkVlQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==", + "resolved": "2.20.0", + "contentHash": "pAxVtrIRTTuQG3xMBF3NfWumXqf/JT0i7eEzp06k4zin8zj1sroX0J/i/qzJ9JjHQMh3BSsQ4E209G5S6zkxrg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Driver.Core": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.20.0", + "MongoDB.Driver.Core": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==", + "resolved": "2.20.0", + "contentHash": "YIRUQnl/aHjZbvwoVHhlUi5ofoZs/6HRllpxZrSseB52IJPmhYclppApAUb/TETIx7mPxcoZgHVVQKnwYQQCVg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -797,8 +786,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "NETStandard.Library": { "type": "Transitive", @@ -824,12 +813,12 @@ }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.3", - "contentHash": "TB8zPGV2nVpvWq5C8zIVHPSmnzOHMrXppjsAwHcuJq1Ehs8sC0llnAv5Ysf5Lf/vew9amV/+01MohtRFSDzKdQ==", + "resolved": "5.3.2", + "contentHash": "v6swUNj9KHH4tWKH3+eCuFsp/BfpkWmbz1XPCIXb9fnSVsEHcfyRnfXjuksfMdIULgR/i1RzbQUU8WsNVpBglg==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.3" + "NLog": "5.2.2" } }, "RabbitMQ.Client": { @@ -1493,10 +1482,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -1509,8 +1498,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1564,36 +1553,36 @@ "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } @@ -1602,11 +1591,11 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.20, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -1618,17 +1607,17 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Polly": "[7.2.4, )" } }, "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.20, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", @@ -1641,20 +1630,20 @@ "type": "Project", "dependencies": { "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "MongoDB.Driver": "[2.19.1, )", - "MongoDB.Driver.Core": "[2.19.1, )" + "MongoDB.Driver": "[2.20.0, )", + "MongoDB.Driver.Core": "[2.20.0, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", "Microsoft.Extensions.Http": "[6.0.0, )", "Microsoft.Net.Http.Headers": "[2.2.8, )", "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", "System.Linq.Async": "[6.0.1, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } } } diff --git a/tests/Integration.Test/Common/Assertions.cs b/tests/Integration.Test/Common/Assertions.cs index 4d9eea3ee..09012a6bc 100644 --- a/tests/Integration.Test/Common/Assertions.cs +++ b/tests/Integration.Test/Common/Assertions.cs @@ -50,8 +50,8 @@ public Assertions(Configurations configurations, InformaticsGatewayConfiguration internal async Task ShouldHaveUploadedDicomDataToMinio(IReadOnlyList messages, Dictionary fileHashes, Action additionalChecks = null) { - Guard.Against.Null(messages); - Guard.Against.NullOrEmpty(fileHashes); + Guard.Against.Null(messages, nameof(messages)); + Guard.Against.NullOrEmpty(fileHashes, nameof(fileHashes)); var minioClient = GetMinioClient(); @@ -107,7 +107,7 @@ await _retryPolicy.ExecuteAsync(async () => internal async Task ShouldHaveUploadedFhirDataToMinio(IReadOnlyList messages, Dictionary fhirData) { - Guard.Against.Null(messages); + Guard.Against.Null(messages, nameof(messages)); var minioClient = GetMinioClient(); @@ -152,7 +152,7 @@ internal async Task ShouldHaveUploadedFhirDataToMinio(IReadOnlyList mes internal async Task ShouldHaveUploadedHl7ataToMinio(IReadOnlyList messages) { - Guard.Against.Null(messages); + Guard.Against.Null(messages, nameof(messages)); var minioClient = GetMinioClient(); @@ -196,8 +196,8 @@ internal async Task ShouldHaveUploadedHl7ataToMinio(IReadOnlyList messa internal void ShouldHaveCorrectNumberOfWorkflowRequestMessages(DataProvider dataProvider, IReadOnlyList messages, int count) { - Guard.Against.Null(dataProvider); - Guard.Against.Null(messages); + Guard.Against.Null(dataProvider, nameof(dataProvider)); + Guard.Against.Null(messages, nameof(messages)); messages.Should().NotBeNullOrEmpty().And.HaveCount(count); foreach (var message in messages) @@ -224,8 +224,8 @@ internal void ShouldHaveCorrectNumberOfWorkflowRequestMessages(DataProvider data internal void ShouldHaveCorrectNumberOfWorkflowRequestMessagesAndAcrRequest(DataProvider dataProvider, IReadOnlyList messages, int count) { - Guard.Against.Null(dataProvider); - Guard.Against.Null(messages); + Guard.Against.Null(dataProvider, nameof(dataProvider)); + Guard.Against.Null(messages, nameof(messages)); messages.Should().NotBeNullOrEmpty().And.HaveCount(count); @@ -241,8 +241,8 @@ internal void ShouldHaveCorrectNumberOfWorkflowRequestMessagesAndAcrRequest(Data internal void ShouldHaveCorrectNumberOfWorkflowRequestMessagesAndHl7Messages(Hl7Messages hL7Specs, IReadOnlyList messages, int count) { - Guard.Against.Null(hL7Specs); - Guard.Against.Null(messages); + Guard.Against.Null(hL7Specs, nameof(hL7Specs)); + Guard.Against.Null(messages, nameof(messages)); messages.Should().NotBeNullOrEmpty().And.HaveCount(count); diff --git a/tests/Integration.Test/Common/DataProvider.cs b/tests/Integration.Test/Common/DataProvider.cs index 069282473..9d2488e24 100644 --- a/tests/Integration.Test/Common/DataProvider.cs +++ b/tests/Integration.Test/Common/DataProvider.cs @@ -53,7 +53,7 @@ public DataProvider(Configurations configurations, ISpecFlowOutputHelper outputH internal void GenerateDicomData(string modality, int studyCount, int? seriesPerStudy = null) { - Guard.Against.NullOrWhiteSpace(modality); + Guard.Against.NullOrWhiteSpace(modality, nameof(modality)); _outputHelper.WriteLine($"Generating {studyCount} {modality} study"); _configurations.StudySpecs.ContainsKey(modality).Should().BeTrue(); @@ -86,7 +86,7 @@ internal void ReplaceGeneratedDicomDataWithHashes() internal void GenerateAcrRequest(string requestType) { - Guard.Against.NullOrWhiteSpace(requestType); + Guard.Against.NullOrWhiteSpace(requestType, nameof(requestType)); var inferenceRequest = new InferenceRequest(); inferenceRequest.TransactionId = Guid.NewGuid().ToString(); diff --git a/tests/Integration.Test/Common/DicomCEchoDataClient.cs b/tests/Integration.Test/Common/DicomCEchoDataClient.cs index b91a67725..49918c0e2 100644 --- a/tests/Integration.Test/Common/DicomCEchoDataClient.cs +++ b/tests/Integration.Test/Common/DicomCEchoDataClient.cs @@ -38,7 +38,7 @@ public DicomCEchoDataClient(Configurations configurations, InformaticsGatewayCon public async Task SendAsync(DataProvider dataProvider, params object[] args) { - Guard.Against.NullOrEmpty(args); + Guard.Against.NullOrEmpty(args, nameof(args)); var callingAeTitle = args[0].ToString(); var host = args[1].ToString(); diff --git a/tests/Integration.Test/Common/DicomCStoreDataClient.cs b/tests/Integration.Test/Common/DicomCStoreDataClient.cs index 5b4400860..d84b75765 100644 --- a/tests/Integration.Test/Common/DicomCStoreDataClient.cs +++ b/tests/Integration.Test/Common/DicomCStoreDataClient.cs @@ -43,7 +43,7 @@ public DicomCStoreDataClient(Configurations configurations, InformaticsGatewayCo public async Task SendAsync(DataProvider dataProvider, params object[] args) { - Guard.Against.NullOrEmpty(args); + Guard.Against.NullOrEmpty(args, nameof(args)); var callingAeTitle = args[0].ToString(); var host = args[1].ToString(); diff --git a/tests/Integration.Test/Common/DicomScp.cs b/tests/Integration.Test/Common/DicomScp.cs index 6858ca122..c563ffb17 100644 --- a/tests/Integration.Test/Common/DicomScp.cs +++ b/tests/Integration.Test/Common/DicomScp.cs @@ -16,8 +16,8 @@ using System.Text; using FellowOakDicom; -using FellowOakDicom.Log; using FellowOakDicom.Network; +using Microsoft.Extensions.Logging; using TechTalk.SpecFlow.Infrastructure; namespace Monai.Deploy.InformaticsGateway.Integration.Test.Common @@ -69,8 +69,8 @@ internal class CStoreScp : DicomService, IDicomServiceProvider, IDicomCStoreProv private static readonly object SyncLock = new object(); internal static readonly string PayloadsRoot = "./payloads"; - public CStoreScp(INetworkStream stream, Encoding fallbackEncoding, ILogger log, DicomServiceDependencies dicomServiceDependencies) - : base(stream, fallbackEncoding, log, dicomServiceDependencies) + public CStoreScp(INetworkStream stream, Encoding fallbackEncoding, ILogger logger, DicomServiceDependencies dicomServiceDependencies) + : base(stream, fallbackEncoding, logger, dicomServiceDependencies) { } diff --git a/tests/Integration.Test/Common/DicomWebDataSink.cs b/tests/Integration.Test/Common/DicomWebDataSink.cs index dc7f2e8f2..07ad2ee76 100644 --- a/tests/Integration.Test/Common/DicomWebDataSink.cs +++ b/tests/Integration.Test/Common/DicomWebDataSink.cs @@ -49,8 +49,8 @@ public DicomWebDataClient(Configurations configurations, InformaticsGatewayConfi /// public async Task SendAsync(DataProvider dataProvider, params object[] args) { - Guard.Against.Null(dataProvider); - Guard.Against.Null(args); + Guard.Against.Null(dataProvider, nameof(dataProvider)); + Guard.Against.Null(args, nameof(args)); var dicomFileSpec = dataProvider.DicomSpecs; dicomFileSpec.Should().NotBeNull(); diff --git a/tests/Integration.Test/Common/FhirDataSink.cs b/tests/Integration.Test/Common/FhirDataSink.cs index 1157cfcf2..5db77db96 100644 --- a/tests/Integration.Test/Common/FhirDataSink.cs +++ b/tests/Integration.Test/Common/FhirDataSink.cs @@ -38,7 +38,7 @@ public FhirDataClient(Configurations configurations, InformaticsGatewayConfigura public async Task SendAsync(DataProvider dataProvider, params object[] args) { - Guard.Against.Null(dataProvider); + Guard.Against.Null(dataProvider, nameof(dataProvider)); var httpClient = HttpClientFactory.Create(); httpClient.BaseAddress = new Uri($"{_configurations.InformaticsGatewayOptions.ApiEndpoint}/fhir/"); httpClient.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue(dataProvider.FhirSpecs.MediaType)); diff --git a/tests/Integration.Test/Common/Hl7DataSink.cs b/tests/Integration.Test/Common/Hl7DataSink.cs index 607d960f0..0c340e686 100644 --- a/tests/Integration.Test/Common/Hl7DataSink.cs +++ b/tests/Integration.Test/Common/Hl7DataSink.cs @@ -39,8 +39,8 @@ public Hl7DataClient(Configurations configurations, InformaticsGatewayConfigurat public async Task SendAsync(DataProvider dataProvider, params object[] args) { - Guard.Against.Null(dataProvider); - Guard.Against.NullOrEmpty(args); + Guard.Against.Null(dataProvider, nameof(dataProvider)); + Guard.Against.NullOrEmpty(args, nameof(args)); var batch = (bool)args[0]; diff --git a/tests/Integration.Test/Drivers/EfDataProvider.cs b/tests/Integration.Test/Drivers/EfDataProvider.cs index 2a8be5757..ea0a7202b 100644 --- a/tests/Integration.Test/Drivers/EfDataProvider.cs +++ b/tests/Integration.Test/Drivers/EfDataProvider.cs @@ -48,7 +48,7 @@ public EfDataProvider(ISpecFlowOutputHelper outputHelper, Configurations configu private string ConvertToFullPath(string connectionString) { - Guard.Against.NullOrWhiteSpace(connectionString); + Guard.Against.NullOrWhiteSpace(connectionString, nameof(connectionString)); string absolute = Path.GetFullPath("./"); return connectionString.Replace("=./", $"={absolute}"); diff --git a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj index e7db9ec11..b7ba6893a 100644 --- a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj +++ b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj @@ -24,30 +24,30 @@ - + - - + + - + - + - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Integration.Test/StepDefinitions/DicomDimseScpServicesStepDefinitions.cs b/tests/Integration.Test/StepDefinitions/DicomDimseScpServicesStepDefinitions.cs index 8135888fe..5f2e3a325 100644 --- a/tests/Integration.Test/StepDefinitions/DicomDimseScpServicesStepDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/DicomDimseScpServicesStepDefinitions.cs @@ -55,7 +55,7 @@ public DicomDimseScpServicesStepDefinitions( [Given(@"a calling AE Title '([^']*)'")] public async Task GivenACallingAETitle(string callingAeTitle) { - Guard.Against.NullOrWhiteSpace(callingAeTitle); + Guard.Against.NullOrWhiteSpace(callingAeTitle, nameof(callingAeTitle)); try { @@ -83,9 +83,9 @@ await _informaticsGatewayClient.DicomSources.Create(new SourceApplicationEntity [Given(@"(.*) (.*) studies with (.*) series per study")] public void GivenXStudiesWithYSeriesPerStudy(int studyCount, string modality, int seriesPerStudy) { - Guard.Against.NegativeOrZero(studyCount); - Guard.Against.NullOrWhiteSpace(modality); - Guard.Against.NegativeOrZero(seriesPerStudy); + Guard.Against.NegativeOrZero(studyCount, nameof(studyCount)); + Guard.Against.NullOrWhiteSpace(modality, nameof(modality)); + Guard.Against.NegativeOrZero(seriesPerStudy, nameof(seriesPerStudy)); _dataProvider.GenerateDicomData(modality, studyCount, seriesPerStudy); @@ -95,9 +95,9 @@ public void GivenXStudiesWithYSeriesPerStudy(int studyCount, string modality, in [Given(@"a called AE Title named '([^']*)' that groups by '([^']*)' for (.*) seconds")] public async Task GivenACalledAETitleNamedThatGroupsByForSeconds(string calledAeTitle, string grouping, uint groupingTimeout) { - Guard.Against.NullOrWhiteSpace(calledAeTitle); - Guard.Against.NullOrWhiteSpace(grouping); - Guard.Against.NegativeOrZero(groupingTimeout); + Guard.Against.NullOrWhiteSpace(calledAeTitle, nameof(calledAeTitle)); + Guard.Against.NullOrWhiteSpace(grouping, nameof(grouping)); + Guard.Against.NegativeOrZero(groupingTimeout, nameof(groupingTimeout)); _dataProvider.StudyGrouping = grouping; try @@ -131,15 +131,15 @@ await _informaticsGatewayClient.MonaiScpAeTitle.Create(new MonaiApplicationEntit [Given(@"a DICOM client configured with (.*) seconds timeout")] public void GivenADICOMClientConfiguredWithSecondsTimeout(int timeout) { - Guard.Against.NegativeOrZero(timeout); + Guard.Against.NegativeOrZero(timeout, nameof(timeout)); _dataProvider.ClientTimeout = timeout; } [Given(@"a DICOM client configured to send data over (.*) associations and wait (.*) between each association")] public void GivenADICOMClientConfiguredToSendDataOverAssociationsAndWaitSecondsBetweenEachAssociation(int associations, int pulseTime) { - Guard.Against.NegativeOrZero(associations); - Guard.Against.Negative(pulseTime); + Guard.Against.NegativeOrZero(associations, nameof(associations)); + Guard.Against.Negative(pulseTime, nameof(associations)); _dataProvider.ClientSendOverAssociations = associations; _dataProvider.ClientAssociationPulseTime = pulseTime; @@ -148,8 +148,8 @@ public void GivenADICOMClientConfiguredToSendDataOverAssociationsAndWaitSecondsB [When(@"a C-ECHO-RQ is sent to '([^']*)' from '([^']*)'")] public async Task WhenAC_ECHO_RQIsSentToFromWithTimeoutOfSeconds(string calledAeTitle, string callingAeTitle) { - Guard.Against.NullOrWhiteSpace(calledAeTitle); - Guard.Against.NullOrWhiteSpace(callingAeTitle); + Guard.Against.NullOrWhiteSpace(calledAeTitle, nameof(calledAeTitle)); + Guard.Against.NullOrWhiteSpace(callingAeTitle, nameof(callingAeTitle)); var echoScu = _objectContainer.Resolve("EchoSCU"); await echoScu.SendAsync( @@ -171,9 +171,9 @@ public void ThenASuccessfulResponseShouldBeReceived() [When(@"C-STORE-RQ are sent to '([^']*)' with AET '([^']*)' from '([^']*)'")] public async Task WhenAC_STORE_RQIsSentToWithAETFromWithTimeoutOfSeconds(string application, string calledAeTitle, string callingAeTitle) { - Guard.Against.NullOrWhiteSpace(application); - Guard.Against.NullOrWhiteSpace(calledAeTitle); - Guard.Against.NullOrWhiteSpace(callingAeTitle); + Guard.Against.NullOrWhiteSpace(application, nameof(application)); + Guard.Against.NullOrWhiteSpace(calledAeTitle, nameof(calledAeTitle)); + Guard.Against.NullOrWhiteSpace(callingAeTitle, nameof(callingAeTitle)); var storeScu = _objectContainer.Resolve("StoreSCU"); diff --git a/tests/Integration.Test/StepDefinitions/DicomWebStowServiceStepDefinitions.cs b/tests/Integration.Test/StepDefinitions/DicomWebStowServiceStepDefinitions.cs index 63df359e7..7edcf6d1f 100644 --- a/tests/Integration.Test/StepDefinitions/DicomWebStowServiceStepDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/DicomWebStowServiceStepDefinitions.cs @@ -46,8 +46,8 @@ public DicomWebStowServiceStepDefinitions(ObjectContainer objectContainer, Confi [Given(@"(.*) (.*) studies with '(.*)' grouping")] public void GivenNStudies(int studyCount, string modality, string grouping) { - Guard.Against.NegativeOrZero(studyCount); - Guard.Against.NullOrWhiteSpace(modality); + Guard.Against.NegativeOrZero(studyCount, nameof(studyCount)); + Guard.Against.NullOrWhiteSpace(modality, nameof(modality)); _dataProvider.GenerateDicomData(modality, studyCount); _dataProvider.StudyGrouping = grouping; @@ -57,7 +57,7 @@ public void GivenNStudies(int studyCount, string modality, string grouping) [Given(@"a workflow named '(.*)'")] public void GivenNStudies(string workflowName) { - Guard.Against.NullOrWhiteSpace(workflowName); + Guard.Against.NullOrWhiteSpace(workflowName, nameof(workflowName)); _dataProvider.Workflows = new string[] { workflowName }; } @@ -65,7 +65,7 @@ public void GivenNStudies(string workflowName) [When(@"the studies are uploaded to the DICOMWeb STOW-RS service at '([^']*)'")] public async Task WhenStudiesAreUploadedToTheDicomWebStowRSServiceWithoutStudyInstanceUID(string endpoint) { - Guard.Against.NullOrWhiteSpace(endpoint); + Guard.Against.NullOrWhiteSpace(endpoint, nameof(endpoint)); await _dataSink.SendAsync(_dataProvider, $"{_configurations.InformaticsGatewayOptions.ApiEndpoint}{endpoint}", _dataProvider.Workflows, async (DicomWebClient dicomWebClient, DicomDataSpecs specs) => { @@ -77,7 +77,7 @@ await _dataSink.SendAsync(_dataProvider, $"{_configurations.InformaticsGatewayOp [When(@"the studies are uploaded to the DICOMWeb STOW-RS service at '([^']*)' with StudyInstanceUid")] public async Task WhenStudiesAreUploadedToTheDicomWebStowRSServiceWithStudyInstanceUID(string endpoint) { - Guard.Against.NullOrWhiteSpace(endpoint); + Guard.Against.NullOrWhiteSpace(endpoint, nameof(endpoint)); await _dataSink.SendAsync(_dataProvider, $"{_configurations.InformaticsGatewayOptions.ApiEndpoint}{endpoint}", _dataProvider.Workflows, async (DicomWebClient dicomWebClient, DicomDataSpecs specs) => { diff --git a/tests/Integration.Test/StepDefinitions/ExportServicesStepDefinitions.cs b/tests/Integration.Test/StepDefinitions/ExportServicesStepDefinitions.cs index ecdce7b2e..a889c7307 100644 --- a/tests/Integration.Test/StepDefinitions/ExportServicesStepDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/ExportServicesStepDefinitions.cs @@ -103,8 +103,8 @@ public async Task GivenDICOMInstances() [Given(@"(.*) (.*) studies for export")] public async Task GivenDICOMInstances(int studyCount, string modality) { - Guard.Against.NegativeOrZero(studyCount); - Guard.Against.NullOrWhiteSpace(modality); + Guard.Against.NegativeOrZero(studyCount, nameof(studyCount)); + Guard.Against.NullOrWhiteSpace(modality, nameof(modality)); _dataProvider.GenerateDicomData(modality, studyCount); await _dataSink.SendAsync(_dataProvider); @@ -114,7 +114,7 @@ public async Task GivenDICOMInstances(int studyCount, string modality) [When(@"a export request is sent for '([^']*)'")] public void WhenAExportRequestIsReceivedDesignatedFor(string routingKey) { - Guard.Against.NullOrWhiteSpace(routingKey); + Guard.Against.NullOrWhiteSpace(routingKey, nameof(routingKey)); var exportRequestEvent = new ExportRequestEvent { diff --git a/tests/Integration.Test/StepDefinitions/FhirDefinitions.cs b/tests/Integration.Test/StepDefinitions/FhirDefinitions.cs index 468b6a682..de45b5a69 100644 --- a/tests/Integration.Test/StepDefinitions/FhirDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/FhirDefinitions.cs @@ -53,8 +53,8 @@ public FhirDefinitions(ObjectContainer objectContainer) [Given(@"FHIR message (.*) in (.*)")] public async Task GivenHl7MessagesInVersionX(string version, string format) { - Guard.Against.NullOrWhiteSpace(version); - Guard.Against.NullOrWhiteSpace(format); + Guard.Against.NullOrWhiteSpace(version, nameof(version)); + Guard.Against.NullOrWhiteSpace(format, nameof(format)); await _dataProvider.GenerateFhirMessages(version, format); _receivedMessages.ClearMessages(); diff --git a/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs b/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs index 62b00d05d..9a8d94399 100644 --- a/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs +++ b/tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs @@ -47,7 +47,7 @@ public HealthLevel7Definitions(ObjectContainer objectContainer) [Given(@"HL7 messages in version (.*)")] public async Task GivenHl7MessagesInVersionX(string version) { - Guard.Against.NullOrWhiteSpace(version); + Guard.Against.NullOrWhiteSpace(version, nameof(version)); await _dataProvider.GenerateHl7Messages(version); _receivedMessages.ClearMessages(); } diff --git a/tests/Integration.Test/StepDefinitions/SharedDefinitions.cs b/tests/Integration.Test/StepDefinitions/SharedDefinitions.cs index 47976961b..25be1b7a6 100644 --- a/tests/Integration.Test/StepDefinitions/SharedDefinitions.cs +++ b/tests/Integration.Test/StepDefinitions/SharedDefinitions.cs @@ -49,8 +49,8 @@ public SharedDefinitions(ObjectContainer objectContainer) [Given(@"(.*) (.*) studies")] public void GivenNStudies(int studyCount, string modality) { - Guard.Against.NegativeOrZero(studyCount); - Guard.Against.NullOrWhiteSpace(modality); + Guard.Against.NegativeOrZero(studyCount, nameof(studyCount)); + Guard.Against.NullOrWhiteSpace(modality, nameof(modality)); _dataProvider.GenerateDicomData(modality, studyCount); @@ -60,7 +60,7 @@ public void GivenNStudies(int studyCount, string modality) [Then(@"(.*) workflow requests sent to message broker")] public async Task ThenWorkflowRequestSentToMessageBrokerAsync(int workflowCount) { - Guard.Against.NegativeOrZero(workflowCount); + Guard.Against.NegativeOrZero(workflowCount, nameof(workflowCount)); (await _receivedMessages.WaitforAsync(workflowCount, MessageWaitTimeSpan)).Should().BeTrue(); _assertions.ShouldHaveCorrectNumberOfWorkflowRequestMessages(_dataProvider, _receivedMessages.Messages, workflowCount); diff --git a/tests/Integration.Test/packages.lock.json b/tests/Integration.Test/packages.lock.json index 88627f1f8..d0b0fc547 100644 --- a/tests/Integration.Test/packages.lock.json +++ b/tests/Integration.Test/packages.lock.json @@ -4,27 +4,29 @@ "net6.0": { "FluentAssertions": { "type": "Direct", - "requested": "[6.10.0, )", - "resolved": "6.10.0", - "contentHash": "Da3YsiRDnOHKBfxutjnupL1rOX0K/jnG6crn5AgwukeqZ/yi+HNCOFshic01ke0ztZFWzpfQMXH8fO9aAbG0Gw==", + "requested": "[6.11.0, )", + "resolved": "6.11.0", + "contentHash": "aBaagwdNtVKkug1F3imGXUlmoBd8ZUZX8oQ5niThaJhF79SpESe1Gzq7OFuZkQdKD5Pa4Mone+jrbas873AT4g==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } }, "fo-dicom": { "type": "Direct", - "requested": "[5.0.3, )", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "requested": "[5.1.1, )", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "dependencies": { + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -36,12 +38,12 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "o51dv+X1Fv1/oPCWtCED4tTov4aBWD59ebkY5BW5K/8hwu+X+AfWpN1/bCBuS/3OPW24RuZmGfigByRMlG/fIA==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "2QugBMcDfJaYs6UyT70XrIEdbQtJghuJXt4G5vCiTMH9PizOKqlBwlgPZxVKve02fLwjGBflePzkqcEHowZJOA==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.15", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.15", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.20", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.20", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -51,11 +53,11 @@ }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "4oRXU58XmoDkK27wDMmIrZG9yaOYw8URmWNQzGkfO0ZCpELX/bx6rtb99eoBOOzA+a0QYoTLlugZB7MyM1XDbw==", + "requested": "[6.0.20, )", + "resolved": "6.0.20", + "contentHash": "PT84DIPfxpdNOr8TuuEMP+2GRbUSHBugN34c05UExPFCPd3DaksEax1cZMC9qMCx29JBPCK8lAhnfFi1V18Yng==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.15", + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.20", "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, @@ -103,12 +105,12 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.6.3, )", + "resolved": "17.6.3", + "contentHash": "MglaNTl646dC2xpHKotSk1xscmHO5uV3x3NK057IUA9BM3Wgl16WMEb9ptGczk518JfLd1+Th5OAYwnoWgHQQQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.6.3", + "Microsoft.TestPlatform.TestHost": "17.6.3" } }, "Minio": { @@ -128,11 +130,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.22, )", - "resolved": "0.1.22", - "contentHash": "ZJEHtM4NaX8UzvG+w1coKOivbCecoU6hx8g06PGKkg6giIeLGqCi2FDkP89kIPq7Kz1RB9cLVvYdXY9Rs+ZDSg==", + "requested": "[0.1.23, )", + "resolved": "0.1.23", + "contentHash": "+Y1eLKz9FtPbASOVtTaM1ktyUqOxmyIjksNukZ8dUhtDJrT3CF9ISw6BGajxwJfq2jUjacli3jNSc1OAnLJRcQ==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.22", + "Monai.Deploy.Messaging": "0.1.23", "Polly": "7.2.3", "RabbitMQ.Client": "6.4.0", "System.Collections.Concurrent": "4.3.0" @@ -164,9 +166,9 @@ }, "Polly": { "type": "Direct", - "requested": "[7.2.3, )", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "requested": "[7.2.4, )", + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "RabbitMQ.Client": { "type": "Direct", @@ -212,28 +214,25 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AspNetCore.HealthChecks.MongoDb": { "type": "Transitive", @@ -270,6 +269,11 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "Crc32.NET": { "type": "Transitive", "resolved": "1.2.0", @@ -303,25 +307,11 @@ "System.Threading.Channels": "6.0.0" } }, - "fo-dicom.NLog": { - "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "k35FD+C9IcpTLjCF5tvCkBGUxJ+YvzoBsgb2VAtGQv+aVTu+HyoCnNVqccc4lVE53fbVCwpR3gPiTAnm5fm+KQ==", - "dependencies": { - "NLog": "4.7.11", - "fo-dicom": "5.0.3" - } - }, "Gherkin": { "type": "Transitive", "resolved": "19.0.3", "contentHash": "kq9feqMojMj9aABrHb/ABEPaH2Y4dSclseSahAru6qxCeqVQNLLTgw/6vZMauzI1yBUL2fz03ub5yEd5btLfvg==" }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, "Karambolo.Extensions.Logging.File": { "type": "Transitive", "resolved": "3.4.0", @@ -360,10 +350,15 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.6.3", + "contentHash": "Gorg6F1dOxlI28yHYKhbQ3pOOfHeW6sUfsmwFQFaIV+xttUAZ+l8KarHIfsR+rBAnjY9VH71BXvPXBuObCkXsw==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -372,38 +367,38 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "yE5Q7jJDuGUwS3FMV6N6oz7p7MrtqPrdanLHG6dVXPB3o4KQKLpkPPzUQPByGmBis6wIDGmbWunwjD0vH/qlFQ==", + "resolved": "6.0.20", + "contentHash": "k+namWYTxTS9t/JYDyZoTzQK95iLDrQTBTuEZu/zfbl2sm8DQ8taNJ2HkBw8tXvW2pM8yyAQbJjcPYzx/BUBuw==", "dependencies": { "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "seE5q7/0R1LmWiQcd5pZYzlY8WdVojv2tk+5o0p4HrEvliOysomjIOYVEEHJnK9NwXqHBcZra4b+RwzgWYdbzA==" + "resolved": "6.0.20", + "contentHash": "BCwJHvUs2e2XXhP5ViDrqyGoaXXL8JxZhs6LhcTANlzlO3Uh7+WX3rhXHM0hDRT5VnWy0vUhj41wRAwhvAcwvA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "0ZKFq5irkVVyPJmQDorRsWxXy85wKm+UPO8J6pf2h1ggGl1CkhlXa+bteM8NBo++Cfylv8cBSo8ZfQZHV57fIg==" + "resolved": "6.0.20", + "contentHash": "uQQlLdkMTzGq1Pms4Hp5IgiypbmLAWqra3+F4CtfKsKdkyvY2jib81Q/hPCIXo/lzi6FCePRQLJmxaQ6SuM28Q==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "ouk4es/CzwxjXl33mb2hJzitluc2CD9rujZVBaUy3w3fn8qMjlktMOhf5mIAS7e3sreBikOBwaxp9/y/N/O2NQ==", + "resolved": "6.0.20", + "contentHash": "TQX6xHu1puMviW+GSfLfDO1iGe3TE43D5+oyDEZ7xSXlrPnupxJoujjCNptZoEvUo4giEJQRvT9tlDKU1LhbQQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.15", + "Microsoft.EntityFrameworkCore": "6.0.20", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "30gMAP29sWQ9yTSM/VXknmv8BcH9AVO+QHCpoDoAlzPnmL6STjJ5jihlOp1mvErGVTkEgnaIxmv4j3gX6knFRw==", + "resolved": "6.0.20", + "contentHash": "Demwm93dqVo0r9rFFrjZPNwnWjVFerp92IraGImsFGd8CH+zFhYaKa20Y1tPttDk3Bwj6CscIOWdAKB4Ei3tTQ==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.15", - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", + "Microsoft.Data.Sqlite.Core": "6.0.20", + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -500,28 +495,28 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==", + "resolved": "6.0.20", + "contentHash": "/uw/4EXx+tOWiqTVNbO0ooaFrrp06h68hI7XhOKyHRp7rdUi7SNmIsj0CCNE6PyZanfnQDwhNyaxG25u2HWpjg==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Logging.Abstractions": "6.0.4", "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg==" + "resolved": "6.0.20", + "contentHash": "qWT4ldcOylWZa+GXFePyAJSQ9d/gWzKIL2KdFCkudZpzMjeTUPpqMhIwZdJNvCupi/ercnUT3Ru1RI/rWwX8aA==" }, "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.15", - "contentHash": "jIWboFkp6O/G3wF6JwQq8A5AR5TcZbCRzXdBhaYgVAGiWexb95/2JkytGFrJJ44pBiWO76jpOT4vShGLAgf1HQ==", + "resolved": "6.0.20", + "contentHash": "WV5KDOKX0OmqzxZ6yA5DpcJY05ARD0TtJo47+cjSpptII8rO/KhDDQuW9RXxneTx0oVKcc50EOJhZZdEKk+M0A==", "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15" + "Microsoft.EntityFrameworkCore.Relational": "6.0.20", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -610,8 +605,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg==" + "resolved": "6.0.4", + "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -773,27 +768,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.6.3", + "contentHash": "gSqtX3RvcFisaLPs6sKXdZkSwUix83NQ9nOU/w6pYrHTl+d8GsVHSL9rvDNxMgoV5BNOdyU7zK7JOfbSaVMDWQ==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.6.3", + "contentHash": "lrgRXKFfIZSPlhuoQGLtciO/osL+4oADYEYb0d5or7n7YyJATIWespq3lRgz2IQpRh6N7cm0DnCOWeZiCRGzxA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.6.3", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -805,8 +795,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.22", - "contentHash": "pFZBuV3TaZvZJz8wTib8G/Doa/XHkM8uv12VtuLkQc7lI8AbJmH1eIHnpRliyuKPmw7VMhOMiS7JhyqutC0uvQ==", + "resolved": "0.1.23", + "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -856,33 +846,33 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==", + "resolved": "2.20.0", + "contentHash": "IXgb+uGslHBgy+JjfwepO06Vmq5itprTPJJtQotAhLMjmuDvbA7pfAs/2hTfqYbR39l7eli5bIwA3zqZHUkVlQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==", + "resolved": "2.20.0", + "contentHash": "pAxVtrIRTTuQG3xMBF3NfWumXqf/JT0i7eEzp06k4zin8zj1sroX0J/i/qzJ9JjHQMh3BSsQ4E209G5S6zkxrg==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Driver.Core": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.20.0", + "MongoDB.Driver.Core": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.1", - "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==", + "resolved": "2.20.0", + "contentHash": "YIRUQnl/aHjZbvwoVHhlUi5ofoZs/6HRllpxZrSseB52IJPmhYclppApAUb/TETIx7mPxcoZgHVVQKnwYQQCVg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.1", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.20.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -891,8 +881,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "NETStandard.Library": { "type": "Transitive", @@ -918,31 +908,31 @@ }, "NLog": { "type": "Transitive", - "resolved": "5.1.3", - "contentHash": "rB8hwjBf1EZCfG5iPfsv3gPksLoJLr1cOrt7PBbJu6VpJgwYJchDzTUT1dhNDdPv0QakXJQJOhE59ErupcznQQ==" + "resolved": "5.2.2", + "contentHash": "r6Q9740g29gTwmTWlsgdIFm0mhNsfNZmbvWKX/Fxmi8X89ZrpUowHM2T2X1lP7RVpND+ef+XnfKL5g6Q1iNGXA==" }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.3", - "contentHash": "TB8zPGV2nVpvWq5C8zIVHPSmnzOHMrXppjsAwHcuJq1Ehs8sC0llnAv5Ysf5Lf/vew9amV/+01MohtRFSDzKdQ==", + "resolved": "5.3.2", + "contentHash": "v6swUNj9KHH4tWKH3+eCuFsp/BfpkWmbz1XPCIXb9fnSVsEHcfyRnfXjuksfMdIULgR/i1RzbQUU8WsNVpBglg==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.3" + "NLog": "5.2.2" } }, "NLog.Web.AspNetCore": { "type": "Transitive", - "resolved": "5.2.3", - "contentHash": "uP0KekbkswuMjo1dbaqu20TxH2Dc3ox2qJDIi837ob2Fq/BliZHuQY9nJdM3UArVrLrsl+xxsx0D6h8m3fOufg==", + "resolved": "5.3.2", + "contentHash": "SLBeDj30nu1sjc3DsPhTdXSL90915eeQknYbSCZOthccxqVJS1RZna0sh746kDaD21ktnYMubXT+gNWgn3oGpA==", "dependencies": { - "NLog.Extensions.Logging": "5.2.3" + "NLog.Extensions.Logging": "5.3.2" } }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -1663,10 +1653,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -1679,8 +1669,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.8", + "contentHash": "WhW6zPEgRZoo+c1NEvSSmrME4+LqXmW6tcsRFsEiSMeco+qZ9rpLs7tT53EIkE/s9GNTYS4/STQoaGiKDSWifQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1737,30 +1727,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1768,11 +1758,11 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "Xunit.SkippableFact": { @@ -1792,14 +1782,14 @@ "monai.deploy.informaticsgateway": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "DotNext.Threading": "[4.7.4, )", "HL7-dotnetcore": "[2.35.0, )", "Karambolo.Extensions.Logging.File": "[3.4.0, )", - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.20, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.20, )", "Microsoft.Extensions.Hosting": "[6.0.1, )", "Microsoft.Extensions.Logging": "[6.0.0, )", "Microsoft.Extensions.Logging.Console": "[6.0.0, )", @@ -1811,25 +1801,24 @@ "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.DicomWeb.Client": "[1.0.0, )", - "Monai.Deploy.Messaging.RabbitMQ": "[0.1.22, )", + "Monai.Deploy.Messaging.RabbitMQ": "[0.1.23, )", "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage": "[0.2.16, )", "Monai.Deploy.Storage.MinIO": "[0.2.16, )", - "NLog": "[5.1.3, )", - "NLog.Web.AspNetCore": "[5.2.3, )", - "Polly": "[7.2.3, )", + "NLog": "[5.2.2, )", + "NLog.Web.AspNetCore": "[5.3.2, )", + "Polly": "[7.2.4, )", "Swashbuckle.AspNetCore": "[6.5.0, )", - "fo-dicom": "[5.0.3, )", - "fo-dicom.NLog": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )", + "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -1845,27 +1834,27 @@ "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "[4.1.1, )", + "System.Text.Json": "[6.0.8, )" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "System.IO.Abstractions": "[17.2.3, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.22, )", + "Monai.Deploy.Messaging": "[0.1.23, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } @@ -1874,11 +1863,11 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.20, )", "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", @@ -1890,17 +1879,17 @@ "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Polly": "[7.2.4, )" } }, "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.15, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.15, )", + "Microsoft.EntityFrameworkCore": "[6.0.20, )", + "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.20, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", @@ -1913,20 +1902,20 @@ "type": "Project", "dependencies": { "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "MongoDB.Driver": "[2.19.1, )", - "MongoDB.Driver.Core": "[2.19.1, )" + "MongoDB.Driver": "[2.20.0, )", + "MongoDB.Driver.Core": "[2.20.0, )" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", + "Ardalis.GuardClauses": "[4.1.1, )", "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", "Microsoft.Extensions.Http": "[6.0.0, )", "Microsoft.Net.Http.Headers": "[2.2.8, )", "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", "System.Linq.Async": "[6.0.1, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.informaticsgateway.test.plugins": {