diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index d67c51611..d184cfa6c 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -795,14 +795,14 @@ - :who: neilsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - - 0.1.23 + - 0.1.24 :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.23 + - 0.1.24 :when: 2022-08-16 23:06:21.511789690 Z - - :approve - Monai.Deploy.Storage @@ -838,7 +838,7 @@ :why: BSD 3-Clause License ( https://raw.githubusercontent.com/moq/moq4/main/License.txt) :versions: - 4.18.1 - - 4.18.4 + - 4.20.1 :when: 2022-08-16 23:06:23.359197359 Z - - :approve - NETStandard.Library @@ -897,7 +897,7 @@ - :who: mocsharp :why: Apache-2.0 (https://github.com/rabbitmq/rabbitmq-dotnet-client/raw/main/LICENSE-APACHE2) :versions: - - 6.4.0 + - 6.5.0 :when: 2022-08-16 23:06:28.818109746 Z - - :approve - SQLitePCLRaw.bundle_e_sqlite3 @@ -1299,6 +1299,7 @@ :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - 4.5.4 + - 4.5.5 :when: 2022-08-16 23:06:55.672403035 Z - - :approve - System.Net.Http @@ -1694,6 +1695,7 @@ :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - 6.0.0 + - 7.0.0 :when: 2022-08-16 23:07:22.653576384 Z - - :approve - System.Threading.Overlapped @@ -2295,21 +2297,21 @@ - :who: mocsharp :why: BSD 3-Clause License (https://github.com/NLog/NLog/raw/dev/LICENSE.txt) :versions: - - 5.2.2 + - 5.2.3 :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.3.2 + - 5.3.3 :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.3.2 + - 5.3.3 :when: 2022-10-12 03:14:07.396706995 Z - - :approve - fo-dicom.NLog @@ -2458,5 +2460,15 @@ :versions: - 1.1.1 :when: 2023-08-04 0:02:30.206982078 Z +- - :approve + - Devlooped.SponsorLink + - :who: mocsharp + :why: MIT (https://licenses.nuget.org/MIT) + :versions: + - 1.0.0 + :when: 2023-08-08 0:08:05.206982078 Z + + + diff --git a/docs/compliance/third-party-licenses.md b/docs/compliance/third-party-licenses.md index 9fa2ebdd9..1af67b8e2 100644 --- a/docs/compliance/third-party-licenses.md +++ b/docs/compliance/third-party-licenses.md @@ -7304,14 +7304,14 @@ Apache License
-Monai.Deploy.Messaging 0.1.21 +Monai.Deploy.Messaging 0.1.24 ## Monai.Deploy.Messaging -- Version: 0.1.21 +- Version: 0.1.24 - Authors: MONAI Consortium - Project URL: https://github.com/Project-MONAI/monai-deploy-messaging -- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging/0.1.21) +- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging/0.1.24) - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) @@ -7532,14 +7532,14 @@ By downloading this software, you agree to the license terms & all licenses list
-Monai.Deploy.Messaging.RabbitMQ 0.1.21 +Monai.Deploy.Messaging.RabbitMQ 0.1.24 ## Monai.Deploy.Messaging.RabbitMQ -- Version: 0.1.21 +- Version: 0.1.24 - Authors: MONAI Consortium - Project URL: https://github.com/Project-MONAI/monai-deploy-messaging -- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging.RabbitMQ/0.1.21) +- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging.RabbitMQ/0.1.24) - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) @@ -8847,14 +8847,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Moq 4.18.4 +Moq 4.20.1 ## Moq -- Version: 4.18.4 +- Version: 4.20.1 - Authors: Daniel Cazzulino, kzu - Project URL: https://github.com/moq/moq4 -- Source: [NuGet](https://www.nuget.org/packages/Moq/4.18.4) +- Source: [NuGet](https://www.nuget.org/packages/Moq/4.20.1) - License: [BSD 3-Clause License]( https://raw.githubusercontent.com/moq/moq4/main/License.txt) @@ -9182,14 +9182,14 @@ THE POSSIBILITY OF SUCH DAMAGE.
-NLog.Extensions.Logging 5.2.2 +NLog.Extensions.Logging 5.2.3 ## NLog.Extensions.Logging -- Version: 5.2.2 +- Version: 5.2.3 - Authors: Microsoft,Julian Verdurmen - Project URL: https://github.com/NLog/NLog.Extensions.Logging -- Source: [NuGet](https://www.nuget.org/packages/NLog.Extensions.Logging/5.2.2) +- Source: [NuGet](https://www.nuget.org/packages/NLog.Extensions.Logging/5.2.3) - License: [BSD 2-Clause Simplified License](https://github.com/NLog/NLog.Extensions.Logging/raw/master/LICENSE) @@ -9223,14 +9223,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-NLog.Web.AspNetCore 5.2.2 +NLog.Web.AspNetCore 5.2.3 ## NLog.Web.AspNetCore -- Version: 5.2.2 +- Version: 5.2.3 - Authors: Julian Verdurmen - Project URL: https://github.com/NLog/NLog.Web -- Source: [NuGet](https://www.nuget.org/packages/NLog.Web.AspNetCore/5.2.2) +- Source: [NuGet](https://www.nuget.org/packages/NLog.Web.AspNetCore/5.2.3) - License: [BSD 3-Clause License](https://github.com/NLog/NLog.Web/raw/master/LICENSE) @@ -9571,14 +9571,14 @@ C# is a registered trademark of Microsoft ®.
-RabbitMQ.Client 6.4.0 +RabbitMQ.Client 6.5.0 ## RabbitMQ.Client -- Version: 6.4.0 +- Version: 6.5.0 - Authors: VMware - Project URL: https://www.rabbitmq.com/dotnet.html -- Source: [NuGet](https://www.nuget.org/packages/RabbitMQ.Client/6.4.0) +- Source: [NuGet](https://www.nuget.org/packages/RabbitMQ.Client/6.5.0) - License: [Apache-2.0](https://github.com/rabbitmq/rabbitmq-dotnet-client/raw/main/LICENSE-APACHE2) @@ -17176,15 +17176,15 @@ SOFTWARE.
-System.Memory 4.5.4 +System.Memory 4.5.5 ## System.Memory -- Version: 4.5.4 +- Version: 4.5.5 - Authors: Microsoft - Owners: microsoft,dotnetframework - Project URL: https://dot.net/ -- Source: [NuGet](https://www.nuget.org/packages/System.Memory/4.5.4) +- Source: [NuGet](https://www.nuget.org/packages/System.Memory/4.5.5) - License: [MIT](https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) @@ -26326,14 +26326,14 @@ SOFTWARE.
-System.Threading.Channels 6.0.0 +System.Threading.Channels 7.0.0 ## System.Threading.Channels -- Version: 6.0.0 +- Version: 7.0.0 - Authors: Microsoft - Project URL: https://dot.net/ -- Source: [NuGet](https://www.nuget.org/packages/System.Threading.Channels/6.0.0) +- Source: [NuGet](https://www.nuget.org/packages/System.Threading.Channels/7.0.0) - License: [MIT](https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) diff --git a/src/InformaticsGateway/Services/Export/ExportRequestDataMessage.cs b/src/Api/ExportRequestDataMessage.cs similarity index 83% rename from src/InformaticsGateway/Services/Export/ExportRequestDataMessage.cs rename to src/Api/ExportRequestDataMessage.cs index 4b0a3baf0..2c87e729f 100644 --- a/src/InformaticsGateway/Services/Export/ExportRequestDataMessage.cs +++ b/src/Api/ExportRequestDataMessage.cs @@ -19,18 +19,29 @@ using Ardalis.GuardClauses; using Monai.Deploy.Messaging.Events; -namespace Monai.Deploy.InformaticsGateway.Services.Export +namespace Monai.Deploy.InformaticsGateway.Api { public class ExportRequestDataMessage { private readonly ExportRequestEvent _exportRequest; - public byte[] FileContent { get; private set; } + public byte[] FileContent { get; private set; } = default!; public bool IsFailed { get; private set; } public IList Messages { get; init; } public FileExportStatus ExportStatus { get; private set; } public string Filename { get; } + /// + /// Optional list of data output plug-in type names to be executed by the . + /// + public List PluginAssemblies + { + get + { + return _exportRequest.PluginAssemblies; + } + } + public string ExportTaskId { get { return _exportRequest.ExportTaskId; } @@ -46,6 +57,7 @@ public string[] Destinations get { return _exportRequest.Destinations; } } + public ExportRequestDataMessage(ExportRequestEvent exportRequest, string filename) { IsFailed = false; diff --git a/src/Api/IInputDataPluginEngine.cs b/src/Api/IInputDataPluginEngine.cs index b84ccfc65..b997f231a 100644 --- a/src/Api/IInputDataPluginEngine.cs +++ b/src/Api/IInputDataPluginEngine.cs @@ -26,9 +26,10 @@ namespace Monai.Deploy.InformaticsGateway.Api /// a list of plug-ins based on . /// Rules: /// - /// A list of plug-ins can be included with each export request, and each plug-in is executed in the order stored, processing one file at a time, enabling piping of the data before each file is exported. - /// Plugins MUST be lightweight and not hinder the export process - /// Plugins SHALL not accumulate files in memory or storage for bulk processing + /// SCP: A list of plug-ins can be configured with each AET, and each plug-in is executed in the order stored, enabling piping of the incoming data before each file is uploaded to the storage service. + /// Incoming data is processed one file at a time and SHALL not wait for the entire study to arrive. + /// Plugins MUST be lightweight and not hinder the upload process. + /// Plugins SHALL not accumulate files in memory or storage for bulk processing. /// /// public interface IInputDataPluginEngine diff --git a/src/Api/IOutputDataPlugin.cs b/src/Api/IOutputDataPlugin.cs new file mode 100644 index 000000000..9480cf5bb --- /dev/null +++ b/src/Api/IOutputDataPlugin.cs @@ -0,0 +1,31 @@ +/* + * Copyright 2023 MONAI Consortium + * + * 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.Threading.Tasks; +using FellowOakDicom; + +namespace Monai.Deploy.InformaticsGateway.Api +{ + /// + /// IOutputDataPlugin enables lightweight data processing over incoming data received from supported data ingestion + /// services. + /// Refer to for additional details. + /// + public interface IOutputDataPlugin + { + Task<(DicomFile dicomFile, ExportRequestDataMessage exportRequestDataMessage)> Execute(DicomFile dicomFile, ExportRequestDataMessage exportRequestDataMessage); + } +} diff --git a/src/Api/IOutputDataPluginEngine.cs b/src/Api/IOutputDataPluginEngine.cs new file mode 100644 index 000000000..8d4189ebd --- /dev/null +++ b/src/Api/IOutputDataPluginEngine.cs @@ -0,0 +1,38 @@ +/* + * Copyright 2023 MONAI Consortium + * + * 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.Collections.Generic; +using System.Threading.Tasks; + +namespace Monai.Deploy.InformaticsGateway.Api +{ + /// + /// IOutputDataPluginEngine processes each file before exporting to its destination + /// through a list of plug-ins based on . + /// Rules: + /// + /// A list of plug-ins can be included with each export request, and each plug-in is executed in the order stored, processing one file at a time, enabling piping of the data before each file is exported. + /// Plugins MUST be lightweight and not hinder the export process. + /// Plugins SHALL not accumulate files in memory or storage for bulk processing. + /// + /// + public interface IOutputDataPluginEngine + { + void Configure(IReadOnlyList pluginAssemblies); + + Task ExecutePlugins(ExportRequestDataMessage exportRequestDataMessage); + } +} diff --git a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj index 7de88721c..83bec7ec6 100644 --- a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj +++ b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/Api/Storage/FileStorageMetadata.cs b/src/Api/Storage/FileStorageMetadata.cs index e24ecb170..67ee4aa25 100644 --- a/src/Api/Storage/FileStorageMetadata.cs +++ b/src/Api/Storage/FileStorageMetadata.cs @@ -81,6 +81,20 @@ public abstract record FileStorageMetadata [JsonPropertyName("dateReceived")] public DateTime DateReceived { get; init; } = default!; + /// + /// Gets or sets the workflow instance ID for the workflow manager to resume a workflow. + /// + /// + [JsonPropertyName("WorkflowInstanceId")] + public string? WorkflowInstanceId { get; set; } + + /// + /// Gets or sets the task ID for the workflow manager to resume a workflow. + /// + /// + [JsonPropertyName("taskId")] + public string? TaskId { get; set; } + /// /// DO NOT USE /// This constructor is intended for JSON serializer. diff --git a/src/Api/Test/packages.lock.json b/src/Api/Test/packages.lock.json index 9f5ba5df2..901ba76e2 100644 --- a/src/Api/Test/packages.lock.json +++ b/src/Api/Test/packages.lock.json @@ -152,19 +152,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", @@ -198,8 +198,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", @@ -258,12 +258,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -1276,7 +1276,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json index a4c29b434..2115d638d 100644 --- a/src/Api/packages.lock.json +++ b/src/Api/packages.lock.json @@ -16,13 +16,13 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.23, )", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "requested": "[0.1.24, )", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -128,19 +128,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", @@ -174,8 +174,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", diff --git a/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj b/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj index 7b3c06124..ef0d5cb72 100644 --- a/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj +++ b/src/CLI/Test/Monai.Deploy.InformaticsGateway.CLI.Test.csproj @@ -34,7 +34,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/CLI/Test/packages.lock.json b/src/CLI/Test/packages.lock.json index 174886f71..2fe8d27c4 100644 --- a/src/CLI/Test/packages.lock.json +++ b/src/CLI/Test/packages.lock.json @@ -20,11 +20,12 @@ }, "Moq": { "type": "Direct", - "requested": "[4.18.4, )", - "resolved": "4.18.4", - "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "requested": "[4.20.1, )", + "resolved": "4.20.1", + "contentHash": "ES4ngKsm7T1f3MXj7bM+m1pvxc7rXBLjghFEBjruH5j0Mx15FRI40uo6WT9OgAj3CFWJASYt+chB1MhOivVX+w==", "dependencies": { - "Castle.Core": "5.1.1" + "Castle.Core": "5.1.1", + "Devlooped.SponsorLink": "1.0.0" } }, "System.CommandLine.Hosting": { @@ -109,6 +110,11 @@ "resolved": "2.0.69", "contentHash": "eJHxoMTfhZs1782YUIMafXIDTPcTwAV5I3MNsl2d4Mn61/h3ABPMSzHwzigL/NO7BrCKRoP4gHJuERpLHdSCvg==" }, + "Devlooped.SponsorLink": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "YtGfB0L0OUGK/Nl7YR8jVLOb8zIYo+pM80nw86GVqqeI36D3itw/N5agupsn4sAJxQxKVJti9KvqqAR8dfrW1A==" + }, "Docker.DotNet": { "type": "Transitive", "resolved": "3.125.15", @@ -270,19 +276,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", @@ -370,8 +376,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", @@ -506,12 +512,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -1572,7 +1578,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, diff --git a/src/CLI/packages.lock.json b/src/CLI/packages.lock.json index 0a6fd4fad..09ea89a11 100644 --- a/src/CLI/packages.lock.json +++ b/src/CLI/packages.lock.json @@ -277,19 +277,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", @@ -337,8 +337,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", @@ -442,12 +442,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -1417,7 +1417,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, 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 67826ed08..587df19d5 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 @@ -38,7 +38,7 @@ 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 acf115c0c..b93de9a73 100644 --- a/src/Client.Common/Test/packages.lock.json +++ b/src/Client.Common/Test/packages.lock.json @@ -26,11 +26,12 @@ }, "Moq": { "type": "Direct", - "requested": "[4.18.4, )", - "resolved": "4.18.4", - "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "requested": "[4.20.1, )", + "resolved": "4.20.1", + "contentHash": "ES4ngKsm7T1f3MXj7bM+m1pvxc7rXBLjghFEBjruH5j0Mx15FRI40uo6WT9OgAj3CFWJASYt+chB1MhOivVX+w==", "dependencies": { - "Castle.Core": "5.1.1" + "Castle.Core": "5.1.1", + "Devlooped.SponsorLink": "1.0.0" } }, "xRetry": { @@ -67,6 +68,11 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "Devlooped.SponsorLink": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "YtGfB0L0OUGK/Nl7YR8jVLOb8zIYo+pM80nw86GVqqeI36D3itw/N5agupsn4sAJxQxKVJti9KvqqAR8dfrW1A==" + }, "Microsoft.CodeCoverage": { "type": "Transitive", "resolved": "17.6.3", diff --git a/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj b/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj index d9fc5f10c..af3791460 100644 --- a/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj +++ b/src/Client/Test/Monai.Deploy.InformaticsGateway.Client.Test.csproj @@ -39,7 +39,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Client/Test/packages.lock.json b/src/Client/Test/packages.lock.json index 6fda98427..a17532a5e 100644 --- a/src/Client/Test/packages.lock.json +++ b/src/Client/Test/packages.lock.json @@ -20,11 +20,12 @@ }, "Moq": { "type": "Direct", - "requested": "[4.18.4, )", - "resolved": "4.18.4", - "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "requested": "[4.20.1, )", + "resolved": "4.20.1", + "contentHash": "ES4ngKsm7T1f3MXj7bM+m1pvxc7rXBLjghFEBjruH5j0Mx15FRI40uo6WT9OgAj3CFWJASYt+chB1MhOivVX+w==", "dependencies": { - "Castle.Core": "5.1.1" + "Castle.Core": "5.1.1", + "Devlooped.SponsorLink": "1.0.0" } }, "xunit": { @@ -92,6 +93,11 @@ "NETStandard.Library": "2.0.0" } }, + "Devlooped.SponsorLink": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "YtGfB0L0OUGK/Nl7YR8jVLOb8zIYo+pM80nw86GVqqeI36D3itw/N5agupsn4sAJxQxKVJti9KvqqAR8dfrW1A==" + }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", @@ -698,12 +704,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -712,12 +718,12 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "+Y1eLKz9FtPbASOVtTaM1ktyUqOxmyIjksNukZ8dUhtDJrT3CF9ISw6BGajxwJfq2jUjacli3jNSc1OAnLJRcQ==", + "resolved": "0.1.24", + "contentHash": "qxPcI/h8YD9beEaLwbHetF4af7sEOpgmf8ojKuaB9B4U13MaInzw7JB0vS51AQ9fNZMtT0MaEnQRl28pkRzB/Q==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.23", - "Polly": "7.2.3", - "RabbitMQ.Client": "6.4.0", + "Monai.Deploy.Messaging": "0.1.24", + "Polly": "7.2.4", + "RabbitMQ.Client": "6.5.0", "System.Collections.Concurrent": "4.3.0" } }, @@ -836,25 +842,25 @@ }, "NLog": { "type": "Transitive", - "resolved": "5.2.2", - "contentHash": "r6Q9740g29gTwmTWlsgdIFm0mhNsfNZmbvWKX/Fxmi8X89ZrpUowHM2T2X1lP7RVpND+ef+XnfKL5g6Q1iNGXA==" + "resolved": "5.2.3", + "contentHash": "rHTNRtQF5qYqLutSR9ldUWXglKym/KA1R6GKw4JtDvza8i5+kgfmeKH75Ccn1noeJIOjHLXorphMxKk3EiN2tg==" }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.3.2", - "contentHash": "v6swUNj9KHH4tWKH3+eCuFsp/BfpkWmbz1XPCIXb9fnSVsEHcfyRnfXjuksfMdIULgR/i1RzbQUU8WsNVpBglg==", + "resolved": "5.3.3", + "contentHash": "o3V1oUr0izjhU1djuVqN5JdmNUGmunTs3Amjhumt/nxva8kG9QWjOdba+ciwkP//QOjv+KkGklZtI9o4qz50hQ==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.2.2" + "NLog": "5.2.3" } }, "NLog.Web.AspNetCore": { "type": "Transitive", - "resolved": "5.3.2", - "contentHash": "SLBeDj30nu1sjc3DsPhTdXSL90915eeQknYbSCZOthccxqVJS1RZna0sh746kDaD21ktnYMubXT+gNWgn3oGpA==", + "resolved": "5.3.3", + "contentHash": "ub8LOAbIGIPtv9nMAdZXlxUvszau6p2Svmeo8mhJFD+PQDMnI6PFc5IID1Jj3c1Lv8sxKVL7vRCsaWdTrmnrFw==", "dependencies": { - "NLog.Extensions.Logging": "5.3.2" + "NLog.Extensions.Logging": "5.3.3" } }, "NuGet.Frameworks": { @@ -869,11 +875,11 @@ }, "RabbitMQ.Client": { "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "1znR1gGU+xYVSpO5z8nQolcUKA/yydnxQn7Ug9+RUXxTSLMm/eE58VKGwahPBjELXvDnX0k/kBrAitFLRjx9LA==", + "resolved": "6.5.0", + "contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==", "dependencies": { - "System.Memory": "4.5.4", - "System.Threading.Channels": "4.7.1" + "System.Memory": "4.5.5", + "System.Threading.Channels": "7.0.0" } }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { @@ -1229,8 +1235,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" }, "System.Net.Http": { "type": "Transitive", @@ -1578,8 +1584,8 @@ }, "System.Threading.Channels": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" + "resolved": "7.0.0", + "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA==" }, "System.Threading.Tasks": { "type": "Transitive", @@ -1678,12 +1684,12 @@ "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.Messaging.RabbitMQ": "[0.1.24, )", "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, )", + "NLog": "[5.2.3, )", + "NLog.Web.AspNetCore": "[5.3.3, )", "Polly": "[7.2.4, )", "Swashbuckle.AspNetCore": "[6.5.0, )", "fo-dicom": "[5.1.1, )" @@ -1695,7 +1701,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -1731,7 +1737,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } diff --git a/src/Client/packages.lock.json b/src/Client/packages.lock.json index 4cd704807..a6f62f396 100644 --- a/src/Client/packages.lock.json +++ b/src/Client/packages.lock.json @@ -118,19 +118,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", @@ -164,8 +164,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", @@ -206,12 +206,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -1178,7 +1178,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, diff --git a/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj b/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj index 6621700a5..1ca87324d 100644 --- a/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj +++ b/src/Common/Test/Monai.Deploy.InformaticsGateway.Common.Test.csproj @@ -30,7 +30,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Common/Test/packages.lock.json b/src/Common/Test/packages.lock.json index 1222d496c..0aae621fa 100644 --- a/src/Common/Test/packages.lock.json +++ b/src/Common/Test/packages.lock.json @@ -20,11 +20,12 @@ }, "Moq": { "type": "Direct", - "requested": "[4.18.4, )", - "resolved": "4.18.4", - "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "requested": "[4.20.1, )", + "resolved": "4.20.1", + "contentHash": "ES4ngKsm7T1f3MXj7bM+m1pvxc7rXBLjghFEBjruH5j0Mx15FRI40uo6WT9OgAj3CFWJASYt+chB1MhOivVX+w==", "dependencies": { - "Castle.Core": "5.1.1" + "Castle.Core": "5.1.1", + "Devlooped.SponsorLink": "1.0.0" } }, "System.IO.Abstractions": { @@ -77,6 +78,11 @@ "resolved": "8.2.0", "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, + "Devlooped.SponsorLink": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "YtGfB0L0OUGK/Nl7YR8jVLOb8zIYo+pM80nw86GVqqeI36D3itw/N5agupsn4sAJxQxKVJti9KvqqAR8dfrW1A==" + }, "fo-dicom": { "type": "Transitive", "resolved": "5.1.1", diff --git a/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj b/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj index abdf0a4bf..2de2c3422 100644 --- a/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj +++ b/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj b/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj index 84c904b68..e4edda690 100644 --- a/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj +++ b/src/Configuration/Test/Monai.Deploy.InformaticsGateway.Configuration.Test.csproj @@ -35,7 +35,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Configuration/Test/packages.lock.json b/src/Configuration/Test/packages.lock.json index 252d73e8c..26ebfe7be 100644 --- a/src/Configuration/Test/packages.lock.json +++ b/src/Configuration/Test/packages.lock.json @@ -20,11 +20,12 @@ }, "Moq": { "type": "Direct", - "requested": "[4.18.4, )", - "resolved": "4.18.4", - "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "requested": "[4.20.1, )", + "resolved": "4.20.1", + "contentHash": "ES4ngKsm7T1f3MXj7bM+m1pvxc7rXBLjghFEBjruH5j0Mx15FRI40uo6WT9OgAj3CFWJASYt+chB1MhOivVX+w==", "dependencies": { - "Castle.Core": "5.1.1" + "Castle.Core": "5.1.1", + "Devlooped.SponsorLink": "1.0.0" } }, "System.IO.Abstractions.TestingHelpers": { @@ -84,6 +85,11 @@ "resolved": "8.2.0", "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, + "Devlooped.SponsorLink": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "YtGfB0L0OUGK/Nl7YR8jVLOb8zIYo+pM80nw86GVqqeI36D3itw/N5agupsn4sAJxQxKVJti9KvqqAR8dfrW1A==" + }, "fo-dicom": { "type": "Transitive", "resolved": "5.1.1", @@ -160,19 +166,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", @@ -266,12 +272,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -1289,7 +1295,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -1309,7 +1315,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json index b030ed454..9f6eca283 100644 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -20,13 +20,13 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.23, )", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "requested": "[0.1.24, )", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -148,19 +148,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", @@ -278,7 +278,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, diff --git a/src/Database/Api/Test/packages.lock.json b/src/Database/Api/Test/packages.lock.json index 1bd04ce2a..b1d1b7c99 100644 --- a/src/Database/Api/Test/packages.lock.json +++ b/src/Database/Api/Test/packages.lock.json @@ -173,19 +173,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", @@ -279,12 +279,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -1310,7 +1310,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -1330,7 +1330,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } diff --git a/src/Database/Api/packages.lock.json b/src/Database/Api/packages.lock.json index 6474f54f4..d2c0a5962 100644 --- a/src/Database/Api/packages.lock.json +++ b/src/Database/Api/packages.lock.json @@ -142,19 +142,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", @@ -210,12 +210,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -327,7 +327,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -347,7 +347,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } 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 f7f684a7a..73f4978dc 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 @@ -27,7 +27,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Database/EntityFramework/Test/packages.lock.json b/src/Database/EntityFramework/Test/packages.lock.json index 6bebbf09d..28d8e7f07 100644 --- a/src/Database/EntityFramework/Test/packages.lock.json +++ b/src/Database/EntityFramework/Test/packages.lock.json @@ -29,11 +29,12 @@ }, "Moq": { "type": "Direct", - "requested": "[4.18.4, )", - "resolved": "4.18.4", - "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "requested": "[4.20.1, )", + "resolved": "4.20.1", + "contentHash": "ES4ngKsm7T1f3MXj7bM+m1pvxc7rXBLjghFEBjruH5j0Mx15FRI40uo6WT9OgAj3CFWJASYt+chB1MhOivVX+w==", "dependencies": { - "Castle.Core": "5.1.1" + "Castle.Core": "5.1.1", + "Devlooped.SponsorLink": "1.0.0" } }, "xunit": { @@ -84,6 +85,11 @@ "resolved": "8.2.0", "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, + "Devlooped.SponsorLink": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "YtGfB0L0OUGK/Nl7YR8jVLOb8zIYo+pM80nw86GVqqeI36D3itw/N5agupsn4sAJxQxKVJti9KvqqAR8dfrW1A==" + }, "fo-dicom": { "type": "Transitive", "resolved": "5.1.1", @@ -271,19 +277,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", @@ -392,12 +398,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -1463,7 +1469,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -1483,7 +1489,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } diff --git a/src/Database/EntityFramework/packages.lock.json b/src/Database/EntityFramework/packages.lock.json index 242bb21a4..8d0abe496 100644 --- a/src/Database/EntityFramework/packages.lock.json +++ b/src/Database/EntityFramework/packages.lock.json @@ -227,19 +227,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", @@ -310,12 +310,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -467,7 +467,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -487,7 +487,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } 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 b66f3136a..7969da4b6 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 @@ -28,7 +28,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Database/MongoDB/Integration.Test/packages.lock.json b/src/Database/MongoDB/Integration.Test/packages.lock.json index a5451c02c..ecded6008 100644 --- a/src/Database/MongoDB/Integration.Test/packages.lock.json +++ b/src/Database/MongoDB/Integration.Test/packages.lock.json @@ -29,11 +29,12 @@ }, "Moq": { "type": "Direct", - "requested": "[4.18.4, )", - "resolved": "4.18.4", - "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "requested": "[4.20.1, )", + "resolved": "4.20.1", + "contentHash": "ES4ngKsm7T1f3MXj7bM+m1pvxc7rXBLjghFEBjruH5j0Mx15FRI40uo6WT9OgAj3CFWJASYt+chB1MhOivVX+w==", "dependencies": { - "Castle.Core": "5.1.1" + "Castle.Core": "5.1.1", + "Devlooped.SponsorLink": "1.0.0" } }, "xunit": { @@ -84,6 +85,11 @@ "resolved": "8.2.0", "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, + "Devlooped.SponsorLink": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "YtGfB0L0OUGK/Nl7YR8jVLOb8zIYo+pM80nw86GVqqeI36D3itw/N5agupsn4sAJxQxKVJti9KvqqAR8dfrW1A==" + }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", @@ -207,19 +213,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", @@ -322,12 +328,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -1440,7 +1446,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -1460,7 +1466,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } diff --git a/src/Database/MongoDB/packages.lock.json b/src/Database/MongoDB/packages.lock.json index 9ea1e8c41..0e51c9d8b 100644 --- a/src/Database/MongoDB/packages.lock.json +++ b/src/Database/MongoDB/packages.lock.json @@ -172,19 +172,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", @@ -254,12 +254,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -418,7 +418,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -438,7 +438,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json index 9994d6858..0b8a7e76c 100644 --- a/src/Database/packages.lock.json +++ b/src/Database/packages.lock.json @@ -358,12 +358,12 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.23", - "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==", + "resolved": "0.1.24", + "contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", + "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20", "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.3", "System.ComponentModel.Annotations": "5.0.0", @@ -584,7 +584,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )" } }, @@ -604,7 +604,7 @@ "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.Messaging": "[0.1.24, )", "Monai.Deploy.Storage": "[0.2.16, )", "System.IO.Abstractions": "[17.2.3, )" } 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 c017fb8c4..5c5149047 100644 --- a/src/DicomWebClient/Test/Monai.Deploy.InformaticsGateway.DicomWeb.Client.Test.csproj +++ b/src/DicomWebClient/Test/Monai.Deploy.InformaticsGateway.DicomWeb.Client.Test.csproj @@ -38,7 +38,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/DicomWebClient/Test/packages.lock.json b/src/DicomWebClient/Test/packages.lock.json index a350cefc5..ff0c64fc5 100644 --- a/src/DicomWebClient/Test/packages.lock.json +++ b/src/DicomWebClient/Test/packages.lock.json @@ -26,11 +26,12 @@ }, "Moq": { "type": "Direct", - "requested": "[4.18.4, )", - "resolved": "4.18.4", - "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "requested": "[4.20.1, )", + "resolved": "4.20.1", + "contentHash": "ES4ngKsm7T1f3MXj7bM+m1pvxc7rXBLjghFEBjruH5j0Mx15FRI40uo6WT9OgAj3CFWJASYt+chB1MhOivVX+w==", "dependencies": { - "Castle.Core": "5.1.1" + "Castle.Core": "5.1.1", + "Devlooped.SponsorLink": "1.0.0" } }, "xRetry": { @@ -72,6 +73,11 @@ "resolved": "8.2.0", "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, + "Devlooped.SponsorLink": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "YtGfB0L0OUGK/Nl7YR8jVLOb8zIYo+pM80nw86GVqqeI36D3itw/N5agupsn4sAJxQxKVJti9KvqqAR8dfrW1A==" + }, "fo-dicom": { "type": "Transitive", "resolved": "5.1.1", diff --git a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj index 546588921..7a6c0bba8 100644 --- a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj +++ b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj @@ -1,4 +1,4 @@ -