From 19429b87019cf0a2bf44609b803b2d988531e758 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Fri, 5 Jan 2024 10:19:43 -0800 Subject: [PATCH] Upgrade to .NET 8 Signed-off-by: Victor Chang --- .../Exceptions/ConfigurationException.cs | 5 - ...orkflowManager.Common.Configuration.csproj | 16 +- src/Common/Configuration/packages.lock.json | 151 +++-- .../Miscellaneous/LoggingDataDictionary.cs | 5 - ...orkflowManager.Common.Miscellaneous.csproj | 16 +- src/Common/Miscellaneous/packages.lock.json | 170 ++--- src/TaskManager/API/InvalidTaskException.cs | 5 - ...loy.WorkflowManager.TaskManager.API.csproj | 17 +- .../API/ServiceNotFoundException.cs | 5 - src/TaskManager/API/packages.lock.json | 130 ++-- ...orkflowManager.TaskManager.Database.csproj | 16 +- src/TaskManager/Database/packages.lock.json | 152 +++-- ...ager.TaskManager.AideClinicalReview.csproj | 11 +- .../AideClinicalReview/packages.lock.json | 178 +++--- .../ArgoWorkflowNotFoundException.cs | 6 - .../ArtifactMappingNotFoundException.cs | 6 - .../Exceptions/TemplateNotFoundException.cs | 6 - ...oy.WorkflowManager.TaskManager.Argo.csproj | 19 +- .../Plug-ins/Argo/packages.lock.json | 265 ++++---- .../Docker/ContainerMonitorException.cs | 8 +- ....WorkflowManager.TaskManager.Docker.csproj | 11 +- .../Plug-ins/Docker/SetPermissionException.cs | 6 - ...y.WorkflowManager.TaskManager.Email.csproj | 9 +- ...kflowManager.TaskManager.TestPlugin.csproj | 9 +- .../Repositories/TestPluginRepository.cs | 2 +- ....Deploy.WorkflowManager.TaskManager.csproj | 38 +- src/TaskManager/TaskManager/Program.cs | 6 +- .../TaskManager/Services/Http/Startup.cs | 4 + .../TaskManager/TaskManagerException.cs | 9 - .../TaskManager/packages.lock.json | 508 +++++++-------- ...Monai.Deploy.WorkflowManager.Common.csproj | 11 +- ....WorkflowManager.ConditionsResolver.csproj | 11 +- ...ai.Deploy.WorkflowManager.Contracts.csproj | 15 +- ...nai.Deploy.WorkflowManager.Database.csproj | 16 +- .../Repositories/ArtifactsRepository.cs | 2 + .../Database/packages.lock.json | 152 +++-- ...onai.Deploy.WorkflowManager.Logging.csproj | 14 +- .../Logging/packages.lock.json | 130 ++-- ...kflowManager.MonaiBackgroundService.csproj | 11 +- ...loy.WorkflowManager.PayloadListener.csproj | 13 +- .../PayloadListener/packages.lock.json | 204 +++--- ...nai.Deploy.WorkflowManager.Services.csproj | 19 +- .../Services/packages.lock.json | 259 ++++---- ...onai.Deploy.WorkflowManager.Storage.csproj | 16 +- .../Storage/packages.lock.json | 160 +++-- ...oy.WorkloadManager.WorkflowExecuter.csproj | 78 +-- .../WorkflowExecuter/packages.lock.json | 204 +++--- .../Monai.Deploy.WorkflowManager.csproj | 30 +- .../WorkflowManager/packages.lock.json | 498 ++++++++------- ...anager.TaskManager.IntegrationTests.csproj | 33 +- .../Support/HttpRequestMessageExtensions.cs | 6 +- .../Support/MinioClientUtil.cs | 201 +++--- .../Hooks.cs | 28 + ...r.WorkflowExecutor.IntegrationTests.csproj | 34 +- .../ArtifactReceivedEventStepDefinitions.cs | 12 + .../TasksApiStepDefinitions.cs | 4 +- .../Support/HttpRequestMessageExtensions.cs | 4 +- .../Support/MinioClientUtil.cs | 3 +- .../Support/MinioDataSeeding.cs | 2 + .../Support/WorkflowExecutorStartup.cs | 18 + ...Deploy.WorkflowManager.Common.Tests.csproj | 18 +- ...lowManager.ConditionsResolver.Tests.csproj | 16 +- ...WorkflowManager.Configuration.Tests.csproj | 18 +- ...ploy.WorkflowManager.Database.Tests.csproj | 18 +- .../HttpLoggingExtensionsTests.cs | 4 + ...Deploy.WorkflowManager.Shared.Tests.csproj | 18 +- ...anager.MonaiBackgroundService.Tests.csproj | 18 +- ...rkflowManager.PayloadListener.Tests.csproj | 16 +- .../Validators/EventPayloadValidatorTests.cs | 35 +- ...eploy.WorkflowManager.Storage.Tests.csproj | 18 +- .../Services/DicomServiceTests.cs | 4 +- .../AideClinicalReviewPluginTests.cs | 14 +- ...askManager.AideClinicalReview.Tests.csproj | 18 +- .../TaskManager.Argo.Tests/ArgoPluginTest.cs | 52 +- .../ArgoProviderTest.cs | 2 +- ...kflowManager.TaskManager.Argo.Tests.csproj | 20 +- .../ContainerStatusMonitorTest.cs | 2 + .../DockerPluginTest.cs | 24 +- ...lowManager.TaskManager.Docker.Tests.csproj | 21 +- .../EmailPluginTests.cs | 4 +- ...flowManager.TaskManager.Email.Tests.csproj | 17 +- ...y.WorkflowManager.TaskManager.Tests.csproj | 20 +- .../TaskManager.Tests/TaskManagerTest.cs | 64 +- ...kflowManager.WorkflowExecuter.Tests.csproj | 18 +- ...ploy.WorkflowManager.Services.Tests.csproj | 18 +- .../DummyMessagingService.cs | 2 + .../Monai.Deploy.WorkflowManager.Tests.csproj | 21 +- .../DataRetentionServiceTest.cs | 4 +- .../WorkflowManager.Tests/packages.lock.json | 601 ++++++++++-------- 89 files changed, 2610 insertions(+), 2472 deletions(-) diff --git a/src/Common/Configuration/Exceptions/ConfigurationException.cs b/src/Common/Configuration/Exceptions/ConfigurationException.cs index f5653f2ff..32780d989 100644 --- a/src/Common/Configuration/Exceptions/ConfigurationException.cs +++ b/src/Common/Configuration/Exceptions/ConfigurationException.cs @@ -15,7 +15,6 @@ */ using System; -using System.Runtime.Serialization; namespace Monai.Deploy.WorkflowManager.Common.Configuration.Exceptions { @@ -36,9 +35,5 @@ public ConfigurationException(string message) : base(message) public ConfigurationException(string message, Exception innerException) : base(message, innerException) { } - - protected ConfigurationException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } } } diff --git a/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj index 419c4a3d8..97a1c2f78 100644 --- a/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj +++ b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj @@ -13,41 +13,33 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 Monai.Deploy.WorkflowManager.Configuration false - - - - - + + - - - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - + \ No newline at end of file diff --git a/src/Common/Configuration/packages.lock.json b/src/Common/Configuration/packages.lock.json index 5cb2e32a0..fa16d946c 100644 --- a/src/Common/Configuration/packages.lock.json +++ b/src/Common/Configuration/packages.lock.json @@ -1,124 +1,136 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[1.0.6, )", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "requested": "[2.0.0, )", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.18, )", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, @@ -127,15 +139,32 @@ "resolved": "13.0.3", "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" + }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } + }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" }, - "System.Runtime.CompilerServices.Unsafe": { + "TestableIO.System.IO.Abstractions.Wrappers": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } } } } diff --git a/src/Common/Miscellaneous/LoggingDataDictionary.cs b/src/Common/Miscellaneous/LoggingDataDictionary.cs index 9048a9640..23928fddc 100644 --- a/src/Common/Miscellaneous/LoggingDataDictionary.cs +++ b/src/Common/Miscellaneous/LoggingDataDictionary.cs @@ -16,7 +16,6 @@ */ using System.Globalization; -using System.Runtime.Serialization; namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous { @@ -27,10 +26,6 @@ public LoggingDataDictionary() { } - protected LoggingDataDictionary(SerializationInfo info, StreamingContext context) : base(info, context) - { - } - public override string ToString() { var pairs = this.Select(x => string.Format(CultureInfo.InvariantCulture, "{0}={1}", x.Key, x.Value)); diff --git a/src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj b/src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj index e035fca2f..84a936347 100644 --- a/src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj +++ b/src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj @@ -13,50 +13,40 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 Monai.Deploy.WorkflowManager.Common enable enable false - - - - - - - + - - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - + \ No newline at end of file diff --git a/src/Common/Miscellaneous/packages.lock.json b/src/Common/Miscellaneous/packages.lock.json index 17890b873..f8872fd56 100644 --- a/src/Common/Miscellaneous/packages.lock.json +++ b/src/Common/Miscellaneous/packages.lock.json @@ -1,14 +1,14 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "fo-dicom": { "type": "Direct", - "requested": "[5.1.1, )", - "resolved": "5.1.1", - "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "requested": "[5.1.2, )", + "resolved": "5.1.2", + "contentHash": "2lM76Vq+GRdwyY3BQiUJ+V6yxdFiOG4ysLJC7qNTxLsq/1pr5ZTTXiIzWQa+uJ0MuKnzzFogV5+meDflsyjs2g==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.2.0", + "CommunityToolkit.HighPerformance": "8.2.2", "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", @@ -17,32 +17,32 @@ "System.Buffers": "4.5.1", "System.Text.Encoding.CodePages": "6.0.0", "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.7", + "System.Text.Json": "6.0.9", "System.Threading.Channels": "6.0.0" } }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.2.0", - "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + "resolved": "8.2.2", + "contentHash": "+zIp8d3sbtYaRbM6hqDs4Ui/z34j7DcUmleruZlYLE4CVxXq+MO8XJyIs42vzeTYFX+k0Iq1dEbBUnQ4z/Gnrw==" }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", @@ -56,10 +56,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection": { @@ -73,41 +73,53 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging": { @@ -124,54 +136,54 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, @@ -187,16 +199,17 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -221,8 +234,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -233,11 +246,24 @@ "resolved": "6.0.0", "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[2.0.0, )", + "Monai.Deploy.Storage": "[1.0.0, )" } } } diff --git a/src/TaskManager/API/InvalidTaskException.cs b/src/TaskManager/API/InvalidTaskException.cs index 5c3e5738e..7f91d0448 100644 --- a/src/TaskManager/API/InvalidTaskException.cs +++ b/src/TaskManager/API/InvalidTaskException.cs @@ -15,7 +15,6 @@ */ using System.Diagnostics; -using System.Runtime.Serialization; namespace Monai.Deploy.WorkflowManager.TaskManager.API { @@ -34,10 +33,6 @@ public InvalidTaskException(string message, Exception innerException) : base(mes { } - protected InvalidTaskException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } - private string GetDebuggerDisplay() { return ToString(); diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj index 6a1996dea..d36ca3b58 100644 --- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj +++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj @@ -13,36 +13,27 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable false - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - - - + - + - - - + \ No newline at end of file diff --git a/src/TaskManager/API/ServiceNotFoundException.cs b/src/TaskManager/API/ServiceNotFoundException.cs index 1a6470e97..c11ee5530 100644 --- a/src/TaskManager/API/ServiceNotFoundException.cs +++ b/src/TaskManager/API/ServiceNotFoundException.cs @@ -15,7 +15,6 @@ */ using System.Globalization; -using System.Runtime.Serialization; using Ardalis.GuardClauses; namespace Monai.Deploy.WorkflowManager.TaskManager.API @@ -52,9 +51,5 @@ public ServiceNotFoundException(string serviceName, Exception innerException) private ServiceNotFoundException() { } - - protected ServiceNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } } } diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index 69233a483..98996175f 100644 --- a/src/TaskManager/API/packages.lock.json +++ b/src/TaskManager/API/packages.lock.json @@ -1,17 +1,17 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[1.0.6, )", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "requested": "[2.0.0, )", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Mongo.Migration": { @@ -38,9 +38,9 @@ }, "MongoDB.Bson": { "type": "Direct", - "requested": "[2.21.0, )", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "requested": "[2.23.1, )", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -48,8 +48,8 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "DnsClient": { "type": "Transitive", @@ -110,10 +110,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { @@ -134,41 +134,53 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging": { @@ -184,8 +196,11 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -216,11 +231,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -236,11 +251,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -426,6 +438,11 @@ "System.Runtime": "4.3.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" + }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -460,8 +477,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -536,8 +557,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, "System.Runtime.Extensions": { "type": "Transitive", @@ -640,6 +661,19 @@ "type": "Transitive", "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } } } } diff --git a/src/TaskManager/Database/Monai.Deploy.WorkflowManager.TaskManager.Database.csproj b/src/TaskManager/Database/Monai.Deploy.WorkflowManager.TaskManager.Database.csproj index 4b397d288..bac38a709 100755 --- a/src/TaskManager/Database/Monai.Deploy.WorkflowManager.TaskManager.Database.csproj +++ b/src/TaskManager/Database/Monai.Deploy.WorkflowManager.TaskManager.Database.csproj @@ -13,38 +13,28 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable false - - - - - - + - - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - + \ No newline at end of file diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json index 78a6fe533..3bcefb210 100644 --- a/src/TaskManager/Database/packages.lock.json +++ b/src/TaskManager/Database/packages.lock.json @@ -1,23 +1,23 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "MongoDB.Driver": { "type": "Direct", - "requested": "[2.21.0, )", - "resolved": "2.21.0", - "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", + "requested": "[2.23.1, )", + "resolved": "2.23.1", + "contentHash": "kidqCwGBuLBx2IcW4os3J6zsp9yaUWm7Sp8G08Nm2RVRSAf0cJXfsynl2wRWpHh0HgfIzzwkevP/qhfsKfu8bQ==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", - "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Bson": "2.23.1", + "MongoDB.Driver.Core": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0" } }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", @@ -94,10 +94,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { @@ -118,41 +118,53 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging": { @@ -168,8 +180,11 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -200,11 +215,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -220,11 +235,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -247,13 +259,13 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Mongo.Migration": { @@ -279,8 +291,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -288,18 +300,18 @@ }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", + "resolved": "2.23.1", + "contentHash": "K8LMdnVgT82vdbSllv8VzjPOLa9k5rLcCBd1fG45z+QGJNPWzAFW5lLgLJQ7xXuJgQIwvP1DBx6X6ecWBtox7g==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", + "MongoDB.Bson": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", - "ZstdSharp.Port": "0.6.2" + "ZstdSharp.Port": "0.7.3" } }, "MongoDB.Libmongocrypt": { @@ -456,6 +468,11 @@ "System.Runtime": "4.3.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" + }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -490,8 +507,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -566,8 +587,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, "System.Runtime.Extensions": { "type": "Transitive", @@ -676,17 +697,30 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "ZstdSharp.Port": { "type": "Transitive", - "resolved": "0.6.2", - "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } } } diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj b/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj index 2734b4274..911b395a9 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj @@ -13,34 +13,27 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable false - - - - true true ..\..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - + \ No newline at end of file diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json index 4f66c38c8..01cfc914c 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -1,29 +1,29 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.2.0", - "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + "resolved": "8.2.2", + "contentHash": "+zIp8d3sbtYaRbM6hqDs4Ui/z34j7DcUmleruZlYLE4CVxXq+MO8XJyIs42vzeTYFX+k0Iq1dEbBUnQ4z/Gnrw==" }, "DnsClient": { "type": "Transitive", @@ -32,10 +32,10 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "resolved": "5.1.2", + "contentHash": "2lM76Vq+GRdwyY3BQiUJ+V6yxdFiOG4ysLJC7qNTxLsq/1pr5ZTTXiIzWQa+uJ0MuKnzzFogV5+meDflsyjs2g==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.2.0", + "CommunityToolkit.HighPerformance": "8.2.2", "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", @@ -44,7 +44,7 @@ "System.Buffers": "4.5.1", "System.Text.Encoding.CodePages": "6.0.0", "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.7", + "System.Text.Json": "6.0.9", "System.Threading.Channels": "6.0.0" } }, @@ -112,10 +112,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { @@ -137,41 +137,53 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging": { @@ -188,8 +200,11 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -220,11 +235,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -240,11 +255,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -258,32 +270,32 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, @@ -310,8 +322,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -493,11 +505,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" }, "System.Diagnostics.Tracing": { "type": "Transitive", @@ -533,8 +542,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -684,8 +697,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -730,26 +743,39 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[2.0.0, )", + "Monai.Deploy.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.1.1, )" + "fo-dicom": "[5.1.2, )" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } } } diff --git a/src/TaskManager/Plug-ins/Argo/Exceptions/ArgoWorkflowNotFoundException.cs b/src/TaskManager/Plug-ins/Argo/Exceptions/ArgoWorkflowNotFoundException.cs index ad6dc88d6..f2135d040 100644 --- a/src/TaskManager/Plug-ins/Argo/Exceptions/ArgoWorkflowNotFoundException.cs +++ b/src/TaskManager/Plug-ins/Argo/Exceptions/ArgoWorkflowNotFoundException.cs @@ -14,8 +14,6 @@ * limitations under the License. */ -using System.Runtime.Serialization; - namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.Exceptions { [Serializable] @@ -30,10 +28,6 @@ public ArgoWorkflowNotFoundException(string? message, Exception? innerException) { } - protected ArgoWorkflowNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } - public ArgoWorkflowNotFoundException() { } diff --git a/src/TaskManager/Plug-ins/Argo/Exceptions/ArtifactMappingNotFoundException.cs b/src/TaskManager/Plug-ins/Argo/Exceptions/ArtifactMappingNotFoundException.cs index b5685de53..053951645 100644 --- a/src/TaskManager/Plug-ins/Argo/Exceptions/ArtifactMappingNotFoundException.cs +++ b/src/TaskManager/Plug-ins/Argo/Exceptions/ArtifactMappingNotFoundException.cs @@ -14,8 +14,6 @@ * limitations under the License. */ -using System.Runtime.Serialization; - namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.Exceptions { [Serializable] @@ -32,9 +30,5 @@ public ArtifactMappingNotFoundException() public ArtifactMappingNotFoundException(string? message, Exception? innerException) : base(message, innerException) { } - - protected ArtifactMappingNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } } } diff --git a/src/TaskManager/Plug-ins/Argo/Exceptions/TemplateNotFoundException.cs b/src/TaskManager/Plug-ins/Argo/Exceptions/TemplateNotFoundException.cs index 154042a4c..38224ff05 100644 --- a/src/TaskManager/Plug-ins/Argo/Exceptions/TemplateNotFoundException.cs +++ b/src/TaskManager/Plug-ins/Argo/Exceptions/TemplateNotFoundException.cs @@ -14,8 +14,6 @@ * limitations under the License. */ -using System.Runtime.Serialization; - namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.Exceptions { [Serializable] @@ -34,9 +32,5 @@ public TemplateNotFoundException(string workflowTemplateName, string templateNam public TemplateNotFoundException(string? message, Exception? innerException) : base(message, innerException) { } - - protected TemplateNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } } } diff --git a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj index 664ee72e2..98274b92c 100755 --- a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj +++ b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj @@ -13,42 +13,31 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable false - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + - - true true ..\..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - + \ No newline at end of file diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 95c031829..44c785050 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -1,48 +1,48 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "KubernetesClient": { "type": "Direct", - "requested": "[12.0.16, )", - "resolved": "12.0.16", - "contentHash": "QQz2R/mxilejqnLcJ9fBO+/5w54wk72hy4JjRbpV6wdGyytp2o+kBOrqitWv/N9IYMp65rCJGobBjBNuSzOUHA==", + "requested": "[12.1.1, )", + "resolved": "12.1.1", + "contentHash": "Xvc6Kr/W5YUxlMDzy0R80zy+Vd66brS7fSA4COGXu8KZACKPW7+KKS7kxZBLaFYGrUcktXOHpqNNuoukSGcK6A==", "dependencies": { + "Fractions": "7.2.1", "IdentityModel.OidcClient": "5.2.1", - "KubernetesClient.Basic": "12.0.16", - "KubernetesClient.Models": "12.0.16", - "System.IdentityModel.Tokens.Jwt": "6.32.2", + "System.IdentityModel.Tokens.Jwt": "7.0.0", + "YamlDotNet": "13.3.1", "prometheus-net": "8.0.1" } }, "Microsoft.Extensions.ApiDescription.Client": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "PcPQBeYLezTWRLRnhnIT/wQkBGOxnnXVdpgJM+29H1Igv6cn3i3j+KQCUVv29zC4UrNtha4Qiy6tr7JjjyuopQ==" + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "UadNHPNDlovYULAk7Tav9ZiY28+tkZaWuWUmuYoe61wrcI5zQIZqJcVyDhoYDWCZQR/2HxcMrJNlqfJC7jXa8Q==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.2.0", - "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + "resolved": "8.2.2", + "contentHash": "+zIp8d3sbtYaRbM6hqDs4Ui/z34j7DcUmleruZlYLE4CVxXq+MO8XJyIs42vzeTYFX+k0Iq1dEbBUnQ4z/Gnrw==" }, "DnsClient": { "type": "Transitive", @@ -51,10 +51,10 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "resolved": "5.1.2", + "contentHash": "2lM76Vq+GRdwyY3BQiUJ+V6yxdFiOG4ysLJC7qNTxLsq/1pr5ZTTXiIzWQa+uJ0MuKnzzFogV5+meDflsyjs2g==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.2.0", + "CommunityToolkit.HighPerformance": "8.2.2", "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", @@ -63,7 +63,7 @@ "System.Buffers": "4.5.1", "System.Text.Encoding.CodePages": "6.0.0", "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.7", + "System.Text.Json": "6.0.9", "System.Threading.Channels": "6.0.0" } }, @@ -86,24 +86,6 @@ "Microsoft.Extensions.Logging": "6.0.0" } }, - "KubernetesClient.Basic": { - "type": "Transitive", - "resolved": "12.0.16", - "contentHash": "CV7+yoZbFF6OB5zTz2qqpqMhDsSZ0DBdOHEcZaadrXYI8V3Zefd7JCGtAB/U9AsUQBJnVSYynMPJmfhqSWJsbg==", - "dependencies": { - "KubernetesClient.Models": "12.0.16" - } - }, - "KubernetesClient.Models": { - "type": "Transitive", - "resolved": "12.0.16", - "contentHash": "VVS9KUbN7eAEJ5SP4vRhs6NbrktEKY1RV8cc2aJPwHC6Ikmw7TZOLkIqXEBA4/UZqRRIn6qNDLR2XEFgqxDO+Q==", - "dependencies": { - "Fractions": "7.2.1", - "System.Text.Json": "7.0.3", - "YamlDotNet": "13.3.1" - } - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -158,11 +140,6 @@ "resolved": "1.1.1", "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" - }, "Microsoft.Extensions.Configuration": { "type": "Transitive", "resolved": "2.2.0", @@ -173,10 +150,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { @@ -198,41 +175,53 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Http": { @@ -259,8 +248,11 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -296,11 +288,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -316,44 +308,36 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.32.2", - "contentHash": "Ul0qehKXMlq6+73l2w8/daStt8InzIzTzwt2fcMHGbe7pI5pBnwrLEwqALAxcnOkMy2wFY45kJn7QilaOdbkgw==" + "resolved": "7.0.0", + "contentHash": "7iSWSRR72VKeonFdfDi43Lvkca98Y0F3TmmWhRSuHbkjk/IKUSO0Qd272LQFZpi5eDNQNbUXy3o4THXhOAU6cw==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.32.2", - "contentHash": "QfoQdEBDir4ShH3ub/hObgNCqoH3/5bhtyMshn6WhD/3PA7lKQyIEU5QpFUON/XeOcdYQqBmzqlgwTo27C9DgQ==", + "resolved": "7.0.0", + "contentHash": "N+hUPsFZs+IhlMU+qmX8NnYVB9uMxVdcWoPIhKo4oHDR/yuIFh19SVZeFby15cm8S9yedynOcfs7TU5oDCheZw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.32.2", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.0.0" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.32.2", - "contentHash": "OgXpzJVBIQNdoyYCNgFprMZGrn2aAcU08w2oqyA2RvGrYvcVWsxJsygGcrMN0vDTvCwKUlpvjqT84eEktp3Avg==", + "resolved": "7.0.0", + "contentHash": "6I35Kt2/PQZAyUYLo3+QgT/LubZ5/4Ojelkbyo8KKdDgjMbVocAx2B3P5V7iMCz+rsAe/RLr6ql87QKnHtI+aw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.32.2" + "Microsoft.IdentityModel.Abstractions": "7.0.0" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.32.2", - "contentHash": "U4er/0UAY0AE8/Rzu9xHV1z95IqV3IbFZpqi2I4/042EBldb+s+E4lhZ3axuuioqg1mU1Ucr5Kq2EOCjf2JSgQ==", + "resolved": "7.0.0", + "contentHash": "dxYqmmFLsjBQZ6F6a4XDzrZ1CTxBRFVigJvWiNtXiIsT6UlYMxs9ONMaGx9XKzcxmcgEQ2ADuCqKZduz0LR9Hw==", "dependencies": { - "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.32.2", - "System.Security.Cryptography.Cng": "4.5.0" + "Microsoft.IdentityModel.Logging": "7.0.0" } }, "Microsoft.NETCore.Platforms": { @@ -368,32 +352,32 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, @@ -420,8 +404,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -612,11 +596,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" }, "System.Diagnostics.Tracing": { "type": "Transitive", @@ -640,11 +621,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.32.2", - "contentHash": "rChCYKLnmKLO8xFcLmOYSJh4lJXV1XkyddblRK5H3C3KDC/oYMMesU6oHd5CjvlqH1L5umtil1FQKYZG4/qDfQ==", + "resolved": "7.0.0", + "contentHash": "3OpN2iJf8lxpzVeFeeZSLtR3co6uKBs3VudS3PkkgdX5WF9fqqdhRMYf7WbkxqWQP/9RpoFbD3RimhfJe3hlQQ==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.32.2", - "Microsoft.IdentityModel.Tokens": "6.32.2" + "Microsoft.IdentityModel.JsonWebTokens": "7.0.0", + "Microsoft.IdentityModel.Tokens": "7.0.0" } }, "System.IO": { @@ -661,8 +642,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -773,11 +758,6 @@ "System.Runtime.Handles": "4.0.1" } }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", @@ -809,19 +789,19 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg==", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Json": { "type": "Transitive", - "resolved": "7.0.3", - "contentHash": "AyjhwXN1zTFeIibHimfJn6eAsZ7rTBib79JQpzg8WAuR/HKDu9JGNHTuu3nbbXQ/bgI+U4z6HtZmCHNXB1QXrQ==", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "7.0.0" + "System.Text.Encodings.Web": "6.0.0" } }, "System.Threading": { @@ -863,6 +843,19 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "YamlDotNet": { "type": "Transitive", "resolved": "13.3.1", @@ -871,23 +864,23 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[2.0.0, )", + "Monai.Deploy.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.1.1, )" + "fo-dicom": "[5.1.2, )" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } } } diff --git a/src/TaskManager/Plug-ins/Docker/ContainerMonitorException.cs b/src/TaskManager/Plug-ins/Docker/ContainerMonitorException.cs index d6646f531..28f4ab624 100644 --- a/src/TaskManager/Plug-ins/Docker/ContainerMonitorException.cs +++ b/src/TaskManager/Plug-ins/Docker/ContainerMonitorException.cs @@ -14,8 +14,6 @@ * limitations under the License. */ -using System.Runtime.Serialization; - namespace Monai.Deploy.WorkflowManager.TaskManager.Docker { [Serializable] @@ -32,9 +30,5 @@ public ContainerMonitorException(string? message) : base(message) public ContainerMonitorException(string? message, Exception? innerException) : base(message, innerException) { } - - protected ContainerMonitorException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } } -} \ No newline at end of file +} diff --git a/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj b/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj index d83e94888..2805bae7d 100644 --- a/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj +++ b/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj @@ -13,34 +13,27 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable ..\..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset false - - - - - - + \ No newline at end of file diff --git a/src/TaskManager/Plug-ins/Docker/SetPermissionException.cs b/src/TaskManager/Plug-ins/Docker/SetPermissionException.cs index 66c9695aa..ee791d04b 100644 --- a/src/TaskManager/Plug-ins/Docker/SetPermissionException.cs +++ b/src/TaskManager/Plug-ins/Docker/SetPermissionException.cs @@ -14,8 +14,6 @@ * limitations under the License. */ -using System.Runtime.Serialization; - namespace Monai.Deploy.WorkflowManager.TaskManager.Docker { [Serializable] @@ -32,9 +30,5 @@ public SetPermissionException(string? message) : base(message) public SetPermissionException(string? message, Exception? innerException) : base(message, innerException) { } - - protected SetPermissionException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } } } diff --git a/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj b/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj index 30af7abd0..f949dc21e 100644 --- a/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj +++ b/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj @@ -13,25 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. --> - - - net6.0 + net8.0 enable enable - - - - + \ No newline at end of file diff --git a/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj b/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj index 070c0c8f4..a59db1972 100644 --- a/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj +++ b/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj @@ -13,22 +13,17 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable false enable - - - - + \ No newline at end of file diff --git a/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs b/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs index 44ca990cf..85482ffc5 100644 --- a/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs +++ b/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs @@ -50,7 +50,7 @@ private void Validate() public override async Task> RetrieveMetadata(CancellationToken cancellationToken = default) { - return await Task.Run(() => new Dictionary()).ConfigureAwait(false); + return await Task.Run(() => new Dictionary()).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); } ~TestPluginRepository() => Dispose(disposing: false); diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index 661861962..e4870f62e 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -13,68 +13,57 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - Exe - net6.0 + net8.0 enable enable false - - - - - - - - - - - - - + + + + true - - + + true - + all runtime; build; native; contentfiles; analyzers; buildtransitive + - @@ -85,9 +74,8 @@ - + - Always @@ -102,13 +90,11 @@ PreserveNewest - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - @@ -116,7 +102,6 @@ - @@ -124,5 +109,4 @@ - - + \ No newline at end of file diff --git a/src/TaskManager/TaskManager/Program.cs b/src/TaskManager/TaskManager/Program.cs index ca2ade634..563635a00 100755 --- a/src/TaskManager/TaskManager/Program.cs +++ b/src/TaskManager/TaskManager/Program.cs @@ -114,11 +114,11 @@ private static void ConfigureServices(HostBuilderContext hostContext, IServiceCo services.AddHttpClient(); // StorageService - services.AddMonaiDeployStorageService(hostContext.Configuration.GetSection("WorkflowManager:storage:serviceAssemblyName").Value, HealthCheckOptions.ServiceHealthCheck | HealthCheckOptions.AdminServiceHealthCheck); + services.AddMonaiDeployStorageService(hostContext.Configuration.GetSection("WorkflowManager:storage:serviceAssemblyName").Value!, HealthCheckOptions.ServiceHealthCheck | HealthCheckOptions.AdminServiceHealthCheck); // MessageBroker - services.AddMonaiDeployMessageBrokerPublisherService(hostContext.Configuration.GetSection("WorkflowManager:messaging:publisherServiceAssemblyName").Value, true); - services.AddMonaiDeployMessageBrokerSubscriberService(hostContext.Configuration.GetSection("WorkflowManager:messaging:subscriberServiceAssemblyName").Value, true); + services.AddMonaiDeployMessageBrokerPublisherService(hostContext.Configuration.GetSection("WorkflowManager:messaging:publisherServiceAssemblyName").Value!, true); + services.AddMonaiDeployMessageBrokerSubscriberService(hostContext.Configuration.GetSection("WorkflowManager:messaging:subscriberServiceAssemblyName").Value!, true); // Mongo DB (Workflow Manager) services.Configure(hostContext.Configuration.GetSection("WorkloadManagerDatabase")); diff --git a/src/TaskManager/TaskManager/Services/Http/Startup.cs b/src/TaskManager/TaskManager/Services/Http/Startup.cs index 09282d7a8..4d828d80c 100755 --- a/src/TaskManager/TaskManager/Services/Http/Startup.cs +++ b/src/TaskManager/TaskManager/Services/Http/Startup.cs @@ -89,9 +89,13 @@ public void ConfigureServices(IServiceCollection services) var logger = serviceProvider.GetService>(); services.AddHttpLoggingForMonai(Configuration); +#pragma warning disable CS8604 // Possible null reference argument. +#pragma warning disable CS8604 // Possible null reference argument. services.AddHealthChecks() .AddCheck("Task Manager Services") .AddMongoDb(mongodbConnectionString: Configuration["WorkloadManagerDatabase:ConnectionString"], mongoDatabaseName: Configuration["WorkloadManagerDatabase:DatabaseName"]); +#pragma warning restore CS8604 // Possible null reference argument. +#pragma warning restore CS8604 // Possible null reference argument. } /// diff --git a/src/TaskManager/TaskManager/TaskManagerException.cs b/src/TaskManager/TaskManager/TaskManagerException.cs index 0bf8aa205..e35866803 100644 --- a/src/TaskManager/TaskManager/TaskManagerException.cs +++ b/src/TaskManager/TaskManager/TaskManagerException.cs @@ -14,12 +14,9 @@ * limitations under the License. */ -using System.Runtime.Serialization; - namespace Monai.Deploy.WorkflowManager.TaskManager { [Serializable] -#pragma warning disable SA1600 // Elements should be documented internal class TaskManagerException : Exception { public TaskManagerException() @@ -35,11 +32,5 @@ public TaskManagerException(string? message, Exception? innerException) : base(message, innerException) { } - - protected TaskManagerException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } -#pragma warning restore SA1600 // Elements should be documented } } diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index b5b7f2ace..6856c0201 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -1,90 +1,90 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "AspNetCore.HealthChecks.MongoDb": { "type": "Direct", - "requested": "[6.0.2, )", - "resolved": "6.0.2", - "contentHash": "0R3NVbsjMhS5fd2hGijzQNKJ0zQBv/qMC7nkpmnbtgribCj7vfNdAhSqv4lwbibffRWPW5A/7VNJMX4aPej0WQ==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "0YjJlCwkwulozPxFCRcJAl2CdjU5e5ekj4/BQsA6GZbzRxwtN3FIg7LJcWUUgMdwqDoe+6SKFBRnSRpfLY4owA==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.2", - "MongoDB.Driver": "2.14.1" + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "MongoDB.Driver": "2.22.0" } }, "Microsoft.AspNetCore.Mvc.NewtonsoftJson": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "CVZatoGdeRlC74aw1lrg0+U49h1o+T23gcsFI/Xxmb+48+5cuoZawshSLLhpMeCxurIvmk6owfA+D6wvOvkn0g==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "/e5+eBvY759xiZJO+y1lHi4VzXqbDzTJSyCtKpaj3Ko2JAFQjiCOJ0ZHk2i4g4HpoSdXmzEXQsjr6dUX9U0/JA==", "dependencies": { - "Microsoft.AspNetCore.JsonPatch": "6.0.22", - "Newtonsoft.Json": "13.0.1", + "Microsoft.AspNetCore.JsonPatch": "8.0.0", + "Newtonsoft.Json": "13.0.3", "Newtonsoft.Json.Bson": "1.0.2" } }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[1.0.6, )", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "requested": "[2.0.0, )", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.6, )", - "resolved": "1.0.6", - "contentHash": "Ka4K58/brPHv/GiUdiWsKPvnesfNqYrSN3GVa1sRp6iAGSmO7QA1Yl5/Pd/q494U55OGNI9JPtEbQZUx6G4/nQ==", + "requested": "[2.0.0, )", + "resolved": "2.0.0", + "contentHash": "J5dXjOBqA59irTcFbfwxIQnLxUXGcMCA/cuk1+TJgscMeb2WTVks3esZmcs3pOY2OIBmOROvBl/6KaL9cYFPmg==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.6", - "Polly": "7.2.4", - "RabbitMQ.Client": "6.5.0" + "Monai.Deploy.Messaging": "2.0.0", + "Polly": "8.2.0", + "RabbitMQ.Client": "6.8.1" } }, "Monai.Deploy.Security": { "type": "Direct", - "requested": "[0.1.3, )", - "resolved": "0.1.3", - "contentHash": "9/E/UEK9Foo1cUHRRgNIR8uk+oTLiBbzR2vqBsxIo1EwbduDVuBGFcIh2lpAJZmFFwBNv0KtmTASdD3w5UWd+g==", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.11", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Logging.Configuration": "6.0.0" + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "q0dQiOpOoHX4a3XkueqFRx51WOrQpW1Lwj7e4oqI6aOBeUlA9CPMdZ4+4BlemXc/1A5IClrPugp/owZ1NJ2Wxg==", + "dependencies": { + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.AspNetCore.Authentication.JwtBearer": "8.0.0", + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Configuration": "8.0.0" } }, "Monai.Deploy.Storage.MinIO": { "type": "Direct", - "requested": "[0.2.18, )", - "resolved": "0.2.18", - "contentHash": "0sHLiT0qU2Fg5O+AF8UDqzsJEYztUAFZeOPh4kOLC4bckhb+wSsuv7VcAXWtR3BOY6TxaMVVUJ+EK/o5mCp3tQ==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "o6Lq9rshOJ3sxz4lIfl14Zn7+YXvXXg2Jpndtnnx4Ez1RDSTDu2Zf08lEgFHTmwAML1e4fsVVm16LaXv3h3L3A==", "dependencies": { - "Minio": "5.0.0", - "Monai.Deploy.Storage": "0.2.18", - "Monai.Deploy.Storage.S3Policy": "0.2.18" + "Minio": "6.0.1", + "Monai.Deploy.Storage": "1.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0" } }, "NLog": { "type": "Direct", - "requested": "[5.2.4, )", - "resolved": "5.2.4", - "contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ==" + "requested": "[5.2.8, )", + "resolved": "5.2.8", + "contentHash": "jAIELkWBs1CXFPp986KSGpDFQZHCFccO+LMbKBTTNm42KifaI1mYzFMFQQfuGmGMTrCx0TFPhDjHDE4cLAZWiQ==" }, "NLog.Web.AspNetCore": { "type": "Direct", - "requested": "[5.3.4, )", - "resolved": "5.3.4", - "contentHash": "80FaN8CKu94E3mZqZ+r46nRyEYgnHMn4i3vPslbaINs8k+TqJClNFYw6uWLhPU4AN7PKi/jHHzpswqn7K8jgGg==", + "requested": "[5.3.8, )", + "resolved": "5.3.8", + "contentHash": "Rt2OCulpAF6rSrZWZzPgHikAI8SDKkq3/52xA/uJ4JtmNjoizULN/IBYtYlZojbPbXiFm3uadOO2rOvvMhjXBQ==", "dependencies": { - "NLog.Extensions.Logging": "5.3.4" + "NLog.Extensions.Logging": "5.3.8" } }, "StyleCop.Analyzers": { @@ -107,26 +107,26 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.2.0", - "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + "resolved": "8.2.2", + "contentHash": "+zIp8d3sbtYaRbM6hqDs4Ui/z34j7DcUmleruZlYLE4CVxXq+MO8XJyIs42vzeTYFX+k0Iq1dEbBUnQ4z/Gnrw==" }, "DnsClient": { "type": "Transitive", @@ -148,10 +148,10 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "resolved": "5.1.2", + "contentHash": "2lM76Vq+GRdwyY3BQiUJ+V6yxdFiOG4ysLJC7qNTxLsq/1pr5ZTTXiIzWQa+uJ0MuKnzzFogV5+meDflsyjs2g==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.2.0", + "CommunityToolkit.HighPerformance": "8.2.2", "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", @@ -160,7 +160,7 @@ "System.Buffers": "4.5.1", "System.Text.Encoding.CodePages": "6.0.0", "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.7", + "System.Text.Json": "6.0.9", "System.Threading.Channels": "6.0.0" } }, @@ -185,34 +185,16 @@ }, "KubernetesClient": { "type": "Transitive", - "resolved": "12.0.16", - "contentHash": "QQz2R/mxilejqnLcJ9fBO+/5w54wk72hy4JjRbpV6wdGyytp2o+kBOrqitWv/N9IYMp65rCJGobBjBNuSzOUHA==", + "resolved": "12.1.1", + "contentHash": "Xvc6Kr/W5YUxlMDzy0R80zy+Vd66brS7fSA4COGXu8KZACKPW7+KKS7kxZBLaFYGrUcktXOHpqNNuoukSGcK6A==", "dependencies": { + "Fractions": "7.2.1", "IdentityModel.OidcClient": "5.2.1", - "KubernetesClient.Basic": "12.0.16", - "KubernetesClient.Models": "12.0.16", - "System.IdentityModel.Tokens.Jwt": "6.32.2", + "System.IdentityModel.Tokens.Jwt": "7.0.0", + "YamlDotNet": "13.3.1", "prometheus-net": "8.0.1" } }, - "KubernetesClient.Basic": { - "type": "Transitive", - "resolved": "12.0.16", - "contentHash": "CV7+yoZbFF6OB5zTz2qqpqMhDsSZ0DBdOHEcZaadrXYI8V3Zefd7JCGtAB/U9AsUQBJnVSYynMPJmfhqSWJsbg==", - "dependencies": { - "KubernetesClient.Models": "12.0.16" - } - }, - "KubernetesClient.Models": { - "type": "Transitive", - "resolved": "12.0.16", - "contentHash": "VVS9KUbN7eAEJ5SP4vRhs6NbrktEKY1RV8cc2aJPwHC6Ikmw7TZOLkIqXEBA4/UZqRRIn6qNDLR2XEFgqxDO+Q==", - "dependencies": { - "Fractions": "7.2.1", - "System.Text.Json": "7.0.3", - "YamlDotNet": "13.3.1" - } - }, "LightInject": { "type": "Transitive", "resolved": "5.4.0", @@ -223,10 +205,10 @@ }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "ivpWC8L84Y+l9VZOa0uJXPoUE+n3TiSRZpfKxMElRtLMYCeXmz5x3O7CuCJkZ65z1520RWuEZDmHefxiz5TqPg==", + "resolved": "8.0.0", + "contentHash": "rwxaZYHips5M9vqxRkGfJthTx+Ws4O4yCuefn17J371jL3ouC5Ker43h2hXb5yd9BMnImE9rznT75KJHm6bMgg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.0.3" } }, "Microsoft.AspNetCore.Hosting.Abstractions": { @@ -267,11 +249,11 @@ }, "Microsoft.AspNetCore.JsonPatch": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "jQAfNQ7ExLXVUeenihZDqxRr3sBNf8SsenFDOgikb9KaWoWuX91PqSo3G+JDWJppHMucjN55wgEEC3fg5Lzqew==", + "resolved": "8.0.0", + "contentHash": "klQdb/9+j0u8MDjoqHEgDCPz8GRhfsbRVvZIM3glFqjs8uY7S1hS9RvKZuz8o4dS9NsEpFp4Jccd8CQuIYHK0g==", "dependencies": { "Microsoft.CSharp": "4.7.0", - "Newtonsoft.Json": "13.0.1" + "Newtonsoft.Json": "13.0.3" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -289,6 +271,11 @@ "resolved": "4.7.0", "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" }, + "Microsoft.Extensions.ApiDescription.Client": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "UadNHPNDlovYULAk7Tav9ZiY28+tkZaWuWUmuYoe61wrcI5zQIZqJcVyDhoYDWCZQR/2HxcMrJNlqfJC7jXa8Q==" + }, "Microsoft.Extensions.ApiDescription.Server": { "type": "Transitive", "resolved": "6.0.5", @@ -296,75 +283,86 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "8.0.0", + "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "b3ErKzND8LIC7o08QAVlKfaEIYEvLJbtmVbFZVBRXeu9YkKfSSzLZfR1SUfQPBIy9mKLhEtJgGYImkcMNaKE0A==", + "resolved": "8.0.0", + "contentHash": "mBMoXLsr5s1y2zOHWmKsE9veDcx8h1x/c3rz4baEdQKTeDcmQAPNbB54Pi/lhFO3K431eEq6PFbMgLaa6PHFfA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", + "resolved": "8.0.0", + "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Http": { @@ -379,34 +377,35 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "8.0.0", + "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==", "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.DependencyInjection": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZDskjagmBAbv+K8rYW9VhjPplhbOE63xUD0DiuydZJwt15dRyoqicYklLd86zzeintUc7AptDkHn+YhhYkYo8A==", + "resolved": "8.0.0", + "contentHash": "ixXXV0G/12g6MXK65TLngYN9V5hQQRuV+fZi882WIoVJT7h5JvoYoxTEwCgdqwLjSneqh1O+66gM8sMr9z/rsQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0" + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" } }, "Microsoft.Extensions.Logging.Console": { @@ -434,83 +433,75 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bXWINbTn0vC0FYc9GaQTISbxhQLAMrvtbuvD9N6JelEaIS/Pr62wUCinrq5bf1WRBGczt1v4wDhxFtVFNcMdUQ==", + "resolved": "8.0.0", + "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.32.2", - "contentHash": "Ul0qehKXMlq6+73l2w8/daStt8InzIzTzwt2fcMHGbe7pI5pBnwrLEwqALAxcnOkMy2wFY45kJn7QilaOdbkgw==" + "resolved": "7.0.3", + "contentHash": "cfPUWdjigLIRIJSKz3uaZxShgf86RVDXHC1VEEchj1gnY25akwPYpbrfSoIGDCqA9UmOMdlctq411+2pAViFow==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.32.2", - "contentHash": "QfoQdEBDir4ShH3ub/hObgNCqoH3/5bhtyMshn6WhD/3PA7lKQyIEU5QpFUON/XeOcdYQqBmzqlgwTo27C9DgQ==", + "resolved": "7.0.3", + "contentHash": "vxjHVZbMKD3rVdbvKhzAW+7UiFrYToUVm3AGmYfKSOAwyhdLl/ELX1KZr+FaLyyS5VReIzWRWJfbOuHM9i6ywg==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.32.2", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.0.3" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.32.2", - "contentHash": "OgXpzJVBIQNdoyYCNgFprMZGrn2aAcU08w2oqyA2RvGrYvcVWsxJsygGcrMN0vDTvCwKUlpvjqT84eEktp3Avg==", + "resolved": "7.0.3", + "contentHash": "b6GbGO+2LOTBEccHhqoJsOsmemG4A/MY+8H0wK/ewRhiG+DCYwEnucog1cSArPIY55zcn+XdZl0YEiUHkpDISQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.32.2" + "Microsoft.IdentityModel.Abstractions": "7.0.3" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "DFyXD0xylP+DknCT3hzJ7q/Q5qRNu0hO/gCU90O0ATdR0twZmlcuY9RNYaaDofXKVbzcShYNCFCGle2G/o8mkg==", + "resolved": "7.0.3", + "contentHash": "BtwR+tctBYhPNygyZmt1Rnw74GFrJteW+1zcdIgyvBCjkek6cNwPPqRfdhzCv61i+lwyNomRi8+iI4QKd4YCKA==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.10.0", - "Microsoft.IdentityModel.Tokens": "6.10.0" + "Microsoft.IdentityModel.Logging": "7.0.3", + "Microsoft.IdentityModel.Tokens": "7.0.3" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "LVvMXAWPbPeEWTylDrxunlHH2wFyE4Mv0L4gZrJHC4HTESbWHquKZb/y/S8jgiQEDycOP0PDQvbG4RR/tr2TVQ==", + "resolved": "7.0.3", + "contentHash": "W97TraHApDNArLwpPcXfD+FZH7njJsfEwZE9y9BoofeXMS8H0LBBobz0VOmYmMK4mLdOKxzN7SFT3Ekg0FWI3Q==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.10.0", - "System.IdentityModel.Tokens.Jwt": "6.10.0" + "Microsoft.IdentityModel.Protocols": "7.0.3", + "System.IdentityModel.Tokens.Jwt": "7.0.3" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.32.2", - "contentHash": "U4er/0UAY0AE8/Rzu9xHV1z95IqV3IbFZpqi2I4/042EBldb+s+E4lhZ3axuuioqg1mU1Ucr5Kq2EOCjf2JSgQ==", + "resolved": "7.0.3", + "contentHash": "wB+LlbDjhnJ98DULjmFepqf9eEMh/sDs6S6hFh68iNRHmwollwhxk+nbSSfpA5+j+FbRyNskoaY4JsY1iCOKCg==", "dependencies": { - "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.32.2", - "System.Security.Cryptography.Cng": "4.5.0" + "Microsoft.IdentityModel.Logging": "7.0.3" } }, "Microsoft.NETCore.Platforms": { @@ -539,31 +530,33 @@ }, "Minio": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "7tZj90WEuuH60RAP4wBYexjMuJOhCnK7I46hCiX3CtZPackHisLZ8aAJmn3KlwbUX22dBDphwemD+h37vet8Qw==", + "resolved": "6.0.1", + "contentHash": "uavo/zTpUzHLqnB0nyAk6E/2THLRPvZ59Md7IkLKXkAFiX//K2knVK2+dSHDNN2uAUqCvLqO+cM+s9VGBWbIKQ==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.1.0", + "CommunityToolkit.HighPerformance": "8.2.2", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Logging": "7.0.0", "System.IO.Hashing": "7.0.0", - "System.Reactive.Linq": "5.0.0" + "System.Reactive": "6.0.0" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, @@ -590,8 +583,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -599,29 +592,29 @@ }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", + "resolved": "2.23.1", + "contentHash": "kidqCwGBuLBx2IcW4os3J6zsp9yaUWm7Sp8G08Nm2RVRSAf0cJXfsynl2wRWpHh0HgfIzzwkevP/qhfsKfu8bQ==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", - "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Bson": "2.23.1", + "MongoDB.Driver.Core": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", + "resolved": "2.23.1", + "contentHash": "K8LMdnVgT82vdbSllv8VzjPOLa9k5rLcCBd1fG45z+QGJNPWzAFW5lLgLJQ7xXuJgQIwvP1DBx6X6ecWBtox7g==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", + "MongoDB.Bson": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", - "ZstdSharp.Port": "0.6.2" + "ZstdSharp.Port": "0.7.3" } }, "MongoDB.Libmongocrypt": { @@ -644,18 +637,26 @@ }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.3.4", - "contentHash": "rxUGUqhE3DlcKfKhPJOI0xOt8q2+NX0NkBY9lbRXwZEYQsh8ASFS8X7K+Y7/dcE8v0tpAe7GF8rPD5h4h9Hpsg==", + "resolved": "5.3.8", + "contentHash": "6VD0lyeokWltL6j8lO7mS7v7lbuO/qn0F7kdvhKhEx1JvFyD39nzohOK3JvkVh4Nn3mrcMDCyDxvTvmiW55jQg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.2.4" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "NLog": "5.2.8" } }, "Polly": { "type": "Transitive", - "resolved": "7.2.4", - "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" + "resolved": "8.2.0", + "contentHash": "KZm8iG29y6Mse7YntYYJSf5fGWuhYLliWgZaG/8NcuXS4gN7SPdtPYpjCxQlHqxvMGubkWVrGp3MvUaI7SkyKA==", + "dependencies": { + "Polly.Core": "8.2.0" + } + }, + "Polly.Core": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "gnKp3+mxGFmkFs4eHcD9aex0JOF8zS1Y18c2A5ckXXTVqbs6XLcDyLKgSa/mUFqAnH3mn9+uVIM0RhAec/d3kA==" }, "prometheus-net": { "type": "Transitive", @@ -668,8 +669,8 @@ }, "RabbitMQ.Client": { "type": "Transitive", - "resolved": "6.5.0", - "contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==", + "resolved": "6.8.1", + "contentHash": "jNsmGgmCNw2S/NzskeN2ijtGywtH4Sk/G6jWUTD5sY9SrC27Xz6BsLIiB8hdsfjeyWCa4j4GvCIGkpE8wrjU1Q==", "dependencies": { "System.Memory": "4.5.5", "System.Threading.Channels": "7.0.0" @@ -837,11 +838,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" }, "System.Diagnostics.Tracing": { "type": "Transitive", @@ -865,11 +863,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.32.2", - "contentHash": "rChCYKLnmKLO8xFcLmOYSJh4lJXV1XkyddblRK5H3C3KDC/oYMMesU6oHd5CjvlqH1L5umtil1FQKYZG4/qDfQ==", + "resolved": "7.0.3", + "contentHash": "caEe+OpQNYNiyZb+DJpUVROXoVySWBahko2ooNfUcllxa9ZQUM8CgM/mDjP6AoFn6cQU9xMmG+jivXWub8cbGg==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.32.2", - "Microsoft.IdentityModel.Tokens": "6.32.2" + "Microsoft.IdentityModel.JsonWebTokens": "7.0.3", + "Microsoft.IdentityModel.Tokens": "7.0.3" } }, "System.IO": { @@ -886,8 +884,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -924,17 +926,8 @@ }, "System.Reactive": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==" - }, - "System.Reactive.Linq": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "IB4/qlV4T1WhZvM11RVoFUSZXPow9VWVeQ1uDkSKgz6bAO+gCf65H/vjrYlwyXmojSSxvfHndF9qdH43P/IuAw==", - "dependencies": { - "System.Reactive": "5.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } + "resolved": "6.0.0", + "contentHash": "31kfaW4ZupZzPsI5PVe77VhnvFF55qgma7KZr/E0iFTs6fmdhhG8j0mgEx620iLTey1EynOkEfnyTjtNEpJzGw==" }, "System.Reflection": { "type": "Transitive", @@ -1026,11 +1019,6 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", @@ -1067,19 +1055,19 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg==", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Json": { "type": "Transitive", - "resolved": "7.0.3", - "contentHash": "AyjhwXN1zTFeIibHimfJn6eAsZ7rTBib79JQpzg8WAuR/HKDu9JGNHTuu3nbbXQ/bgI+U4z6HtZmCHNXB1QXrQ==", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "7.0.0" + "System.Text.Encodings.Web": "6.0.0" } }, "System.Threading": { @@ -1126,6 +1114,19 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "YamlDotNet": { "type": "Transitive", "resolved": "13.3.1", @@ -1133,21 +1134,21 @@ }, "ZstdSharp.Port": { "type": "Transitive", - "resolved": "0.6.2", - "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" }, "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[2.0.0, )", + "Monai.Deploy.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.1.1, )" + "fo-dicom": "[5.1.2, )" } }, "monai.deploy.workflowmanager.taskmanager.aideclinicalreview": { @@ -1161,15 +1162,16 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } }, "monai.deploy.workflowmanager.taskmanager.argo": { "type": "Project", "dependencies": { - "KubernetesClient": "[12.0.16, )", + "KubernetesClient": "[12.1.1, )", + "Microsoft.Extensions.ApiDescription.Client": "[8.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )" @@ -1179,7 +1181,7 @@ "type": "Project", "dependencies": { "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )", - "MongoDB.Driver": "[2.21.0, )" + "MongoDB.Driver": "[2.23.1, )" } }, "monai.deploy.workflowmanager.taskmanager.docker": { diff --git a/src/WorkflowManager/Common/Monai.Deploy.WorkflowManager.Common.csproj b/src/WorkflowManager/Common/Monai.Deploy.WorkflowManager.Common.csproj index f7db645d0..e7562cafd 100644 --- a/src/WorkflowManager/Common/Monai.Deploy.WorkflowManager.Common.csproj +++ b/src/WorkflowManager/Common/Monai.Deploy.WorkflowManager.Common.csproj @@ -13,33 +13,26 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset false - - - - - - + \ No newline at end of file diff --git a/src/WorkflowManager/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj b/src/WorkflowManager/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj index f4dd8c6ca..92f2b77f9 100644 --- a/src/WorkflowManager/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj +++ b/src/WorkflowManager/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj @@ -13,34 +13,27 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset false - - - - - - + \ No newline at end of file diff --git a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index e2dbf8144..a6067f1ca 100644 --- a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -13,33 +13,26 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 Monai.Deploy.WorkflowManager.Contracts enable ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset false - - - - - - + - + - + \ No newline at end of file diff --git a/src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj b/src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj index 174cbfa6c..ce796cbcb 100755 --- a/src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj +++ b/src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj @@ -13,48 +13,38 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 Monai.Deploy.WorkflowManager.Database enable false - - - - - - - + - - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - + \ No newline at end of file diff --git a/src/WorkflowManager/Database/Repositories/ArtifactsRepository.cs b/src/WorkflowManager/Database/Repositories/ArtifactsRepository.cs index b3ecb4378..5f78bdb51 100644 --- a/src/WorkflowManager/Database/Repositories/ArtifactsRepository.cs +++ b/src/WorkflowManager/Database/Repositories/ArtifactsRepository.cs @@ -175,6 +175,7 @@ public async Task AddOrUpdateItemAsync(string workflowInstanceId, string taskId, .FindAsync(a => a.WorkflowInstanceId == workflowInstanceId && a.TaskId == taskId).ConfigureAwait(false); var existing = await result.FirstOrDefaultAsync().ConfigureAwait(false); +#pragma warning disable CS0168 // Variable is declared but never used try { if (existing == null) @@ -195,6 +196,7 @@ await _artifactReceivedItemsCollection throw; } +#pragma warning restore CS0168 // Variable is declared but never used } diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index e7cf1adb5..dcd4dbc18 100644 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Mongo.Migration": { "type": "Direct", "requested": "[3.1.4, )", @@ -26,20 +26,20 @@ }, "MongoDB.Driver": { "type": "Direct", - "requested": "[2.21.0, )", - "resolved": "2.21.0", - "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", + "requested": "[2.23.1, )", + "resolved": "2.23.1", + "contentHash": "kidqCwGBuLBx2IcW4os3J6zsp9yaUWm7Sp8G08Nm2RVRSAf0cJXfsynl2wRWpHh0HgfIzzwkevP/qhfsKfu8bQ==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", - "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Bson": "2.23.1", + "MongoDB.Driver.Core": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0" } }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", @@ -116,10 +116,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { @@ -140,41 +140,53 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging": { @@ -190,8 +202,11 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -222,11 +237,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -242,11 +257,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -269,19 +281,19 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -289,18 +301,18 @@ }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", + "resolved": "2.23.1", + "contentHash": "K8LMdnVgT82vdbSllv8VzjPOLa9k5rLcCBd1fG45z+QGJNPWzAFW5lLgLJQ7xXuJgQIwvP1DBx6X6ecWBtox7g==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", + "MongoDB.Bson": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", - "ZstdSharp.Port": "0.6.2" + "ZstdSharp.Port": "0.7.3" } }, "MongoDB.Libmongocrypt": { @@ -457,6 +469,11 @@ "System.Runtime": "4.3.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" + }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -491,8 +508,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -567,8 +588,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, "System.Runtime.Extensions": { "type": "Transitive", @@ -677,17 +698,30 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "ZstdSharp.Port": { "type": "Transitive", - "resolved": "0.6.2", - "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } }, "monai.deploy.workflowmanager.logging": { diff --git a/src/WorkflowManager/Logging/Monai.Deploy.WorkflowManager.Logging.csproj b/src/WorkflowManager/Logging/Monai.Deploy.WorkflowManager.Logging.csproj index 173f57a23..4733fdd3e 100644 --- a/src/WorkflowManager/Logging/Monai.Deploy.WorkflowManager.Logging.csproj +++ b/src/WorkflowManager/Logging/Monai.Deploy.WorkflowManager.Logging.csproj @@ -13,34 +13,24 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable false - - - - - - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - + \ No newline at end of file diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index c6ed3f498..5addc37b0 100644 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -1,11 +1,11 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "DnsClient": { "type": "Transitive", @@ -66,10 +66,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { @@ -90,41 +90,53 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging": { @@ -140,8 +152,11 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -172,11 +187,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -192,11 +207,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -210,13 +222,13 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Mongo.Migration": { @@ -242,8 +254,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -423,6 +435,11 @@ "System.Runtime": "4.3.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" + }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -457,8 +474,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -533,8 +554,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, "System.Runtime.Extensions": { "type": "Transitive", @@ -638,12 +659,25 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } } } diff --git a/src/WorkflowManager/MonaiBackgroundService/Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj b/src/WorkflowManager/MonaiBackgroundService/Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj index 8f37872bf..db2a0a446 100644 --- a/src/WorkflowManager/MonaiBackgroundService/Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj +++ b/src/WorkflowManager/MonaiBackgroundService/Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj @@ -13,30 +13,23 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable Library ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset false - - - - - - + \ No newline at end of file diff --git a/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj b/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj index e548dc395..e2b3d1d7b 100644 --- a/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj +++ b/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj @@ -13,28 +13,21 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable false - - - - - @@ -42,11 +35,9 @@ - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - + \ No newline at end of file diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index d4e29c207..0dff6209a 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -1,29 +1,29 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.2.0", - "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + "resolved": "8.2.2", + "contentHash": "+zIp8d3sbtYaRbM6hqDs4Ui/z34j7DcUmleruZlYLE4CVxXq+MO8XJyIs42vzeTYFX+k0Iq1dEbBUnQ4z/Gnrw==" }, "DnsClient": { "type": "Transitive", @@ -35,10 +35,10 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "resolved": "5.1.2", + "contentHash": "2lM76Vq+GRdwyY3BQiUJ+V6yxdFiOG4ysLJC7qNTxLsq/1pr5ZTTXiIzWQa+uJ0MuKnzzFogV5+meDflsyjs2g==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.2.0", + "CommunityToolkit.HighPerformance": "8.2.2", "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", @@ -47,7 +47,7 @@ "System.Buffers": "4.5.1", "System.Text.Encoding.CodePages": "6.0.0", "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.7", + "System.Text.Json": "6.0.9", "System.Threading.Channels": "6.0.0" } }, @@ -115,10 +115,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { @@ -140,41 +140,53 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging": { @@ -191,8 +203,11 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -223,11 +238,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -243,11 +258,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -270,32 +282,32 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, @@ -322,8 +334,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -331,29 +343,29 @@ }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", + "resolved": "2.23.1", + "contentHash": "kidqCwGBuLBx2IcW4os3J6zsp9yaUWm7Sp8G08Nm2RVRSAf0cJXfsynl2wRWpHh0HgfIzzwkevP/qhfsKfu8bQ==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", - "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Bson": "2.23.1", + "MongoDB.Driver.Core": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", + "resolved": "2.23.1", + "contentHash": "K8LMdnVgT82vdbSllv8VzjPOLa9k5rLcCBd1fG45z+QGJNPWzAFW5lLgLJQ7xXuJgQIwvP1DBx6X6ecWBtox7g==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", + "MongoDB.Bson": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", - "ZstdSharp.Port": "0.6.2" + "ZstdSharp.Port": "0.7.3" } }, "MongoDB.Libmongocrypt": { @@ -512,11 +524,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" }, "System.Diagnostics.Tracing": { "type": "Transitive", @@ -552,8 +561,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -717,8 +730,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -763,10 +776,23 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "ZstdSharp.Port": { "type": "Transitive", - "resolved": "0.6.2", - "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" }, "monai.deploy.workflowmanager.common": { "type": "Project", @@ -779,15 +805,15 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[2.0.0, )", + "Monai.Deploy.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.1.1, )" + "fo-dicom": "[5.1.2, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { @@ -802,9 +828,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } }, "monai.deploy.workflowmanager.database": { @@ -813,7 +839,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.21.0, )" + "MongoDB.Driver": "[2.23.1, )" } }, "monai.deploy.workflowmanager.logging": { @@ -825,7 +851,7 @@ "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Monai.Deploy.Storage": "[0.2.18, )", + "Monai.Deploy.Storage": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } @@ -833,7 +859,7 @@ "monai.deploy.workloadmanager.workflowexecuter": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", diff --git a/src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj b/src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj index 84b49af3d..da1e03606 100644 --- a/src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj +++ b/src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj @@ -13,41 +13,32 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable false - - - - - - - - - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - + + + + \ No newline at end of file diff --git a/src/WorkflowManager/Services/packages.lock.json b/src/WorkflowManager/Services/packages.lock.json index e33b7f8dc..ad7e2bef1 100644 --- a/src/WorkflowManager/Services/packages.lock.json +++ b/src/WorkflowManager/Services/packages.lock.json @@ -1,35 +1,37 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Microsoft.Extensions.Http": { "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "15+pa2G0bAMHbHewaQIdr/y6ag2H3yh4rd9hTXavtWDzQBkvpe2RMqFg8BxDpcQWssmjmBApGPcw93QRz6YcMg==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "cWz4caHwvx0emoYe7NkHPxII/KkTI8R/LC9qdqJqnKv2poTJ4e2qqPGQqvRoQ5kaSA4FU5IV3qFAuLuOhoqULQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "DnsClient": { @@ -86,92 +88,115 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", + "resolved": "8.0.0", + "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==", + "resolved": "8.0.0", + "contentHash": "mBMoXLsr5s1y2zOHWmKsE9veDcx8h1x/c3rz4baEdQKTeDcmQAPNbB54Pi/lhFO3K431eEq6PFbMgLaa6PHFfA==", "dependencies": { - "Microsoft.Extensions.Configuration": "2.2.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "8.0.0", + "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3PZp/YSkIXrF7QK7PfC1bkyRYwqOHpWFad8Qx+4wkuumAeXo1NHaxpS9LboNA9OvNSAu+QOVlXbMyoY+pHSqcw==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "8.0.0", + "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==", "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.DependencyInjection": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -202,31 +227,29 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "d4WS6yVXaw43ffiUnHj8oG1t2B6RbDDiQcgdA+Eq//NlPa3Wd+GTJFKj4OM4eDF3GjVumGr/CEVRS/jcYoF5LA==", + "resolved": "8.0.0", + "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.2.0", - "Microsoft.Extensions.Configuration.Binder": "2.2.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -249,32 +272,32 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, @@ -301,8 +324,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -310,29 +333,29 @@ }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", + "resolved": "2.23.1", + "contentHash": "kidqCwGBuLBx2IcW4os3J6zsp9yaUWm7Sp8G08Nm2RVRSAf0cJXfsynl2wRWpHh0HgfIzzwkevP/qhfsKfu8bQ==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", - "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Bson": "2.23.1", + "MongoDB.Driver.Core": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", + "resolved": "2.23.1", + "contentHash": "K8LMdnVgT82vdbSllv8VzjPOLa9k5rLcCBd1fG45z+QGJNPWzAFW5lLgLJQ7xXuJgQIwvP1DBx6X6ecWBtox7g==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", + "MongoDB.Bson": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", - "ZstdSharp.Port": "0.6.2" + "ZstdSharp.Port": "0.7.3" } }, "MongoDB.Libmongocrypt": { @@ -491,11 +514,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" }, "System.Diagnostics.Tracing": { "type": "Transitive", @@ -531,8 +551,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -607,8 +631,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, "System.Runtime.Extensions": { "type": "Transitive", @@ -717,10 +741,23 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "ZstdSharp.Port": { "type": "Transitive", - "resolved": "0.6.2", - "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" }, "monai.deploy.workflowmanager.common": { "type": "Project", @@ -733,16 +770,16 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[2.0.0, )", + "Monai.Deploy.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } }, "monai.deploy.workflowmanager.database": { @@ -751,7 +788,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.21.0, )" + "MongoDB.Driver": "[2.23.1, )" } }, "monai.deploy.workflowmanager.logging": { @@ -763,7 +800,7 @@ "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Monai.Deploy.Storage": "[0.2.18, )", + "Monai.Deploy.Storage": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } diff --git a/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj b/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj index 67afef829..b5ed86b94 100755 --- a/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj +++ b/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj @@ -13,42 +13,32 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable false - - - - - - + - - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - + \ No newline at end of file diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index ac69c507b..0e6cbd749 100644 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -1,35 +1,35 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.18, )", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "DnsClient": { @@ -91,10 +91,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { @@ -115,41 +115,53 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging": { @@ -165,8 +177,11 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -197,11 +212,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -217,11 +232,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -235,21 +247,21 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, @@ -276,8 +288,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -457,6 +469,11 @@ "System.Runtime": "4.3.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" + }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -491,8 +508,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -567,8 +588,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, "System.Runtime.Extensions": { "type": "Transitive", @@ -672,12 +693,25 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } }, "monai.deploy.workflowmanager.logging": { diff --git a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj index ae0f97d26..2bc03dcc8 100644 --- a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj +++ b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj @@ -13,50 +13,40 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - - net6.0 - enable - enable - false - Monai.Deploy.WorkloadManager.WorkflowExecuter - Monai.Deploy.WorkloadManager.WorkflowExecuter - - - - - - - - - - - - - - + + net8.0 + enable + enable + false + Monai.Deploy.WorkloadManager.WorkflowExecuter + Monai.Deploy.WorkloadManager.WorkflowExecuter + - + - - - - - - - - - - - - - - - true - true - ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - + + + + + + + + + + + + + + + + + + + + + true + true + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + \ No newline at end of file diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index 1d9eac5c0..7ac4c1c04 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -1,41 +1,41 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[1.0.6, )", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "requested": "[2.0.0, )", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.2.0", - "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + "resolved": "8.2.2", + "contentHash": "+zIp8d3sbtYaRbM6hqDs4Ui/z34j7DcUmleruZlYLE4CVxXq+MO8XJyIs42vzeTYFX+k0Iq1dEbBUnQ4z/Gnrw==" }, "DnsClient": { "type": "Transitive", @@ -47,10 +47,10 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "resolved": "5.1.2", + "contentHash": "2lM76Vq+GRdwyY3BQiUJ+V6yxdFiOG4ysLJC7qNTxLsq/1pr5ZTTXiIzWQa+uJ0MuKnzzFogV5+meDflsyjs2g==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.2.0", + "CommunityToolkit.HighPerformance": "8.2.2", "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", @@ -59,7 +59,7 @@ "System.Buffers": "4.5.1", "System.Text.Encoding.CodePages": "6.0.0", "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.7", + "System.Text.Json": "6.0.9", "System.Threading.Channels": "6.0.0" } }, @@ -127,10 +127,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { @@ -152,41 +152,53 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Logging": { @@ -203,8 +215,11 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -235,11 +250,11 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -255,11 +270,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -282,21 +294,21 @@ }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, @@ -323,8 +335,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -332,29 +344,29 @@ }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", + "resolved": "2.23.1", + "contentHash": "kidqCwGBuLBx2IcW4os3J6zsp9yaUWm7Sp8G08Nm2RVRSAf0cJXfsynl2wRWpHh0HgfIzzwkevP/qhfsKfu8bQ==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", - "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Bson": "2.23.1", + "MongoDB.Driver.Core": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", + "resolved": "2.23.1", + "contentHash": "K8LMdnVgT82vdbSllv8VzjPOLa9k5rLcCBd1fG45z+QGJNPWzAFW5lLgLJQ7xXuJgQIwvP1DBx6X6ecWBtox7g==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", + "MongoDB.Bson": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", - "ZstdSharp.Port": "0.6.2" + "ZstdSharp.Port": "0.7.3" } }, "MongoDB.Libmongocrypt": { @@ -513,11 +525,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" }, "System.Diagnostics.Tracing": { "type": "Transitive", @@ -553,8 +562,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -718,8 +731,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -764,10 +777,23 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "ZstdSharp.Port": { "type": "Transitive", - "resolved": "0.6.2", - "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" }, "monai.deploy.workflowmanager.common": { "type": "Project", @@ -780,15 +806,15 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[2.0.0, )", + "Monai.Deploy.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.1.1, )" + "fo-dicom": "[5.1.2, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { @@ -803,9 +829,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } }, "monai.deploy.workflowmanager.database": { @@ -814,7 +840,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.21.0, )" + "MongoDB.Driver": "[2.23.1, )" } }, "monai.deploy.workflowmanager.logging": { @@ -826,7 +852,7 @@ "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Monai.Deploy.Storage": "[0.2.18, )", + "Monai.Deploy.Storage": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 99bbfc9fe..0e289190d 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -13,54 +13,47 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - Exe - net6.0 + net8.0 Monai.Deploy.WorkflowManager false false - - - - - - - - - - + + + + true true - + true - + all runtime; build; native; contentfiles; analyzers; buildtransitive + - @@ -71,7 +64,6 @@ - Always @@ -86,13 +78,11 @@ PreserveNewest - true true ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - @@ -100,7 +90,6 @@ - @@ -108,5 +97,4 @@ - - + \ No newline at end of file diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index f53a1b24e..5815664bb 100644 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -1,63 +1,63 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "AspNetCore.HealthChecks.MongoDb": { "type": "Direct", - "requested": "[6.0.2, )", - "resolved": "6.0.2", - "contentHash": "0R3NVbsjMhS5fd2hGijzQNKJ0zQBv/qMC7nkpmnbtgribCj7vfNdAhSqv4lwbibffRWPW5A/7VNJMX4aPej0WQ==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "0YjJlCwkwulozPxFCRcJAl2CdjU5e5ekj4/BQsA6GZbzRxwtN3FIg7LJcWUUgMdwqDoe+6SKFBRnSRpfLY4owA==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.2", - "MongoDB.Driver": "2.14.1" + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "MongoDB.Driver": "2.22.0" } }, "Microsoft.AspNetCore.Mvc.NewtonsoftJson": { "type": "Direct", - "requested": "[6.0.22, )", - "resolved": "6.0.22", - "contentHash": "CVZatoGdeRlC74aw1lrg0+U49h1o+T23gcsFI/Xxmb+48+5cuoZawshSLLhpMeCxurIvmk6owfA+D6wvOvkn0g==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "/e5+eBvY759xiZJO+y1lHi4VzXqbDzTJSyCtKpaj3Ko2JAFQjiCOJ0ZHk2i4g4HpoSdXmzEXQsjr6dUX9U0/JA==", "dependencies": { - "Microsoft.AspNetCore.JsonPatch": "6.0.22", - "Newtonsoft.Json": "13.0.1", + "Microsoft.AspNetCore.JsonPatch": "8.0.0", + "Newtonsoft.Json": "13.0.3", "Newtonsoft.Json.Bson": "1.0.2" } }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.6, )", - "resolved": "1.0.6", - "contentHash": "Ka4K58/brPHv/GiUdiWsKPvnesfNqYrSN3GVa1sRp6iAGSmO7QA1Yl5/Pd/q494U55OGNI9JPtEbQZUx6G4/nQ==", + "requested": "[2.0.0, )", + "resolved": "2.0.0", + "contentHash": "J5dXjOBqA59irTcFbfwxIQnLxUXGcMCA/cuk1+TJgscMeb2WTVks3esZmcs3pOY2OIBmOROvBl/6KaL9cYFPmg==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.6", - "Polly": "7.2.4", - "RabbitMQ.Client": "6.5.0" + "Monai.Deploy.Messaging": "2.0.0", + "Polly": "8.2.0", + "RabbitMQ.Client": "6.8.1" } }, "Monai.Deploy.Security": { "type": "Direct", - "requested": "[0.1.3, )", - "resolved": "0.1.3", - "contentHash": "9/E/UEK9Foo1cUHRRgNIR8uk+oTLiBbzR2vqBsxIo1EwbduDVuBGFcIh2lpAJZmFFwBNv0KtmTASdD3w5UWd+g==", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.11", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Logging.Configuration": "6.0.0" + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "q0dQiOpOoHX4a3XkueqFRx51WOrQpW1Lwj7e4oqI6aOBeUlA9CPMdZ4+4BlemXc/1A5IClrPugp/owZ1NJ2Wxg==", + "dependencies": { + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.AspNetCore.Authentication.JwtBearer": "8.0.0", + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Configuration": "8.0.0" } }, "Monai.Deploy.Storage.MinIO": { "type": "Direct", - "requested": "[0.2.18, )", - "resolved": "0.2.18", - "contentHash": "0sHLiT0qU2Fg5O+AF8UDqzsJEYztUAFZeOPh4kOLC4bckhb+wSsuv7VcAXWtR3BOY6TxaMVVUJ+EK/o5mCp3tQ==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "o6Lq9rshOJ3sxz4lIfl14Zn7+YXvXXg2Jpndtnnx4Ez1RDSTDu2Zf08lEgFHTmwAML1e4fsVVm16LaXv3h3L3A==", "dependencies": { - "Minio": "5.0.0", - "Monai.Deploy.Storage": "0.2.18", - "Monai.Deploy.Storage.S3Policy": "0.2.18" + "Minio": "6.0.1", + "Monai.Deploy.Storage": "1.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0" } }, "Mongo.Migration": { @@ -84,17 +84,17 @@ }, "NLog": { "type": "Direct", - "requested": "[5.2.4, )", - "resolved": "5.2.4", - "contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ==" + "requested": "[5.2.8, )", + "resolved": "5.2.8", + "contentHash": "jAIELkWBs1CXFPp986KSGpDFQZHCFccO+LMbKBTTNm42KifaI1mYzFMFQQfuGmGMTrCx0TFPhDjHDE4cLAZWiQ==" }, "NLog.Web.AspNetCore": { "type": "Direct", - "requested": "[5.3.4, )", - "resolved": "5.3.4", - "contentHash": "80FaN8CKu94E3mZqZ+r46nRyEYgnHMn4i3vPslbaINs8k+TqJClNFYw6uWLhPU4AN7PKi/jHHzpswqn7K8jgGg==", + "requested": "[5.3.8, )", + "resolved": "5.3.8", + "contentHash": "Rt2OCulpAF6rSrZWZzPgHikAI8SDKkq3/52xA/uJ4JtmNjoizULN/IBYtYlZojbPbXiFm3uadOO2rOvvMhjXBQ==", "dependencies": { - "NLog.Extensions.Logging": "5.3.4" + "NLog.Extensions.Logging": "5.3.8" } }, "StyleCop.Analyzers": { @@ -117,26 +117,26 @@ }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.2.0", - "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + "resolved": "8.2.2", + "contentHash": "+zIp8d3sbtYaRbM6hqDs4Ui/z34j7DcUmleruZlYLE4CVxXq+MO8XJyIs42vzeTYFX+k0Iq1dEbBUnQ4z/Gnrw==" }, "DnsClient": { "type": "Transitive", @@ -148,10 +148,10 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "resolved": "5.1.2", + "contentHash": "2lM76Vq+GRdwyY3BQiUJ+V6yxdFiOG4ysLJC7qNTxLsq/1pr5ZTTXiIzWQa+uJ0MuKnzzFogV5+meDflsyjs2g==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.2.0", + "CommunityToolkit.HighPerformance": "8.2.2", "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", @@ -160,7 +160,7 @@ "System.Buffers": "4.5.1", "System.Text.Encoding.CodePages": "6.0.0", "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.7", + "System.Text.Json": "6.0.9", "System.Threading.Channels": "6.0.0" } }, @@ -174,10 +174,10 @@ }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "ivpWC8L84Y+l9VZOa0uJXPoUE+n3TiSRZpfKxMElRtLMYCeXmz5x3O7CuCJkZ65z1520RWuEZDmHefxiz5TqPg==", + "resolved": "8.0.0", + "contentHash": "rwxaZYHips5M9vqxRkGfJthTx+Ws4O4yCuefn17J371jL3ouC5Ker43h2hXb5yd9BMnImE9rznT75KJHm6bMgg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.0.3" } }, "Microsoft.AspNetCore.Hosting.Abstractions": { @@ -218,11 +218,11 @@ }, "Microsoft.AspNetCore.JsonPatch": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "jQAfNQ7ExLXVUeenihZDqxRr3sBNf8SsenFDOgikb9KaWoWuX91PqSo3G+JDWJppHMucjN55wgEEC3fg5Lzqew==", + "resolved": "8.0.0", + "contentHash": "klQdb/9+j0u8MDjoqHEgDCPz8GRhfsbRVvZIM3glFqjs8uY7S1hS9RvKZuz8o4dS9NsEpFp4Jccd8CQuIYHK0g==", "dependencies": { "Microsoft.CSharp": "4.7.0", - "Newtonsoft.Json": "13.0.1" + "Newtonsoft.Json": "13.0.3" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -247,118 +247,142 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "8.0.0", + "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "b3ErKzND8LIC7o08QAVlKfaEIYEvLJbtmVbFZVBRXeu9YkKfSSzLZfR1SUfQPBIy9mKLhEtJgGYImkcMNaKE0A==", + "resolved": "8.0.0", + "contentHash": "mBMoXLsr5s1y2zOHWmKsE9veDcx8h1x/c3rz4baEdQKTeDcmQAPNbB54Pi/lhFO3K431eEq6PFbMgLaa6PHFfA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", + "resolved": "8.0.0", + "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3PZp/YSkIXrF7QK7PfC1bkyRYwqOHpWFad8Qx+4wkuumAeXo1NHaxpS9LboNA9OvNSAu+QOVlXbMyoY+pHSqcw==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Http": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "15+pa2G0bAMHbHewaQIdr/y6ag2H3yh4rd9hTXavtWDzQBkvpe2RMqFg8BxDpcQWssmjmBApGPcw93QRz6YcMg==", + "resolved": "8.0.0", + "contentHash": "cWz4caHwvx0emoYe7NkHPxII/KkTI8R/LC9qdqJqnKv2poTJ4e2qqPGQqvRoQ5kaSA4FU5IV3qFAuLuOhoqULQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "8.0.0", + "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==", "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.DependencyInjection": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZDskjagmBAbv+K8rYW9VhjPplhbOE63xUD0DiuydZJwt15dRyoqicYklLd86zzeintUc7AptDkHn+YhhYkYo8A==", + "resolved": "8.0.0", + "contentHash": "ixXXV0G/12g6MXK65TLngYN9V5hQQRuV+fZi882WIoVJT7h5JvoYoxTEwCgdqwLjSneqh1O+66gM8sMr9z/rsQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0" + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" } }, "Microsoft.Extensions.Logging.Console": { @@ -381,72 +405,75 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bXWINbTn0vC0FYc9GaQTISbxhQLAMrvtbuvD9N6JelEaIS/Pr62wUCinrq5bf1WRBGczt1v4wDhxFtVFNcMdUQ==", + "resolved": "8.0.0", + "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "7.0.3", + "contentHash": "cfPUWdjigLIRIJSKz3uaZxShgf86RVDXHC1VEEchj1gnY25akwPYpbrfSoIGDCqA9UmOMdlctq411+2pAViFow==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "0qjS31rN1MQTc46tAYbzmMTSRfdV5ndZxSjYxIGqKSidd4wpNJfNII/pdhU5Fx8olarQoKL9lqqYw4yNOIwT0Q==", + "resolved": "7.0.3", + "contentHash": "vxjHVZbMKD3rVdbvKhzAW+7UiFrYToUVm3AGmYfKSOAwyhdLl/ELX1KZr+FaLyyS5VReIzWRWJfbOuHM9i6ywg==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.10.0" + "Microsoft.IdentityModel.Tokens": "7.0.3" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "zbcwV6esnNzhZZ/VP87dji6VrUBLB5rxnZBkDMqNYpyG+nrBnBsbm4PUYLCBMUflHCM9EMLDG0rLnqqT+l0ldA==" + "resolved": "7.0.3", + "contentHash": "b6GbGO+2LOTBEccHhqoJsOsmemG4A/MY+8H0wK/ewRhiG+DCYwEnucog1cSArPIY55zcn+XdZl0YEiUHkpDISQ==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "7.0.3" + } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "DFyXD0xylP+DknCT3hzJ7q/Q5qRNu0hO/gCU90O0ATdR0twZmlcuY9RNYaaDofXKVbzcShYNCFCGle2G/o8mkg==", + "resolved": "7.0.3", + "contentHash": "BtwR+tctBYhPNygyZmt1Rnw74GFrJteW+1zcdIgyvBCjkek6cNwPPqRfdhzCv61i+lwyNomRi8+iI4QKd4YCKA==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.10.0", - "Microsoft.IdentityModel.Tokens": "6.10.0" + "Microsoft.IdentityModel.Logging": "7.0.3", + "Microsoft.IdentityModel.Tokens": "7.0.3" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "LVvMXAWPbPeEWTylDrxunlHH2wFyE4Mv0L4gZrJHC4HTESbWHquKZb/y/S8jgiQEDycOP0PDQvbG4RR/tr2TVQ==", + "resolved": "7.0.3", + "contentHash": "W97TraHApDNArLwpPcXfD+FZH7njJsfEwZE9y9BoofeXMS8H0LBBobz0VOmYmMK4mLdOKxzN7SFT3Ekg0FWI3Q==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.10.0", - "System.IdentityModel.Tokens.Jwt": "6.10.0" + "Microsoft.IdentityModel.Protocols": "7.0.3", + "System.IdentityModel.Tokens.Jwt": "7.0.3" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "qbf1NslutDB4oLrriYTJpy7oB1pbh2ej2lEHd2IPDQH9C74ysOdhU5wAC7KoXblldbo7YsNR2QYFOqQM/b0Rsg==", + "resolved": "7.0.3", + "contentHash": "wB+LlbDjhnJ98DULjmFepqf9eEMh/sDs6S6hFh68iNRHmwollwhxk+nbSSfpA5+j+FbRyNskoaY4JsY1iCOKCg==", "dependencies": { - "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.10.0", - "System.Security.Cryptography.Cng": "4.5.0" + "Microsoft.IdentityModel.Logging": "7.0.3" } }, "Microsoft.NETCore.Platforms": { @@ -475,49 +502,51 @@ }, "Minio": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "7tZj90WEuuH60RAP4wBYexjMuJOhCnK7I46hCiX3CtZPackHisLZ8aAJmn3KlwbUX22dBDphwemD+h37vet8Qw==", + "resolved": "6.0.1", + "contentHash": "uavo/zTpUzHLqnB0nyAk6E/2THLRPvZ59Md7IkLKXkAFiX//K2knVK2+dSHDNN2uAUqCvLqO+cM+s9VGBWbIKQ==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.1.0", + "CommunityToolkit.HighPerformance": "8.2.2", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Logging": "7.0.0", "System.IO.Hashing": "7.0.0", - "System.Reactive.Linq": "5.0.0" + "System.Reactive": "6.0.0" } }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -525,29 +554,29 @@ }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", + "resolved": "2.23.1", + "contentHash": "kidqCwGBuLBx2IcW4os3J6zsp9yaUWm7Sp8G08Nm2RVRSAf0cJXfsynl2wRWpHh0HgfIzzwkevP/qhfsKfu8bQ==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", - "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Bson": "2.23.1", + "MongoDB.Driver.Core": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", + "resolved": "2.23.1", + "contentHash": "K8LMdnVgT82vdbSllv8VzjPOLa9k5rLcCBd1fG45z+QGJNPWzAFW5lLgLJQ7xXuJgQIwvP1DBx6X6ecWBtox7g==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", + "MongoDB.Bson": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", - "ZstdSharp.Port": "0.6.2" + "ZstdSharp.Port": "0.7.3" } }, "MongoDB.Libmongocrypt": { @@ -570,23 +599,31 @@ }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.3.4", - "contentHash": "rxUGUqhE3DlcKfKhPJOI0xOt8q2+NX0NkBY9lbRXwZEYQsh8ASFS8X7K+Y7/dcE8v0tpAe7GF8rPD5h4h9Hpsg==", + "resolved": "5.3.8", + "contentHash": "6VD0lyeokWltL6j8lO7mS7v7lbuO/qn0F7kdvhKhEx1JvFyD39nzohOK3JvkVh4Nn3mrcMDCyDxvTvmiW55jQg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.2.4" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "NLog": "5.2.8" } }, "Polly": { "type": "Transitive", - "resolved": "7.2.4", - "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" + "resolved": "8.2.0", + "contentHash": "KZm8iG29y6Mse7YntYYJSf5fGWuhYLliWgZaG/8NcuXS4gN7SPdtPYpjCxQlHqxvMGubkWVrGp3MvUaI7SkyKA==", + "dependencies": { + "Polly.Core": "8.2.0" + } + }, + "Polly.Core": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "gnKp3+mxGFmkFs4eHcD9aex0JOF8zS1Y18c2A5ckXXTVqbs6XLcDyLKgSa/mUFqAnH3mn9+uVIM0RhAec/d3kA==" }, "RabbitMQ.Client": { "type": "Transitive", - "resolved": "6.5.0", - "contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==", + "resolved": "6.8.1", + "contentHash": "jNsmGgmCNw2S/NzskeN2ijtGywtH4Sk/G6jWUTD5sY9SrC27Xz6BsLIiB8hdsfjeyWCa4j4GvCIGkpE8wrjU1Q==", "dependencies": { "System.Memory": "4.5.5", "System.Threading.Channels": "7.0.0" @@ -754,11 +791,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" }, "System.Diagnostics.Tracing": { "type": "Transitive", @@ -782,11 +816,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "C+Q5ORsFycRkRuvy/Xd0Pv5xVpmWSAvQYZAGs7VQogmkqlLhvfZXTgBIlHqC3cxkstSoLJAYx6xZB7foQ2y5eg==", + "resolved": "7.0.3", + "contentHash": "caEe+OpQNYNiyZb+DJpUVROXoVySWBahko2ooNfUcllxa9ZQUM8CgM/mDjP6AoFn6cQU9xMmG+jivXWub8cbGg==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.10.0", - "Microsoft.IdentityModel.Tokens": "6.10.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.0.3", + "Microsoft.IdentityModel.Tokens": "7.0.3" } }, "System.IO": { @@ -803,8 +837,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.FileSystem": { "type": "Transitive", @@ -841,17 +879,8 @@ }, "System.Reactive": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==" - }, - "System.Reactive.Linq": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "IB4/qlV4T1WhZvM11RVoFUSZXPow9VWVeQ1uDkSKgz6bAO+gCf65H/vjrYlwyXmojSSxvfHndF9qdH43P/IuAw==", - "dependencies": { - "System.Reactive": "5.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } + "resolved": "6.0.0", + "contentHash": "31kfaW4ZupZzPsI5PVe77VhnvFF55qgma7KZr/E0iFTs6fmdhhG8j0mgEx620iLTey1EynOkEfnyTjtNEpJzGw==" }, "System.Reflection": { "type": "Transitive", @@ -943,11 +972,6 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", @@ -992,8 +1016,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1023,11 +1047,6 @@ "System.Runtime": "4.3.0" } }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" - }, "System.Threading.Timer": { "type": "Transitive", "resolved": "4.0.1", @@ -1043,10 +1062,23 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "ZstdSharp.Port": { "type": "Transitive", - "resolved": "0.6.2", - "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" }, "monai.deploy.workflowmanager.common": { "type": "Project", @@ -1059,15 +1091,15 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[2.0.0, )", + "Monai.Deploy.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.1.1, )" + "fo-dicom": "[5.1.2, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { @@ -1082,9 +1114,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } }, "monai.deploy.workflowmanager.database": { @@ -1093,7 +1125,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.21.0, )" + "MongoDB.Driver": "[2.23.1, )" } }, "monai.deploy.workflowmanager.logging": { @@ -1122,7 +1154,7 @@ "monai.deploy.workflowmanager.services": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Http": "[6.0.0, )", + "Microsoft.Extensions.Http": "[8.0.0, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )" } @@ -1130,7 +1162,7 @@ "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Monai.Deploy.Storage": "[0.2.18, )", + "Monai.Deploy.Storage": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } @@ -1138,7 +1170,7 @@ "monai.deploy.workloadmanager.workflowexecuter": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj index 3c42a7433..b05f72cad 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -13,40 +13,34 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable - - - - - - - - - + + + + + + - - + + - + + - - Always @@ -67,7 +61,6 @@ Always - @@ -78,7 +71,6 @@ - @@ -87,5 +79,4 @@ - - + \ No newline at end of file diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/HttpRequestMessageExtensions.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/HttpRequestMessageExtensions.cs index 0c921785c..329065d67 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/HttpRequestMessageExtensions.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/HttpRequestMessageExtensions.cs @@ -14,8 +14,8 @@ * limitations under the License. */ -using System.Net.Http.Formatting; using System.Text; +using System.Text.Json; namespace Monai.Deploy.WorkflowManager.Common.IntegrationTests.Support { @@ -49,7 +49,7 @@ public static void AddJsonBody(this HttpRequestMessage input, T body) return; } - input.Content = new ObjectContent(body, new JsonMediaTypeFormatter()); + input.Content = new StringContent(JsonSerializer.Serialize(body)); } } -} \ No newline at end of file +} diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs index 6f4297107..59886de4e 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs @@ -1,88 +1,89 @@ -/* - * Copyright 2022 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.Reactive.Linq; -using Minio; +/* + * Copyright 2022 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.Reactive.Linq; +using Minio; +using Minio.DataModel.Args; using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.POCO; -using Polly; -using Polly.Retry; - +using Polly; +using Polly.Retry; + namespace Monai.Deploy.WorkflowManager.Common.TaskManager.IntegrationTests.Support -{ +{ #pragma warning disable CS0618 // Type or member is obsolete - public class MinioClientUtil - { - private AsyncRetryPolicy RetryPolicy { get; set; } - private MinioClient Client { get; set; } - - public MinioClientUtil() - { - Client = new MinioClient() - .WithEndpoint(TestExecutionConfig.MinioConfig.Endpoint) - .WithCredentials( - TestExecutionConfig.MinioConfig.AccessKey, - TestExecutionConfig.MinioConfig.AccessToken - ).Build(); - - RetryPolicy = Policy.Handle().WaitAndRetryAsync(retryCount: 10, sleepDurationProvider: _ => TimeSpan.FromMilliseconds(500)); - } - - public async Task CreateBucket(string bucketName) - { - await RetryPolicy.ExecuteAsync(async () => - { - try - { + public class MinioClientUtil + { + private AsyncRetryPolicy RetryPolicy { get; set; } + private IMinioClient Client { get; set; } + + public MinioClientUtil() + { + Client = new MinioClient() + .WithEndpoint(TestExecutionConfig.MinioConfig.Endpoint) + .WithCredentials( + TestExecutionConfig.MinioConfig.AccessKey, + TestExecutionConfig.MinioConfig.AccessToken + ).Build(); + + RetryPolicy = Policy.Handle().WaitAndRetryAsync(retryCount: 10, sleepDurationProvider: _ => TimeSpan.FromMilliseconds(500)); + } + + public async Task CreateBucket(string bucketName) + { + await RetryPolicy.ExecuteAsync(async () => + { + try + { if (await Client.BucketExistsAsync(new BucketExistsArgs().WithBucket(bucketName))) - { - try - { - var listOfKeys = new List(); - var listArgs = new ListObjectsArgs() - .WithBucket(bucketName) - .WithPrefix("") - .WithRecursive(true); - - var objs = await Client.ListObjectsAsync(listArgs).ToList(); - foreach (var obj in objs) - { + { + try + { + var listOfKeys = new List(); + var listArgs = new ListObjectsArgs() + .WithBucket(bucketName) + .WithPrefix("") + .WithRecursive(true); + + var objs = await Client.ListObjectsAsync(listArgs).ToList(); + foreach (var obj in objs) + { await Client.RemoveObjectAsync(new RemoveObjectArgs().WithBucket(bucketName).WithObject(obj.Key)); - } - } - catch (Exception) + } + } + catch (Exception) { - } - } - else - { + } + } + else + { await Client.MakeBucketAsync(new MakeBucketArgs().WithBucket(bucketName)); - } - } - catch (Exception e) - { - Console.WriteLine($"[Bucket] Exception: {e}"); - if (e.Message != "MinIO API responded with message=Your previous request to create the named bucket succeeded and you already own it.") - { + } + } + catch (Exception e) + { + Console.WriteLine($"[Bucket] Exception: {e}"); + if (e.Message != "MinIO API responded with message=Your previous request to create the named bucket succeeded and you already own it.") + { throw; - } - } - }); - } - + } + } + }); + } + public async Task AddFileToStorage(string localPath, string folderPath) { await RetryPolicy.ExecuteAsync(async () => @@ -129,33 +130,33 @@ await Client.PutObjectAsync( throw new Exception($"[Bucket] Exception: {e}"); } }); - } - - public async Task GetFile(string bucketName, string objectName, string fileName) - { + } + + public async Task GetFile(string bucketName, string objectName, string fileName) + { await Client.GetObjectAsync(new GetObjectArgs().WithBucket(bucketName).WithObject(objectName).WithFile(fileName)); - } - - public async Task DeleteBucket(string bucketName) - { + } + + public async Task DeleteBucket(string bucketName) + { bool found = await Client.BucketExistsAsync(new BucketExistsArgs().WithBucket(bucketName)); - if (found) - { - await RetryPolicy.ExecuteAsync(async () => - { + if (found) + { + await RetryPolicy.ExecuteAsync(async () => + { await Client.RemoveBucketAsync(new RemoveBucketArgs().WithBucket(bucketName)); - }); - } - } - - public async Task RemoveObjects(string bucketName, string objectName) - { + }); + } + } + + public async Task RemoveObjects(string bucketName, string objectName) + { bool found = await Client.BucketExistsAsync(new BucketExistsArgs().WithBucket(bucketName)); - if (found) - { + if (found) + { await Client.RemoveObjectAsync(new RemoveObjectArgs().WithBucket(bucketName).WithObject(objectName)); - } - } - } -} + } + } + } +} #pragma warning restore CS0618 // Type or member is obsolete diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs index bbd6f89e1..acf8e8e93 100755 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs @@ -67,33 +67,61 @@ public static void Init() .AddJsonFile("appsettings.Test.json") .Build(); +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.RabbitConfig.Host = config.GetValue("WorkflowManager:messaging:publisherSettings:endpoint"); +#pragma warning restore CS8601 // Possible null reference assignment. TestExecutionConfig.RabbitConfig.WebPort = 15672; +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.RabbitConfig.User = config.GetValue("WorkflowManager:messaging:publisherSettings:username"); +#pragma warning restore CS8601 // Possible null reference assignment. +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.RabbitConfig.Password = config.GetValue("WorkflowManager:messaging:publisherSettings:password"); +#pragma warning restore CS8601 // Possible null reference assignment. +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.RabbitConfig.VirtualHost = config.GetValue("WorkflowManager:messaging:publisherSettings:virtualHost"); +#pragma warning restore CS8601 // Possible null reference assignment. +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.RabbitConfig.Exchange = config.GetValue("WorkflowManager:messaging:publisherSettings:exchange"); +#pragma warning restore CS8601 // Possible null reference assignment. +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.RabbitConfig.WorkflowRequestQueue = config.GetValue("WorkflowManager:messaging:topics:workflowRequest"); +#pragma warning restore CS8601 // Possible null reference assignment. TestExecutionConfig.RabbitConfig.TaskDispatchQueue = "md.tasks.dispatch"; TestExecutionConfig.RabbitConfig.TaskCallbackQueue = "md.tasks.callback"; TestExecutionConfig.RabbitConfig.TaskUpdateQueue = "md.tasks.update"; TestExecutionConfig.RabbitConfig.ArtifactsRequestQueue = "md.workflow.artifactrecieved"; +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.RabbitConfig.ExportCompleteQueue = config.GetValue("WorkflowManager:messaging:topics:exportComplete"); +#pragma warning restore CS8601 // Possible null reference assignment. TestExecutionConfig.RabbitConfig.ExportRequestQueue = $"{config.GetValue("WorkflowManager:messaging:topics:exportRequestPrefix")}.{config.GetValue("WorkflowManager:messaging:dicomAgents:scuAgentName")}"; +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.MongoConfig.ConnectionString = config.GetValue("WorkloadManagerDatabase:ConnectionString"); +#pragma warning restore CS8601 // Possible null reference assignment. +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.MongoConfig.Database = config.GetValue("WorkloadManagerDatabase:DatabaseName"); +#pragma warning restore CS8601 // Possible null reference assignment. TestExecutionConfig.MongoConfig.WorkflowCollection = "Workflows"; TestExecutionConfig.MongoConfig.WorkflowInstanceCollection = "WorkflowInstances"; TestExecutionConfig.MongoConfig.PayloadCollection = "Payloads"; TestExecutionConfig.MongoConfig.ArtifactsCollection = "ArtifactReceivedItems"; TestExecutionConfig.MongoConfig.ExecutionStatsCollection = "ExecutionStats"; +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.MinioConfig.Endpoint = config.GetValue("WorkflowManager:storage:settings:endpoint"); +#pragma warning restore CS8601 // Possible null reference assignment. +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.MinioConfig.AccessKey = config.GetValue("WorkflowManager:storage:settings:accessKey"); +#pragma warning restore CS8601 // Possible null reference assignment. +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.MinioConfig.AccessToken = config.GetValue("WorkflowManager:storage:settings:accessToken"); +#pragma warning restore CS8601 // Possible null reference assignment. +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.MinioConfig.Bucket = config.GetValue("WorkflowManager:storage:settings:bucket"); +#pragma warning restore CS8601 // Possible null reference assignment. +#pragma warning disable CS8601 // Possible null reference assignment. TestExecutionConfig.MinioConfig.Region = config.GetValue("WorkflowManager:storage:settings:region"); +#pragma warning restore CS8601 // Possible null reference assignment. TestExecutionConfig.ApiConfig.BaseUrl = "http://localhost:5000"; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj index 3adf536d7..2fe5237cd 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj @@ -13,15 +13,12 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable - @@ -29,29 +26,25 @@ - - - - - - - - - - + + + + + + + + - + - - PayloadApi.feature @@ -60,7 +53,6 @@ PayloadCollection.feature - Always @@ -111,7 +103,6 @@ PreserveNewest - $(UsingMicrosoftNETSdk) @@ -122,7 +113,6 @@ %(RelativeDir)%(Filename).feature$(DefaultLanguageSourceExtension) - @@ -133,7 +123,6 @@ - @@ -142,5 +131,4 @@ - - + \ No newline at end of file diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/ArtifactReceivedEventStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/ArtifactReceivedEventStepDefinitions.cs index fa72ef27f..391534a3c 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/ArtifactReceivedEventStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/ArtifactReceivedEventStepDefinitions.cs @@ -41,7 +41,9 @@ public class ArtifactReceivedEventStepDefinitions private MinioDataSeeding MinioDataSeeding { get; set; } private const string FixedGuidPayload = "16988a78-87b5-4168-a5c3-2cfc2bab8e54"; +#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. public ArtifactReceivedEventStepDefinitions(ObjectContainer objectContainer, ISpecFlowOutputHelper outputHelper) +#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { ArtifactsPublisher = objectContainer.Resolve("ArtifactsPublisher"); TaskDispatchConsumer = objectContainer.Resolve("TaskDispatchConsumer"); @@ -56,7 +58,9 @@ public ArtifactReceivedEventStepDefinitions(ObjectContainer objectContainer, ISp } [When(@"I publish a Artifact Received Event (.*)")] +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously public async Task WhenIPublishAArtifactReceivedEvent(string name) +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously { var message = new JsonMessage( DataHelper.GetArtifactsReceivedEventTestData(name), @@ -86,6 +90,7 @@ public async Task GivenIHaveAClinicalWorkflowIHaveAWorkflowInstance(string clini _outputHelper.WriteLine($"Retrieving workflow revision with name={clinicalWorkflowName}"); await MongoClient.CreateWorkflowRevisionDocumentAsync(workflowRevision); +#pragma warning disable CS0168 // Variable is declared but never used try { await MongoClient.CreateArtifactsEventsDocumentAsync(artifactReceivedItems); @@ -93,6 +98,7 @@ public async Task GivenIHaveAClinicalWorkflowIHaveAWorkflowInstance(string clini catch (Exception e) { } +#pragma warning restore CS0168 // Variable is declared but never used _outputHelper.WriteLine("Seeding Data Tasks complete"); } @@ -115,14 +121,20 @@ public void ThenICanSeeXArtifactReceivedItemIsCreated(int count) { foreach (var artifactsReceivedItem in artifactsReceivedItems) { +#pragma warning disable CS8602 // Dereference of a possibly null reference. var wfiId = artifactsReceivedItems.FirstOrDefault().WorkflowInstanceId; +#pragma warning restore CS8602 // Dereference of a possibly null reference. var wfi = DataHelper.WorkflowInstances.FirstOrDefault(a => a.Id == wfiId); +#pragma warning disable CS8602 // Dereference of a possibly null reference. var workflow = DataHelper.WorkflowRevisions.FirstOrDefault(w => w.WorkflowId == wfi.WorkflowId); +#pragma warning restore CS8602 // Dereference of a possibly null reference. if (workflow is null) { throw new Exception("Failing Test"); } +#pragma warning disable CS8602 // Dereference of a possibly null reference. var wfitest = MongoClient.GetWorkflowInstanceById(artifactsReceivedItems.FirstOrDefault().WorkflowInstanceId); +#pragma warning restore CS8602 // Dereference of a possibly null reference. Assertions.AssertArtifactsReceivedItemMatchesExpectedWorkflow(artifactsReceivedItem, workflow, wfi); } } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TasksApiStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TasksApiStepDefinitions.cs index 603545872..be8a792d2 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TasksApiStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TasksApiStepDefinitions.cs @@ -51,7 +51,9 @@ public void ThenICanSeeTasksAreReturned(int number) var result = ApiHelper.Response.Content.ReadAsStringAsync().Result; var response = JsonConvert.DeserializeObject>>(result); #pragma warning disable CS8602 // Dereference of a possibly null reference. - Assert.AreEqual(number, response?.Data.Count); +#pragma warning disable CS8604 // Possible null reference argument. + Assert.Equals(number, response?.Data.Count); +#pragma warning restore CS8604 // Possible null reference argument. #pragma warning restore CS8602 // Dereference of a possibly null reference. } } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/HttpRequestMessageExtensions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/HttpRequestMessageExtensions.cs index 144c5492b..20e2d6312 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/HttpRequestMessageExtensions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/HttpRequestMessageExtensions.cs @@ -14,8 +14,8 @@ * limitations under the License. */ -using System.Net.Http.Formatting; using System.Text; +using System.Text.Json; namespace Monai.Deploy.WorkflowManager.Common.IntegrationTests.Support { @@ -49,7 +49,7 @@ public static void AddJsonBody(this HttpRequestMessage input, T body) return; } - input.Content = new ObjectContent(body, new JsonMediaTypeFormatter()); + input.Content = new StringContent(JsonSerializer.Serialize(body)); } } } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioClientUtil.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioClientUtil.cs index 279540f28..2d4a4df32 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioClientUtil.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioClientUtil.cs @@ -16,6 +16,7 @@ using System.Reactive.Linq; using Minio; +using Minio.DataModel.Args; using Monai.Deploy.Storage.API; using Monai.Deploy.WorkflowManager.Common.IntegrationTests.POCO; using Polly; @@ -27,7 +28,7 @@ namespace Monai.Deploy.WorkflowManager.Common.IntegrationTests.Support public class MinioClientUtil { private AsyncRetryPolicy RetryPolicy { get; set; } - private MinioClient Client { get; set; } + private IMinioClient Client { get; set; } public MinioClientUtil() { diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioDataSeeding.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioDataSeeding.cs index a8a9624aa..318e3f8a5 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioDataSeeding.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioDataSeeding.cs @@ -37,7 +37,9 @@ public MinioDataSeeding(MinioClientUtil minioClient, DataHelper dataHelper, ISpe } +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously public async Task SeedArtifactRepo(string payloadId, string? folderName = null) +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously { } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs index 85a1bf129..366c67790 100755 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs @@ -95,7 +95,13 @@ private static IHostBuilder CreateHostBuilder() => services.AddSingleton(); +#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. +#pragma warning disable CS8621 // Nullability of reference types in return type doesn't match the target delegate (possibly because of nullability attributes). +#pragma warning disable CS8631 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match constraint type. services.AddHostedService(p => p.GetService()); +#pragma warning restore CS8631 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match constraint type. +#pragma warning restore CS8621 // Nullability of reference types in return type doesn't match the target delegate (possibly because of nullability attributes). +#pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. // Services services.AddTransient(); @@ -117,13 +123,25 @@ private static IHostBuilder CreateHostBuilder() => }); // StorageService - Since mc.exe is unavailable during e2e, skip admin check +#pragma warning disable CS8604 // Possible null reference argument. services.AddMonaiDeployStorageService(hostContext.Configuration.GetSection("WorkflowManager:storage:serviceAssemblyName").Value, HealthCheckOptions.ServiceHealthCheck); +#pragma warning restore CS8604 // Possible null reference argument. // MessageBroker +#pragma warning disable CS8604 // Possible null reference argument. services.AddMonaiDeployMessageBrokerPublisherService(hostContext.Configuration.GetSection("WorkflowManager:messaging:publisherServiceAssemblyName").Value); +#pragma warning restore CS8604 // Possible null reference argument. +#pragma warning disable CS8604 // Possible null reference argument. services.AddMonaiDeployMessageBrokerSubscriberService(hostContext.Configuration.GetSection("WorkflowManager:messaging:subscriberServiceAssemblyName").Value); +#pragma warning restore CS8604 // Possible null reference argument. +#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. +#pragma warning disable CS8621 // Nullability of reference types in return type doesn't match the target delegate (possibly because of nullability attributes). +#pragma warning disable CS8631 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match constraint type. services.AddHostedService(p => p.GetService()); +#pragma warning restore CS8631 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match constraint type. +#pragma warning restore CS8621 // Nullability of reference types in return type doesn't match the target delegate (possibly because of nullability attributes). +#pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. services.AddWorkflowExecutor(hostContext); services.AddHttpContextAccessor(); diff --git a/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj b/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj index b2b13109a..b8172a390 100644 --- a/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj +++ b/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj @@ -13,23 +13,19 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable - false - - - - + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -38,9 +34,7 @@ all - - - + \ No newline at end of file diff --git a/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj b/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj index 616ba122b..3b06f7b61 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj +++ b/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj @@ -13,20 +13,16 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable - false - - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -35,9 +31,7 @@ all - - - + \ No newline at end of file diff --git a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj index 3c5dc83b8..cce4d666b 100644 --- a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj +++ b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj @@ -13,32 +13,26 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable - false - all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + \ No newline at end of file diff --git a/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj b/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj index ac16b681a..000a2560c 100644 --- a/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj +++ b/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj @@ -13,21 +13,17 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable - false - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -36,9 +32,7 @@ all - - - + \ No newline at end of file diff --git a/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/HttpLoggingExtensionsTests.cs b/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/HttpLoggingExtensionsTests.cs index 18f846a94..bf185204b 100644 --- a/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/HttpLoggingExtensionsTests.cs +++ b/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/HttpLoggingExtensionsTests.cs @@ -44,9 +44,11 @@ public void GivenConfigurationOptions_WhenAddHttpLoggingForMonaiIsCalled_ExpectC {"Kestrel:LogHttpResponseBody", logResponseBody.ToString()}, {"Kestrel:LogHttpRequestQuery", logRequestQuery.ToString()} }; +#pragma warning disable CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types. var configuration = new ConfigurationBuilder() .AddInMemoryCollection(appSettingsStub) .Build(); +#pragma warning restore CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types. _services.Object.AddHttpLoggingForMonai(configuration); var invocation = _services.Invocations.LastOrDefault(); @@ -58,7 +60,9 @@ public void GivenConfigurationOptions_WhenAddHttpLoggingForMonaiIsCalled_ExpectC var options = serviceDescriptor!.ImplementationInstance as ConfigureNamedOptions; Assert.NotNull(options); var httpOptions = new HttpLoggingOptions(); +#pragma warning disable CS8602 // Dereference of a possibly null reference. options!.Action(httpOptions); +#pragma warning restore CS8602 // Dereference of a possibly null reference. Assert.True(httpOptions.LoggingFields.HasFlag(HttpLoggingFields.RequestPropertiesAndHeaders)); Assert.True(httpOptions.LoggingFields.HasFlag(HttpLoggingFields.ResponsePropertiesAndHeaders)); diff --git a/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/Monai.Deploy.WorkflowManager.Shared.Tests.csproj b/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/Monai.Deploy.WorkflowManager.Shared.Tests.csproj index 1e7ac095b..d6eb61d42 100644 --- a/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/Monai.Deploy.WorkflowManager.Shared.Tests.csproj +++ b/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/Monai.Deploy.WorkflowManager.Shared.Tests.csproj @@ -13,22 +13,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable - false - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -37,9 +33,7 @@ all - - - + \ No newline at end of file diff --git a/tests/UnitTests/MonaiBackgroundService.Tests/Monai.Deploy.WorkflowManager.MonaiBackgroundService.Tests.csproj b/tests/UnitTests/MonaiBackgroundService.Tests/Monai.Deploy.WorkflowManager.MonaiBackgroundService.Tests.csproj index 75e30da1f..ae5340643 100644 --- a/tests/UnitTests/MonaiBackgroundService.Tests/Monai.Deploy.WorkflowManager.MonaiBackgroundService.Tests.csproj +++ b/tests/UnitTests/MonaiBackgroundService.Tests/Monai.Deploy.WorkflowManager.MonaiBackgroundService.Tests.csproj @@ -13,33 +13,27 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable - false - all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + \ No newline at end of file diff --git a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj index ffcbeb639..1707140e5 100644 --- a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj +++ b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj @@ -13,29 +13,23 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable - false - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + \ No newline at end of file diff --git a/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs b/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs index 00c159356..03a57399c 100644 --- a/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs +++ b/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs @@ -22,6 +22,7 @@ using Monai.Deploy.WorkflowManager.PayloadListener.Validators; using Moq; using NUnit.Framework; +using NUnit.Framework.Legacy; namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Tests.Validators { @@ -53,7 +54,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsMo message.DataTrigger.Destination = "abcdefghijklmnop"; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -63,7 +64,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsNu message.DataTrigger.Destination = string.Empty; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -73,7 +74,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsWh message.DataTrigger.Destination = " "; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -83,7 +84,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsEm message.DataTrigger.Destination = String.Empty; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -93,7 +94,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsMor message.DataTrigger.Destination = "abcdefghijklmnop"; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -103,7 +104,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsNul message.DataTrigger.Destination = string.Empty; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -113,7 +114,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsWhi message.DataTrigger.Destination = " "; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -123,7 +124,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsEmp message.DataTrigger.Destination = " "; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -134,7 +135,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithNullWorkflow_Throw var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -145,7 +146,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageIsValid_ReturnsTrue() var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); } [Test] @@ -165,7 +166,7 @@ public void ValidateTaskUpdate_TaskUpdateEventIsValid_ReturnsTrue() var result = _eventPayloadValidator!.ValidateTaskUpdate(updateEvent); - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); } [Test] @@ -185,7 +186,7 @@ public void ValidateTaskUpdate_TaskUpdateEventIsInvalid_ReturnsFalse() var result = _eventPayloadValidator!.ValidateTaskUpdate(updateEvent); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -210,7 +211,7 @@ public void ValidateExportComplete_ExportCompleteEventIsValid_ReturnsTrue() var result = _eventPayloadValidator!.ValidateExportComplete(exportEvent); - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); } [Test] @@ -226,7 +227,7 @@ public void ValidateExportComplete_ExportCompleteEventIsInvalid_ReturnsFalse() var result = _eventPayloadValidator!.ValidateExportComplete(exportEvent); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } [Test] @@ -258,7 +259,7 @@ public void ValidateArtifactsReceived_ArtifactsReceivedEventIsValid_ReturnsTrue( var result = _eventPayloadValidator!.ValidateArtifactReceived(artifactsReceivedEvent); - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); } [Test] @@ -282,7 +283,7 @@ public void ValidateArtifactsReceived_ArtifactsReceivedEventIsValidWithWorkflows var result = _eventPayloadValidator!.ValidateArtifactReceived(artifactsReceivedEvent); - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); } [Test] @@ -305,7 +306,7 @@ public void ValidateArtifactsReceived_ArtifactsReceivedEventIsInvalid_ReturnsFal var result = _eventPayloadValidator!.ValidateArtifactReceived(artifactsReceivedEvent); - Assert.IsFalse(result); + ClassicAssert.IsFalse(result); } private static ArtifactsReceivedEvent CreateTestArtifactsReceivedEvent(List artifacts, diff --git a/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj b/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj index b3eca3556..0974df836 100644 --- a/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj +++ b/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj @@ -13,22 +13,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable - false - - - - + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -37,9 +33,7 @@ all - - - + \ No newline at end of file diff --git a/tests/UnitTests/Storage.Tests/Services/DicomServiceTests.cs b/tests/UnitTests/Storage.Tests/Services/DicomServiceTests.cs index cea5c7009..ab5f0d6d7 100644 --- a/tests/UnitTests/Storage.Tests/Services/DicomServiceTests.cs +++ b/tests/UnitTests/Storage.Tests/Services/DicomServiceTests.cs @@ -49,10 +49,10 @@ public DicomServiceTests() } [Fact] - public void GetDicomPathsForTask_NullInput_ThrowsException() + public async Task GetDicomPathsForTask_NullInput_ThrowsExceptionAsync() { #pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type. - Assert.ThrowsAsync(async () => await DicomService.GetDicomPathsForTaskAsync(null, null)); + await Assert.ThrowsAsync(async () => await DicomService.GetDicomPathsForTaskAsync(null, null)); #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type. } diff --git a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/AideClinicalReviewPluginTests.cs b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/AideClinicalReviewPluginTests.cs index 3fc21fbda..0f25972b9 100644 --- a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/AideClinicalReviewPluginTests.cs +++ b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/AideClinicalReviewPluginTests.cs @@ -82,7 +82,7 @@ public async Task AideClinicalReviewPlugin_ExecuteTask_ReturnsExecutionStatusOnF .ThrowsAsync(new Exception()); var runner = new AideClinicalReviewPlugin(_serviceScopeFactory.Object, _messageBrokerPublisherService.Object, _options, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); @@ -95,7 +95,7 @@ public async Task AideClinicalReviewPlugin_ExecuteTask_ReturnsExecutionStatusOnS var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new AideClinicalReviewPlugin(_serviceScopeFactory.Object, _messageBrokerPublisherService.Object, _options, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); @@ -110,7 +110,7 @@ public async Task AideClinicalReviewPlugin_ExecuteTask_ReturnsExecutionStatusOnS var message = GenerateTaskDispatchEventWithValidArguments(true, "false"); var runner = new AideClinicalReviewPlugin(_serviceScopeFactory.Object, _messageBrokerPublisherService.Object, _options, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); @@ -126,7 +126,7 @@ public async Task AideClinicalReviewPlugin_ExecuteTask_ReturnsExecutionStatusOnS message.TaskPluginArguments.Remove("reviewer_roles"); var runner = new AideClinicalReviewPlugin(_serviceScopeFactory.Object, _messageBrokerPublisherService.Object, _options, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); @@ -150,7 +150,7 @@ public async Task AideClinicalReviewPlugin_GetStatus_ReturnsExecutionStatusOnFai } }; var runner = new AideClinicalReviewPlugin(_serviceScopeFactory.Object, _messageBrokerPublisherService.Object, _options, _logger.Object, message); - var result = await runner.GetStatus(string.Empty, callback, CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus(string.Empty, callback, CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.PartialFail, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); @@ -163,7 +163,7 @@ public async Task AideClinicalReviewPlugin_GetStatus_ReturnsExecutionStatusOnSuc var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new AideClinicalReviewPlugin(_serviceScopeFactory.Object, _messageBrokerPublisherService.Object, _options, _logger.Object, message); - var result = await runner.GetStatus(string.Empty, new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus(string.Empty, new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Succeeded, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); @@ -177,7 +177,7 @@ public async Task AideClinicalReviewPlugin_GetStatus_ReturnsExecutionStatusOnSuc message.TaskPluginArguments.Remove("reviewer_roles"); var runner = new AideClinicalReviewPlugin(_serviceScopeFactory.Object, _messageBrokerPublisherService.Object, _options, _logger.Object, message); - var result = await runner.GetStatus(string.Empty, new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus(string.Empty, new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Succeeded, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); diff --git a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Tests.csproj b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Tests.csproj index 73fb22a18..0fc3f1e97 100755 --- a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Tests.csproj +++ b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Tests.csproj @@ -13,21 +13,17 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable - false - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -36,12 +32,10 @@ all - true - - + \ No newline at end of file diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs index f54dc8153..9ac2fcd61 100755 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs @@ -103,7 +103,7 @@ public async Task ArgoPlugin_ExecuteTask_ReturnsExecutionStatusOnFailure() SetupKubernetesDeleteSecret(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); @@ -120,7 +120,7 @@ public async Task ArgoPlugin_ExecuteTask_ReturnsExecutionStatusOnFailure() It.IsAny>>(), It.IsAny()), Times.Exactly(3)); - await runner.DisposeAsync().ConfigureAwait(false); + await runner.DisposeAsync(); K8sCoreOperations.Verify(p => p.DeleteNamespacedSecretWithHttpMessagesAsync( It.IsAny(), It.IsAny(), @@ -147,7 +147,7 @@ public async Task ArgoPlugin_ExecuteTask_ReturnsExecutionStatusWhenFailedToGener SetupKubernetesDeleteSecret(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); @@ -164,7 +164,7 @@ public async Task ArgoPlugin_ExecuteTask_ReturnsExecutionStatusWhenFailedToGener It.IsAny>>(), It.IsAny()), Times.Once()); - await runner.DisposeAsync().ConfigureAwait(false); + await runner.DisposeAsync(); K8sCoreOperations.Verify(p => p.DeleteNamespacedSecretWithHttpMessagesAsync( It.IsAny(), It.IsAny(), @@ -187,7 +187,7 @@ public async Task ArgoPlugin_ExecuteTask_ReturnsExecutionStatusWhenFailedToLoadW .Throws(new Exception("error")); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); @@ -204,7 +204,7 @@ public async Task ArgoPlugin_ExecuteTask_ReturnsExecutionStatusWhenFailedToLoadW It.IsAny>>(), It.IsAny()), Times.Never()); - await runner.DisposeAsync().ConfigureAwait(false); + await runner.DisposeAsync(); K8sCoreOperations.Verify(p => p.DeleteNamespacedSecretWithHttpMessagesAsync( It.IsAny(), It.IsAny(), @@ -232,7 +232,7 @@ public async Task ArgoPlugin_ExecuteTask_ReturnsExecutionStatusWhenFailedToLocat SetupKubernetesDeleteSecret(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); @@ -249,7 +249,7 @@ public async Task ArgoPlugin_ExecuteTask_ReturnsExecutionStatusWhenFailedToLocat It.IsAny>>(), It.IsAny()), Times.Never()); - await runner.DisposeAsync().ConfigureAwait(false); + await runner.DisposeAsync(); K8sCoreOperations.Verify(p => p.DeleteNamespacedSecretWithHttpMessagesAsync( It.IsAny(), It.IsAny(), @@ -298,7 +298,7 @@ public async Task ArgoPlugin_ExecuteTask_WorkflowTemplates(string filename, int SetupKubernetesDeleteSecret(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); @@ -315,7 +315,7 @@ public async Task ArgoPlugin_ExecuteTask_WorkflowTemplates(string filename, int It.IsAny>>(), It.IsAny()), Times.Exactly(secretsCreated)); - await runner.DisposeAsync().ConfigureAwait(false); + await runner.DisposeAsync(); K8sCoreOperations.Verify(p => p.DeleteNamespacedSecretWithHttpMessagesAsync( It.IsAny(), It.IsAny(), @@ -418,7 +418,7 @@ public async Task ArgoPlugin_GetStatus_WaitUntilSucceededPhase() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Succeeded, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); @@ -465,7 +465,7 @@ public async Task ArgoPlugin_GetStatus_HasStatsInfo() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); var objNodeInfo = result?.Stats; Assert.NotNull(objNodeInfo); @@ -517,7 +517,7 @@ public async Task ArgoPlugin_GetStatus_Argregates_stats() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); var objNodeInfo = result?.Stats; Assert.NotNull(objNodeInfo); @@ -565,7 +565,7 @@ public async Task ArgoPlugin_GetStatus_ReturnsExecutionStatusOnSuccess(string ph var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); if (phase == Strings.ArgoPhaseSucceeded) { @@ -598,7 +598,7 @@ public async Task ArgoPlugin_GetStatus_ReturnsExecutionStatusOnFailure() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); @@ -621,7 +621,7 @@ public async Task ArgoPlugin_Copies_ImagePullSecrets() SetUpSimpleArgoWorkFlow(argoTemplate); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); Assert.Equal(secret, _submittedArgoTemplate?.Spec.ImagePullSecrets.First()); @@ -638,7 +638,7 @@ public async Task ArgoPlugin_Ensures_TTL_Added_If_Not_present() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); Assert.Equal(ArgoTtlStatergySeconds, _submittedArgoTemplate?.Spec.TtlStrategy?.SecondsAfterSuccess); @@ -661,7 +661,7 @@ public async Task ArgoPlugin_Adds_Container_Resource_Restrictions_Based_On_Confi "\"},\"requests\":{\"cpu\":\"0\",\"memory\":\"0Mi\"}}}]}"; var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); #pragma warning disable CS8602 // Dereference of a possibly null reference. @@ -689,7 +689,7 @@ public async Task ArgoPlugin_Ensures_TTL_Extended_If_Too_Short(int? secondsAfter var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); if (secondsAfterCompletion is not null) @@ -740,7 +740,7 @@ public async Task ArgoPlugin_Ensures_TTL_Remains(int? secondsAfterCompletion, in var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); Assert.Equal(secondsAfterCompletion, _submittedArgoTemplate?.Spec.TtlStrategy.SecondsAfterCompletion); @@ -761,7 +761,7 @@ public async Task ArgoPlugin_Ensures_podGC_is_removed() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); Assert.Null(_submittedArgoTemplate?.Spec.PodGC); @@ -773,7 +773,7 @@ public async Task ArgoPlugin_CreateArgoTemplate_Invalid_json_Throws_JsonSerializ var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, new Messaging.Events.TaskDispatchEvent()); - await Assert.ThrowsAsync(async () => await runner.CreateArgoTemplate(template).ConfigureAwait(false)); + await Assert.ThrowsAsync(async () => await runner.CreateArgoTemplate(template).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext)); } [Fact] @@ -783,7 +783,7 @@ public async Task ArgoPlugin_CreateArgoTemplate_Invalid_Object_Throws() var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, new Messaging.Events.TaskDispatchEvent()); - await Assert.ThrowsAsync(async () => await runner.CreateArgoTemplate(template).ConfigureAwait(false)); + await Assert.ThrowsAsync(async () => await runner.CreateArgoTemplate(template).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext)); } [Fact] @@ -796,7 +796,7 @@ public async Task ArgoPlugin_CreateArgoTemplate_Valid_json_Calls_Client() var template = "{\"name\":\"fred\"}"; var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, new Messaging.Events.TaskDispatchEvent()); - await runner.CreateArgoTemplate(template).ConfigureAwait(false); + await runner.CreateArgoTemplate(template).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); ArgoClient.Verify(a => a.Argo_CreateWorkflowTemplateAsync(It.IsAny(), It.IsAny(), It.IsAny()), @@ -822,7 +822,7 @@ public async Task ArgoPlugin_Ensures_podPriorityClassName_is_set() var defaultClassName = "standard"; var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.NotNull(requestMade); Assert.Equal(defaultClassName, requestMade.Workflow.Spec.PodPriorityClassName); @@ -854,7 +854,7 @@ public async Task ArgoPlugin_Ensures_podPriorityClassName_is_set_as_given() }); var runner = new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.NotNull(requestMade); Assert.Equal(givenClassName, requestMade.Workflow.Spec.PodPriorityClassName); diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs index 81c79239a..775f2a959 100755 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs @@ -69,7 +69,7 @@ public async Task GeneratesArgoClientWithApiToken() Assert.NotNull(client); Assert.Equal(baseUri.ToString(), client!.BaseUrl); - _ = await client!.Argo_GetVersionAsync().ConfigureAwait(false); + _ = await client!.Argo_GetVersionAsync().ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); handlerMock.Protected().Verify( "SendAsync", diff --git a/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj b/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj index e514c9e5b..0faeec532 100755 --- a/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj +++ b/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj @@ -13,25 +13,20 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable - false - - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -40,11 +35,9 @@ all - - Always @@ -53,5 +46,4 @@ Always - - + \ No newline at end of file diff --git a/tests/UnitTests/TaskManager.Docker.Tests/ContainerStatusMonitorTest.cs b/tests/UnitTests/TaskManager.Docker.Tests/ContainerStatusMonitorTest.cs index 6fae77b53..7cf5cafc4 100755 --- a/tests/UnitTests/TaskManager.Docker.Tests/ContainerStatusMonitorTest.cs +++ b/tests/UnitTests/TaskManager.Docker.Tests/ContainerStatusMonitorTest.cs @@ -157,7 +157,9 @@ private void CreateFiles(List files) foreach (var file in files) { var dir = _fileSystem.Path.GetDirectoryName(file); +#pragma warning disable CS8604 // Possible null reference argument. _fileSystem.Directory.CreateDirectory(dir); +#pragma warning restore CS8604 // Possible null reference argument. using var stream = _fileSystem.File.CreateText(file); stream.WriteLine(file); } diff --git a/tests/UnitTests/TaskManager.Docker.Tests/DockerPluginTest.cs b/tests/UnitTests/TaskManager.Docker.Tests/DockerPluginTest.cs index 6801860aa..3dae047f0 100644 --- a/tests/UnitTests/TaskManager.Docker.Tests/DockerPluginTest.cs +++ b/tests/UnitTests/TaskManager.Docker.Tests/DockerPluginTest.cs @@ -118,7 +118,7 @@ public async Task ExecuteTask_WhenDockerServiceIsUnavailable_ExpectFailureStatus var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); @@ -142,7 +142,7 @@ public async Task ExecuteTask_WhenStorageServiceIsUnavailable_ExpectFailureStatu var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); @@ -178,7 +178,7 @@ public async Task ExecuteTask_WhenFailedToCreateContainer_ExpectFailureStatus() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); @@ -220,7 +220,7 @@ public async Task ExecuteTask_WhenFailedToMonitorContainer_ExpectTaskToBeAccepte var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); @@ -259,7 +259,7 @@ public async Task ExecuteTask_WhenImageExists_ExpectNotToPull() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); _dockerClient.Verify(p => p.Images.CreateImageAsync( It.IsAny(), @@ -304,7 +304,7 @@ public async Task ExecuteTask_WhenAlwaysPullIsSet_ExpectToPullEvenWhenImageExist message.TaskPluginArguments.Add(Keys.AlwaysPull, bool.TrueString); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); _dockerClient.Verify(p => p.Images.CreateImageAsync( It.IsAny(), @@ -344,7 +344,7 @@ public async Task ExecuteTask_WhenCalledWithValidEvent_ExpectTaskToBeAcceptedAnd var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Accepted, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); @@ -371,7 +371,7 @@ public async Task GetStatus_WhenContainerStatusIsUnknown_ExpectFalureStatus() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.Unknown, result.FailureReason); @@ -400,7 +400,7 @@ public async Task GetStatus_WhenContainerIsKilledOrDead_ExpectFalureStatus() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.ExternalServiceError, result.FailureReason); @@ -420,7 +420,7 @@ public async Task GetStatus_WhenDockerIsDown_ExpectFalureStatus() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.ExternalServiceError, result.FailureReason); @@ -463,7 +463,7 @@ public async Task GetStatus_WhenCalled_ExpectToWaitUntilFinalStatuses() var message = GenerateTaskDispatchEventWithValidArguments(); var runner = new DockerPlugin(_serviceScopeFactory.Object, _logger.Object, message); - var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(false); + var result = await runner.GetStatus("identity", new TaskCallbackEvent(), CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Succeeded, result.Status); Assert.Equal(FailureReason.None, result.FailureReason); @@ -485,7 +485,7 @@ public async Task HandleTimeout_WhenCalled_ExpectToTerminateContainer() var exception = await Record.ExceptionAsync(async () => { - await runner.HandleTimeout("identity").ConfigureAwait(false); + await runner.HandleTimeout("identity").ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); Assert.Null(exception); diff --git a/tests/UnitTests/TaskManager.Docker.Tests/Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests.csproj b/tests/UnitTests/TaskManager.Docker.Tests/Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests.csproj index 206894790..0d03bb976 100755 --- a/tests/UnitTests/TaskManager.Docker.Tests/Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests.csproj +++ b/tests/UnitTests/TaskManager.Docker.Tests/Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests.csproj @@ -13,27 +13,22 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable - false - - - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -42,9 +37,7 @@ all - - - + \ No newline at end of file diff --git a/tests/UnitTests/TaskManager.Email.Tests/EmailPluginTests.cs b/tests/UnitTests/TaskManager.Email.Tests/EmailPluginTests.cs index 3a32e5596..28001c03b 100644 --- a/tests/UnitTests/TaskManager.Email.Tests/EmailPluginTests.cs +++ b/tests/UnitTests/TaskManager.Email.Tests/EmailPluginTests.cs @@ -167,7 +167,7 @@ public async Task EmailPlugin_ExecuteTask_ReturnsExecutionStatusOnFailure() .ThrowsAsync(new Exception()); var runner = new EmailPlugin(_serviceScopeFactory.Object, _logger.Object, _options, message); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); @@ -189,7 +189,7 @@ public async Task EmailPlugin_ExecuteTask_CallsPublish() }); var runner = new EmailPlugin(_serviceScopeFactory.Object, _logger.Object, _options, messageEvent); - var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(false); + var result = await runner.ExecuteTask(CancellationToken.None).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); _messageBrokerPublisherService.Verify(m => m.Publish(It.IsAny(), It.IsAny()), Times.Once); Assert.Contains("fred@fred.com", System.Text.Encoding.UTF8.GetString(messageResult!.Body)); diff --git a/tests/UnitTests/TaskManager.Email.Tests/Monai.Deploy.WorkflowManager.TaskManager.Email.Tests.csproj b/tests/UnitTests/TaskManager.Email.Tests/Monai.Deploy.WorkflowManager.TaskManager.Email.Tests.csproj index deead3508..a251781cb 100644 --- a/tests/UnitTests/TaskManager.Email.Tests/Monai.Deploy.WorkflowManager.TaskManager.Email.Tests.csproj +++ b/tests/UnitTests/TaskManager.Email.Tests/Monai.Deploy.WorkflowManager.TaskManager.Email.Tests.csproj @@ -13,21 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. --> - - Exe - net6.0 + net8.0 enable enable - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -36,9 +33,7 @@ all - - - + \ No newline at end of file diff --git a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj index 6b36bdcbe..2f85498e7 100644 --- a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj +++ b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj @@ -13,22 +13,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable - false - - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -37,12 +33,10 @@ all - - - + \ No newline at end of file diff --git a/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs b/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs index bad008dbb..7cde5dd15 100644 --- a/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs +++ b/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs @@ -196,11 +196,11 @@ public TaskManagerTest() public async Task TaskManager_StartStop() { var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); - await service.StopAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StopAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Stopped, service.Status); } @@ -221,14 +221,14 @@ public async Task TaskManager_TaskDispatchEvent_ValidationFailure() It.IsAny())) .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); + await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerSubscriberService .Setup(p => p.Reject(It.IsAny(), It.IsAny())) .Callback(() => resetEvent.Set()); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.WaitOne(5000)); @@ -250,14 +250,14 @@ public async Task TaskManager_TaskDispatchEvent_OutOfResource() It.IsAny())) .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); + await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerSubscriberService .Setup(p => p.RequeueWithDelay(It.IsAny())) .Callback(() => resetEvent.Set()); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.WaitOne(5000)); @@ -280,7 +280,7 @@ public async Task TaskManager_TaskDispatchEvent_OutOfResource() // It.IsAny())) // .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => // { - // await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); + // await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); // }); // _messageBrokerSubscriberService // .Setup(p => p.Reject(It.IsAny(), It.IsAny())) @@ -289,7 +289,7 @@ public async Task TaskManager_TaskDispatchEvent_OutOfResource() // .ThrowsAsync(new Exception("error")); // var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Objec); - // await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + // await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); // Assert.Equal(ServiceStatus.Running, service.Status); // Assert.True(resetEvent.WaitOne(5000)); @@ -311,7 +311,7 @@ public async Task TaskManager_TaskDispatchEvent_UnsupportedRunner() It.IsAny())) .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); + await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _storageAdminService.Setup(a => a.CreateUserAsync( @@ -334,7 +334,7 @@ public async Task TaskManager_TaskDispatchEvent_UnsupportedRunner() }); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.WaitOne(5000)); @@ -368,7 +368,7 @@ public async Task TaskManager_TaskDispatchEvent_ExceptionExecutingRunner() It.IsAny())) .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); + await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerSubscriberService .Setup(p => p.Reject(It.IsAny(), It.IsAny())) @@ -381,7 +381,7 @@ public async Task TaskManager_TaskDispatchEvent_ExceptionExecutingRunner() }); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.WaitOne(5000)); @@ -416,7 +416,7 @@ public async Task TaskManager_TaskDispatchEvent_RejectWhenUnalbeToCreateUserAcco It.IsAny())) .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); + await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerSubscriberService .Setup(p => p.RequeueWithDelay(It.IsAny())) @@ -432,7 +432,7 @@ public async Task TaskManager_TaskDispatchEvent_RejectWhenUnalbeToCreateUserAcco }); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.Wait(5000)); @@ -469,7 +469,7 @@ public async Task TaskManager_TaskDispatchEvent_ExecutesRunner() It.IsAny())) .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); + await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerSubscriberService .Setup(p => p.Acknowledge(It.IsAny())) @@ -485,7 +485,7 @@ public async Task TaskManager_TaskDispatchEvent_ExecutesRunner() }); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.Wait(5000)); @@ -512,7 +512,7 @@ public async Task TaskManager_TaskCallbackEvent_ValidationFailure() It.IsAny())) .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); + await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerSubscriberService .Setup(p => p.Reject(It.IsAny(), It.IsAny())) @@ -525,7 +525,7 @@ public async Task TaskManager_TaskCallbackEvent_ValidationFailure() }); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.WaitOne(5000)); @@ -546,7 +546,7 @@ public async Task TaskManager_TaskCallbackEvent_NoMatchingExecutionId() It.IsAny())) .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); + await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerSubscriberService .Setup(p => p.Reject(It.IsAny(), It.IsAny())) @@ -559,7 +559,7 @@ public async Task TaskManager_TaskCallbackEvent_NoMatchingExecutionId() }); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.WaitOne(5000)); @@ -613,7 +613,7 @@ public async Task TaskManager_TaskCallbackEvent_ExceptionGettingStatus() It.IsAny())) .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(taskDispatchEventMessage))).ConfigureAwait(false); + await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(taskDispatchEventMessage))).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); var taskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); @@ -629,7 +629,7 @@ public async Task TaskManager_TaskCallbackEvent_ExceptionGettingStatus() await Task.Run(() => { messageReceivedCallback(CreateMessageReceivedEventArgs(taskCallbackEventMessage)); - }).ConfigureAwait(false); + }).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerPublisherService @@ -637,7 +637,7 @@ await Task.Run(() => .Callback(() => resetEvent.Signal()); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.Wait(5000)); @@ -691,7 +691,7 @@ public async Task TaskManager_TaskCallbackEvent_CompletesWorkflow() await Task.Run(() => { messageReceivedCallback(CreateMessageReceivedEventArgs(taskDispatchEventMessage)); - }).ConfigureAwait(false); + }).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); var taskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); @@ -707,7 +707,7 @@ await Task.Run(() => await Task.Run(() => { messageReceivedCallback(CreateMessageReceivedEventArgs(taskCallbackEventMessage)); - }).ConfigureAwait(false); + }).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerSubscriberService .Setup(p => p.Acknowledge(It.IsAny())) @@ -731,7 +731,7 @@ await Task.Run(() => }); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.Wait(5000)); @@ -771,7 +771,7 @@ public async Task TaskManager_NonArgoTaskCallbackEvent_CompletesWorkflow() await Task.Run(() => { messageReceivedCallback(CreateMessageReceivedEventArgs(taskDispatchEventMessage)); - }).ConfigureAwait(false); + }).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); var taskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); @@ -787,7 +787,7 @@ await Task.Run(() => await Task.Run(() => { messageReceivedCallback(CreateMessageReceivedEventArgs(taskCallbackEventMessage)); - }).ConfigureAwait(false); + }).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerSubscriberService .Setup(p => p.Acknowledge(It.IsAny())) @@ -803,7 +803,7 @@ await Task.Run(() => }); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.Wait(5000)); @@ -846,7 +846,7 @@ public async Task TaskManager_TaskCallbackEventMetadataFails_FailsWorkflow() await Task.Run(() => { messageReceivedCallback(CreateMessageReceivedEventArgs(taskDispatchEventMessage)); - }).ConfigureAwait(false); + }).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); var taskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); @@ -862,7 +862,7 @@ await Task.Run(() => await Task.Run(() => { messageReceivedCallback(CreateMessageReceivedEventArgs(taskCallbackEventMessage)); - }).ConfigureAwait(false); + }).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); }); _messageBrokerSubscriberService .Setup(p => p.Acknowledge(It.IsAny())) @@ -891,7 +891,7 @@ await Task.Run(() => _testMetadataRepositoryCallback.Setup(p => p.GenerateRetrieveMetadataResult()).Throws(new Exception()); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); Assert.True(resetEvent.Wait(5000)); diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj index 4c8eb35fa..ab4383158 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj +++ b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj @@ -13,22 +13,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable - false - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -37,9 +33,7 @@ all - - - + \ No newline at end of file diff --git a/tests/UnitTests/WorkflowManager.Services.Tests/Monai.Deploy.WorkflowManager.Services.Tests.csproj b/tests/UnitTests/WorkflowManager.Services.Tests/Monai.Deploy.WorkflowManager.Services.Tests.csproj index a2b3deed4..86927f125 100644 --- a/tests/UnitTests/WorkflowManager.Services.Tests/Monai.Deploy.WorkflowManager.Services.Tests.csproj +++ b/tests/UnitTests/WorkflowManager.Services.Tests/Monai.Deploy.WorkflowManager.Services.Tests.csproj @@ -13,22 +13,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 enable enable - false - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -37,9 +33,7 @@ all - - - + \ No newline at end of file diff --git a/tests/UnitTests/WorkflowManager.Tests/DummyMessagingService.cs b/tests/UnitTests/WorkflowManager.Tests/DummyMessagingService.cs index 45b427770..b1a69723c 100755 --- a/tests/UnitTests/WorkflowManager.Tests/DummyMessagingService.cs +++ b/tests/UnitTests/WorkflowManager.Tests/DummyMessagingService.cs @@ -50,7 +50,9 @@ internal class DummyMessagingService : IMessageBrokerPublisherService, IMessageB { public string Name => "Dummy Messaging Service"; +#pragma warning disable CS0067 // The event 'DummyMessagingService.OnConnectionError' is never used public event ConnectionErrorHandler? OnConnectionError; +#pragma warning restore CS0067 // The event 'DummyMessagingService.OnConnectionError' is never used public void Acknowledge(MessageBase message) => throw new NotImplementedException(); diff --git a/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj b/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj index 363e85695..c8b54f57d 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj +++ b/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj @@ -13,24 +13,21 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - net6.0 + net8.0 Monai.Deploy.WorkflowManager.Test ..\..\..\StyleCop.Analyzers.ruleset false enable - - - - + + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -39,25 +36,21 @@ all - - - Always - true true - + \ No newline at end of file diff --git a/tests/UnitTests/WorkflowManager.Tests/Services/DataRetentionService/DataRetentionServiceTest.cs b/tests/UnitTests/WorkflowManager.Tests/Services/DataRetentionService/DataRetentionServiceTest.cs index 8b6cbdce6..6e2fd2075 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Services/DataRetentionService/DataRetentionServiceTest.cs +++ b/tests/UnitTests/WorkflowManager.Tests/Services/DataRetentionService/DataRetentionServiceTest.cs @@ -48,10 +48,10 @@ public async Task CanStartStop() var service = new DataRetentionService(_logger.Object); Assert.Equal(ServiceStatus.Unknown, service.Status); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Running, service.Status); - await service.StopAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + await service.StopAsync(_cancellationTokenSource.Token).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext); Assert.Equal(ServiceStatus.Stopped, service.Status); service.Dispose(); diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 2eda2408f..d30975a16 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -1,14 +1,14 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "AutoFixture.Xunit2": { "type": "Direct", - "requested": "[4.18.0, )", - "resolved": "4.18.0", - "contentHash": "m44VA9qYpqqO6zvSflMOxNNTukMuz+pcY4DrAldFh6f3LpRNTK1dquWI+96jlS9fa4Mli+RnXApveWGnl5w9zw==", + "requested": "[4.18.1, )", + "resolved": "4.18.1", + "contentHash": "I5Cwv1bvWb0lf2x2zO42bBQ2WaGudBh7tVBCzKIf8KmRJG+hmYY7ku3znnFZDVxbQaihNaqNkztLTwK4PwaoWg==", "dependencies": { - "AutoFixture": "4.18.0", + "AutoFixture": "4.18.1", "xunit.extensibility.core": "[2.2.0, 3.0.0)" } }, @@ -29,58 +29,58 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.7.2, )", - "resolved": "17.7.2", - "contentHash": "WOSF/GUYcnrLGkdvCbXDRig2rShtBwfQc5l7IxQE6PZI3CeXAqF1SpyzwlGA5vw+MdEAXs3niy+ZkGBBWna6tw==", + "requested": "[17.8.0, )", + "resolved": "17.8.0", + "contentHash": "BmTYGbD/YuDHmApIENdoyN1jCk0Rj1fJB0+B/fVekyTdVidr91IlzhqzytiUgaEAzL1ZJcYCme0MeBMYvJVzvw==", "dependencies": { - "Microsoft.CodeCoverage": "17.7.2", - "Microsoft.TestPlatform.TestHost": "17.7.2" + "Microsoft.CodeCoverage": "17.8.0", + "Microsoft.TestPlatform.TestHost": "17.8.0" } }, "Moq": { "type": "Direct", - "requested": "[4.20.69, )", - "resolved": "4.20.69", - "contentHash": "8P/oAUOL8ZVyXnzBBcgdhTsOD1kQbAWfOcMI7KDQO3HqQtzB/0WYLdnMa4Jefv8nu/MQYiiG0IuoJdvG0v0Nig==", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", "dependencies": { "Castle.Core": "5.1.1" } }, "xunit": { "type": "Direct", - "requested": "[2.5.0, )", - "resolved": "2.5.0", - "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", + "requested": "[2.6.5, )", + "resolved": "2.6.5", + "contentHash": "iPSL63kw21BdSsdA79bvbVNvyn17DWI4D6VbgNxYtvzgViKrmbRLr8sWPxSlc4AvnofEuFfAi/rrLSzSRomwCg==", "dependencies": { - "xunit.analyzers": "1.2.0", - "xunit.assert": "2.5.0", - "xunit.core": "[2.5.0]" + "xunit.analyzers": "1.9.0", + "xunit.assert": "2.6.5", + "xunit.core": "[2.6.5]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.5.0, )", - "resolved": "2.5.0", - "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" + "requested": "[2.5.6, )", + "resolved": "2.5.6", + "contentHash": "CW6uhMXNaQQNMSG1IWhHkBT+V5eqHqn7MP0zfNMhU9wS/sgKX7FGL3rzoaUgt26wkY3bpf7pDVw3IjXhwfiP4w==" }, "Ardalis.GuardClauses": { "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" + "resolved": "4.3.0", + "contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg==" }, "AspNetCore.HealthChecks.MongoDb": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "0R3NVbsjMhS5fd2hGijzQNKJ0zQBv/qMC7nkpmnbtgribCj7vfNdAhSqv4lwbibffRWPW5A/7VNJMX4aPej0WQ==", + "resolved": "8.0.0", + "contentHash": "0YjJlCwkwulozPxFCRcJAl2CdjU5e5ekj4/BQsA6GZbzRxwtN3FIg7LJcWUUgMdwqDoe+6SKFBRnSRpfLY4owA==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.2", - "MongoDB.Driver": "2.14.1" + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "MongoDB.Driver": "2.22.0" } }, "AutoFixture": { "type": "Transitive", - "resolved": "4.18.0", - "contentHash": "xITUSenQsEW3RxXzcDPvxA33PGEQHxfvYjEbiai8URCcmq+osECGdLqGfHmMmcttndWgLxYCV7bRIm089fu7HA==", + "resolved": "4.18.1", + "contentHash": "BmWZDY4fkrYOyd5/CTBOeXbzsNwV8kI4kDi/Ty1Y5F+WDHBVKxzfWlBE4RSicvZ+EOi2XDaN5uwdrHsItLW6Kw==", "dependencies": { "Fare": "[2.1.1, 3.0.0)", "System.ComponentModel.Annotations": "4.3.0" @@ -88,15 +88,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.200.13", - "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw==" + "resolved": "3.7.300.29", + "contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.201.9", - "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==", + "resolved": "3.7.300.30", + "contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==", "dependencies": { - "AWSSDK.Core": "[3.7.200.13, 4.0.0)" + "AWSSDK.Core": "[3.7.300.29, 4.0.0)" } }, "Castle.Core": { @@ -109,8 +109,8 @@ }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.2.0", - "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + "resolved": "8.2.2", + "contentHash": "+zIp8d3sbtYaRbM6hqDs4Ui/z34j7DcUmleruZlYLE4CVxXq+MO8XJyIs42vzeTYFX+k0Iq1dEbBUnQ4z/Gnrw==" }, "DnsClient": { "type": "Transitive", @@ -130,10 +130,10 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "resolved": "5.1.2", + "contentHash": "2lM76Vq+GRdwyY3BQiUJ+V6yxdFiOG4ysLJC7qNTxLsq/1pr5ZTTXiIzWQa+uJ0MuKnzzFogV5+meDflsyjs2g==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.2.0", + "CommunityToolkit.HighPerformance": "8.2.2", "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", @@ -142,7 +142,7 @@ "System.Buffers": "4.5.1", "System.Text.Encoding.CodePages": "6.0.0", "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.7", + "System.Text.Json": "6.0.9", "System.Threading.Channels": "6.0.0" } }, @@ -156,10 +156,10 @@ }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "ivpWC8L84Y+l9VZOa0uJXPoUE+n3TiSRZpfKxMElRtLMYCeXmz5x3O7CuCJkZ65z1520RWuEZDmHefxiz5TqPg==", + "resolved": "8.0.0", + "contentHash": "rwxaZYHips5M9vqxRkGfJthTx+Ws4O4yCuefn17J371jL3ouC5Ker43h2hXb5yd9BMnImE9rznT75KJHm6bMgg==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.0.3" } }, "Microsoft.AspNetCore.Hosting.Abstractions": { @@ -200,20 +200,20 @@ }, "Microsoft.AspNetCore.JsonPatch": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "jQAfNQ7ExLXVUeenihZDqxRr3sBNf8SsenFDOgikb9KaWoWuX91PqSo3G+JDWJppHMucjN55wgEEC3fg5Lzqew==", + "resolved": "8.0.0", + "contentHash": "klQdb/9+j0u8MDjoqHEgDCPz8GRhfsbRVvZIM3glFqjs8uY7S1hS9RvKZuz8o4dS9NsEpFp4Jccd8CQuIYHK0g==", "dependencies": { "Microsoft.CSharp": "4.7.0", - "Newtonsoft.Json": "13.0.1" + "Newtonsoft.Json": "13.0.3" } }, "Microsoft.AspNetCore.Mvc.NewtonsoftJson": { "type": "Transitive", - "resolved": "6.0.22", - "contentHash": "CVZatoGdeRlC74aw1lrg0+U49h1o+T23gcsFI/Xxmb+48+5cuoZawshSLLhpMeCxurIvmk6owfA+D6wvOvkn0g==", + "resolved": "8.0.0", + "contentHash": "/e5+eBvY759xiZJO+y1lHi4VzXqbDzTJSyCtKpaj3Ko2JAFQjiCOJ0ZHk2i4g4HpoSdXmzEXQsjr6dUX9U0/JA==", "dependencies": { - "Microsoft.AspNetCore.JsonPatch": "6.0.22", - "Newtonsoft.Json": "13.0.1", + "Microsoft.AspNetCore.JsonPatch": "8.0.0", + "Newtonsoft.Json": "13.0.3", "Newtonsoft.Json.Bson": "1.0.2" } }, @@ -229,8 +229,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.7.2", - "contentHash": "ntbkwIqwszkfCRjxVZOyEQiHauiYsY9NtYjw9ASsoxDSiG8YtV6AGcOAwrAk3TZv2UOq4MrpX+3MYEeMHSb03w==" + "resolved": "17.8.0", + "contentHash": "KC8SXWbGIdoFVdlxKk9WHccm0llm9HypcHMLUUFabRiTS3SO2fQXNZfdiF3qkEdTJhbRrxhdRxjL4jbtwPq4Ew==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -244,118 +244,142 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "resolved": "8.0.0", + "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "b3ErKzND8LIC7o08QAVlKfaEIYEvLJbtmVbFZVBRXeu9YkKfSSzLZfR1SUfQPBIy9mKLhEtJgGYImkcMNaKE0A==", + "resolved": "8.0.0", + "contentHash": "mBMoXLsr5s1y2zOHWmKsE9veDcx8h1x/c3rz4baEdQKTeDcmQAPNbB54Pi/lhFO3K431eEq6PFbMgLaa6PHFfA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", + "resolved": "8.0.0", + "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Diagnostics": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3PZp/YSkIXrF7QK7PfC1bkyRYwqOHpWFad8Qx+4wkuumAeXo1NHaxpS9LboNA9OvNSAu+QOVlXbMyoY+pHSqcw==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==", + "resolved": "8.0.0", + "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "resolved": "8.0.0", + "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } }, "Microsoft.Extensions.Http": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "15+pa2G0bAMHbHewaQIdr/y6ag2H3yh4rd9hTXavtWDzQBkvpe2RMqFg8BxDpcQWssmjmBApGPcw93QRz6YcMg==", + "resolved": "8.0.0", + "contentHash": "cWz4caHwvx0emoYe7NkHPxII/KkTI8R/LC9qdqJqnKv2poTJ4e2qqPGQqvRoQ5kaSA4FU5IV3qFAuLuOhoqULQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "resolved": "8.0.0", + "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==", "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.DependencyInjection": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZDskjagmBAbv+K8rYW9VhjPplhbOE63xUD0DiuydZJwt15dRyoqicYklLd86zzeintUc7AptDkHn+YhhYkYo8A==", + "resolved": "8.0.0", + "contentHash": "ixXXV0G/12g6MXK65TLngYN9V5hQQRuV+fZi882WIoVJT7h5JvoYoxTEwCgdqwLjSneqh1O+66gM8sMr9z/rsQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0" + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" } }, "Microsoft.Extensions.Logging.Console": { @@ -378,72 +402,75 @@ }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "bXWINbTn0vC0FYc9GaQTISbxhQLAMrvtbuvD9N6JelEaIS/Pr62wUCinrq5bf1WRBGczt1v4wDhxFtVFNcMdUQ==", + "resolved": "8.0.0", + "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "7.0.3", + "contentHash": "cfPUWdjigLIRIJSKz3uaZxShgf86RVDXHC1VEEchj1gnY25akwPYpbrfSoIGDCqA9UmOMdlctq411+2pAViFow==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "0qjS31rN1MQTc46tAYbzmMTSRfdV5ndZxSjYxIGqKSidd4wpNJfNII/pdhU5Fx8olarQoKL9lqqYw4yNOIwT0Q==", + "resolved": "7.0.3", + "contentHash": "vxjHVZbMKD3rVdbvKhzAW+7UiFrYToUVm3AGmYfKSOAwyhdLl/ELX1KZr+FaLyyS5VReIzWRWJfbOuHM9i6ywg==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.10.0" + "Microsoft.IdentityModel.Tokens": "7.0.3" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "zbcwV6esnNzhZZ/VP87dji6VrUBLB5rxnZBkDMqNYpyG+nrBnBsbm4PUYLCBMUflHCM9EMLDG0rLnqqT+l0ldA==" + "resolved": "7.0.3", + "contentHash": "b6GbGO+2LOTBEccHhqoJsOsmemG4A/MY+8H0wK/ewRhiG+DCYwEnucog1cSArPIY55zcn+XdZl0YEiUHkpDISQ==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "7.0.3" + } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "DFyXD0xylP+DknCT3hzJ7q/Q5qRNu0hO/gCU90O0ATdR0twZmlcuY9RNYaaDofXKVbzcShYNCFCGle2G/o8mkg==", + "resolved": "7.0.3", + "contentHash": "BtwR+tctBYhPNygyZmt1Rnw74GFrJteW+1zcdIgyvBCjkek6cNwPPqRfdhzCv61i+lwyNomRi8+iI4QKd4YCKA==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.10.0", - "Microsoft.IdentityModel.Tokens": "6.10.0" + "Microsoft.IdentityModel.Logging": "7.0.3", + "Microsoft.IdentityModel.Tokens": "7.0.3" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "LVvMXAWPbPeEWTylDrxunlHH2wFyE4Mv0L4gZrJHC4HTESbWHquKZb/y/S8jgiQEDycOP0PDQvbG4RR/tr2TVQ==", + "resolved": "7.0.3", + "contentHash": "W97TraHApDNArLwpPcXfD+FZH7njJsfEwZE9y9BoofeXMS8H0LBBobz0VOmYmMK4mLdOKxzN7SFT3Ekg0FWI3Q==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.10.0", - "System.IdentityModel.Tokens.Jwt": "6.10.0" + "Microsoft.IdentityModel.Protocols": "7.0.3", + "System.IdentityModel.Tokens.Jwt": "7.0.3" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "qbf1NslutDB4oLrriYTJpy7oB1pbh2ej2lEHd2IPDQH9C74ysOdhU5wAC7KoXblldbo7YsNR2QYFOqQM/b0Rsg==", + "resolved": "7.0.3", + "contentHash": "wB+LlbDjhnJ98DULjmFepqf9eEMh/sDs6S6hFh68iNRHmwollwhxk+nbSSfpA5+j+FbRyNskoaY4JsY1iCOKCg==", "dependencies": { - "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.10.0", - "System.Security.Cryptography.Cng": "4.5.0" + "Microsoft.IdentityModel.Logging": "7.0.3" } }, "Microsoft.NETCore.Platforms": { @@ -463,8 +490,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.7.2", - "contentHash": "aHzQWgDMVBnk39HhQVmn06w+YxzF1h2V5/M4WgrNQAn7q97GR4Si3vLRTDlmJo9nK/Nknce+H4tXx4gqOKyLeg==", + "resolved": "17.8.0", + "contentHash": "AYy6vlpGMfz5kOFq99L93RGbqftW/8eQTqjT9iGXW6s9MRP3UdtY8idJ8rJcjeSja8A18IhIro5YnH3uv1nz4g==", "dependencies": { "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" @@ -472,10 +499,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.7.2", - "contentHash": "pv9yVD7IKPLJV28zYjLsWFiM3j506I2ye+6NquG8vsbm/gR7lgyig8IgY6Vo57VMvGaAKwtUECzcj+C5tH271Q==", + "resolved": "17.8.0", + "contentHash": "9ivcl/7SGRmOT0YYrHQGohWiT5YCpkmy/UEzldfVisLm6QxbLaK3FAJqZXI34rnRLmqqDCeMQxKINwmKwAPiDw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.7.2", + "Microsoft.TestPlatform.ObjectModel": "17.8.0", "Newtonsoft.Json": "13.0.1" } }, @@ -500,76 +527,78 @@ }, "Minio": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "7tZj90WEuuH60RAP4wBYexjMuJOhCnK7I46hCiX3CtZPackHisLZ8aAJmn3KlwbUX22dBDphwemD+h37vet8Qw==", + "resolved": "6.0.1", + "contentHash": "uavo/zTpUzHLqnB0nyAk6E/2THLRPvZ59Md7IkLKXkAFiX//K2knVK2+dSHDNN2uAUqCvLqO+cM+s9VGBWbIKQ==", "dependencies": { - "CommunityToolkit.HighPerformance": "8.1.0", + "CommunityToolkit.HighPerformance": "8.2.2", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Logging": "7.0.0", "System.IO.Hashing": "7.0.0", - "System.Reactive.Linq": "5.0.0" + "System.Reactive": "6.0.0" } }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==", + "resolved": "2.0.0", + "contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.6", - "contentHash": "Ka4K58/brPHv/GiUdiWsKPvnesfNqYrSN3GVa1sRp6iAGSmO7QA1Yl5/Pd/q494U55OGNI9JPtEbQZUx6G4/nQ==", + "resolved": "2.0.0", + "contentHash": "J5dXjOBqA59irTcFbfwxIQnLxUXGcMCA/cuk1+TJgscMeb2WTVks3esZmcs3pOY2OIBmOROvBl/6KaL9cYFPmg==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.6", - "Polly": "7.2.4", - "RabbitMQ.Client": "6.5.0" + "Monai.Deploy.Messaging": "2.0.0", + "Polly": "8.2.0", + "RabbitMQ.Client": "6.8.1" } }, "Monai.Deploy.Security": { "type": "Transitive", - "resolved": "0.1.3", - "contentHash": "9/E/UEK9Foo1cUHRRgNIR8uk+oTLiBbzR2vqBsxIo1EwbduDVuBGFcIh2lpAJZmFFwBNv0KtmTASdD3w5UWd+g==", + "resolved": "1.0.0", + "contentHash": "q0dQiOpOoHX4a3XkueqFRx51WOrQpW1Lwj7e4oqI6aOBeUlA9CPMdZ4+4BlemXc/1A5IClrPugp/owZ1NJ2Wxg==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.11", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.3", - "Microsoft.Extensions.Logging.Configuration": "6.0.0" + "Ardalis.GuardClauses": "4.3.0", + "Microsoft.AspNetCore.Authentication.JwtBearer": "8.0.0", + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Configuration": "8.0.0" } }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==", + "resolved": "1.0.0", + "contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.201.9", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Monai.Deploy.Storage.S3Policy": "0.2.18", - "System.IO.Abstractions": "17.2.3" + "AWSSDK.SecurityToken": "3.7.300.30", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0", + "System.IO.Abstractions": "20.0.4" } }, "Monai.Deploy.Storage.MinIO": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "0sHLiT0qU2Fg5O+AF8UDqzsJEYztUAFZeOPh4kOLC4bckhb+wSsuv7VcAXWtR3BOY6TxaMVVUJ+EK/o5mCp3tQ==", + "resolved": "1.0.0", + "contentHash": "o6Lq9rshOJ3sxz4lIfl14Zn7+YXvXXg2Jpndtnnx4Ez1RDSTDu2Zf08lEgFHTmwAML1e4fsVVm16LaXv3h3L3A==", "dependencies": { - "Minio": "5.0.0", - "Monai.Deploy.Storage": "0.2.18", - "Monai.Deploy.Storage.S3Policy": "0.2.18" + "Minio": "6.0.1", + "Monai.Deploy.Storage": "1.0.0", + "Monai.Deploy.Storage.S3Policy": "1.0.0" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.18", - "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==", + "resolved": "1.0.0", + "contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==", "dependencies": { - "Ardalis.GuardClauses": "4.1.1", + "Ardalis.GuardClauses": "4.3.0", "Newtonsoft.Json": "13.0.3" } }, @@ -596,8 +625,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", + "resolved": "2.23.1", + "contentHash": "IX9tycM35xK5hFwnU+rzharPJOtKYtON6E6Lp2nwOVjh40TUcS/HYToEEWZkLgqKNMCfYPK3Fz3QUCxzhkQRGA==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -605,29 +634,29 @@ }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", + "resolved": "2.23.1", + "contentHash": "kidqCwGBuLBx2IcW4os3J6zsp9yaUWm7Sp8G08Nm2RVRSAf0cJXfsynl2wRWpHh0HgfIzzwkevP/qhfsKfu8bQ==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", - "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Bson": "2.23.1", + "MongoDB.Driver.Core": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", + "resolved": "2.23.1", + "contentHash": "K8LMdnVgT82vdbSllv8VzjPOLa9k5rLcCBd1fG45z+QGJNPWzAFW5lLgLJQ7xXuJgQIwvP1DBx6X6ecWBtox7g==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.21.0", + "MongoDB.Bson": "2.23.1", "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", - "ZstdSharp.Port": "0.6.2" + "ZstdSharp.Port": "0.7.3" } }, "MongoDB.Libmongocrypt": { @@ -701,25 +730,25 @@ }, "NLog": { "type": "Transitive", - "resolved": "5.2.4", - "contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ==" + "resolved": "5.2.8", + "contentHash": "jAIELkWBs1CXFPp986KSGpDFQZHCFccO+LMbKBTTNm42KifaI1mYzFMFQQfuGmGMTrCx0TFPhDjHDE4cLAZWiQ==" }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.3.4", - "contentHash": "rxUGUqhE3DlcKfKhPJOI0xOt8q2+NX0NkBY9lbRXwZEYQsh8ASFS8X7K+Y7/dcE8v0tpAe7GF8rPD5h4h9Hpsg==", + "resolved": "5.3.8", + "contentHash": "6VD0lyeokWltL6j8lO7mS7v7lbuO/qn0F7kdvhKhEx1JvFyD39nzohOK3JvkVh4Nn3mrcMDCyDxvTvmiW55jQg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.2.4" + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "NLog": "5.2.8" } }, "NLog.Web.AspNetCore": { "type": "Transitive", - "resolved": "5.3.4", - "contentHash": "80FaN8CKu94E3mZqZ+r46nRyEYgnHMn4i3vPslbaINs8k+TqJClNFYw6uWLhPU4AN7PKi/jHHzpswqn7K8jgGg==", + "resolved": "5.3.8", + "contentHash": "Rt2OCulpAF6rSrZWZzPgHikAI8SDKkq3/52xA/uJ4JtmNjoizULN/IBYtYlZojbPbXiFm3uadOO2rOvvMhjXBQ==", "dependencies": { - "NLog.Extensions.Logging": "5.3.4" + "NLog.Extensions.Logging": "5.3.8" } }, "NuGet.Frameworks": { @@ -729,13 +758,21 @@ }, "Polly": { "type": "Transitive", - "resolved": "7.2.4", - "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" + "resolved": "8.2.0", + "contentHash": "KZm8iG29y6Mse7YntYYJSf5fGWuhYLliWgZaG/8NcuXS4gN7SPdtPYpjCxQlHqxvMGubkWVrGp3MvUaI7SkyKA==", + "dependencies": { + "Polly.Core": "8.2.0" + } + }, + "Polly.Core": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "gnKp3+mxGFmkFs4eHcD9aex0JOF8zS1Y18c2A5ckXXTVqbs6XLcDyLKgSa/mUFqAnH3mn9+uVIM0RhAec/d3kA==" }, "RabbitMQ.Client": { "type": "Transitive", - "resolved": "6.5.0", - "contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==", + "resolved": "6.8.1", + "contentHash": "jNsmGgmCNw2S/NzskeN2ijtGywtH4Sk/G6jWUTD5sY9SrC27Xz6BsLIiB8hdsfjeyWCa4j4GvCIGkpE8wrjU1Q==", "dependencies": { "System.Memory": "4.5.5", "System.Threading.Channels": "7.0.0" @@ -1075,11 +1112,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" }, "System.Diagnostics.EventLog": { "type": "Transitive", @@ -1142,11 +1176,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.10.0", - "contentHash": "C+Q5ORsFycRkRuvy/Xd0Pv5xVpmWSAvQYZAGs7VQogmkqlLhvfZXTgBIlHqC3cxkstSoLJAYx6xZB7foQ2y5eg==", + "resolved": "7.0.3", + "contentHash": "caEe+OpQNYNiyZb+DJpUVROXoVySWBahko2ooNfUcllxa9ZQUM8CgM/mDjP6AoFn6cQU9xMmG+jivXWub8cbGg==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.10.0", - "Microsoft.IdentityModel.Tokens": "6.10.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.0.3", + "Microsoft.IdentityModel.Tokens": "7.0.3" } }, "System.IO": { @@ -1163,8 +1197,12 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.2.3", - "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + "resolved": "20.0.4", + "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4", + "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4" + } }, "System.IO.Compression": { "type": "Transitive", @@ -1344,17 +1382,8 @@ }, "System.Reactive": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==" - }, - "System.Reactive.Linq": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "IB4/qlV4T1WhZvM11RVoFUSZXPow9VWVeQ1uDkSKgz6bAO+gCf65H/vjrYlwyXmojSSxvfHndF9qdH43P/IuAw==", - "dependencies": { - "System.Reactive": "5.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } + "resolved": "6.0.0", + "contentHash": "31kfaW4ZupZzPsI5PVe77VhnvFF55qgma7KZr/E0iFTs6fmdhhG8j0mgEx620iLTey1EynOkEfnyTjtNEpJzGw==" }, "System.Reflection": { "type": "Transitive", @@ -1552,8 +1581,21 @@ }, "System.Security.Cryptography.Cng": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + "resolved": "4.3.0", + "contentHash": "03idZOqFlsKRL4W+LuCpJ6dBYDUWReug6lZjBa3uJWnk5sPCUXckocevTaUA8iT/MFSrY/2HXkOt753xQ/cf8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0" + } }, "System.Security.Cryptography.Csp": { "type": "Transitive", @@ -1709,8 +1751,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "resolved": "6.0.9", + "contentHash": "2j16oUgtIzl7Xtk7demG0i/v5aU/ZvULcAnJvPb63U3ZhXJ494UYcxuEj5Fs49i3XDrk5kU/8I+6l9zRCw3cJw==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1750,8 +1792,13 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" + "resolved": "4.3.0", + "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } }, "System.Threading.Timer": { "type": "Transitive", @@ -1809,6 +1856,19 @@ "System.Xml.ReaderWriter": "4.3.0" } }, + "TestableIO.System.IO.Abstractions": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA==" + }, + "TestableIO.System.IO.Abstractions.Wrappers": { + "type": "Transitive", + "resolved": "20.0.4", + "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==", + "dependencies": { + "TestableIO.System.IO.Abstractions": "20.0.4" + } + }, "xunit.abstractions": { "type": "Transitive", "resolved": "2.0.3", @@ -1816,30 +1876,27 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" + "resolved": "1.9.0", + "contentHash": "02ucFDty6Y9BBT5c35YueFfbM3uEzeFdRvlNtAPhZVUkGUlhl3jsV2XesgTj986/PZXIjpVoc2D8ee6p1ha/Fw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.5.0", - "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", - "dependencies": { - "NETStandard.Library": "1.6.1" - } + "resolved": "2.6.5", + "contentHash": "gb5uv7vjBFz7nhEa6aXK5sVJwsG/88xf8DN5wqK0ejCDsDybqICyNJIj+eoD43xbmdPZryNDPpeWDCfiKI/bnA==" }, "xunit.core": { "type": "Transitive", - "resolved": "2.5.0", - "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", + "resolved": "2.6.5", + "contentHash": "hpdMnSNlx4ejaxpaIAFaqHt4q9ZCnzZLnURrSa5CzYXxHhIQbV8/0yXLjRdublhreonGXVMmsQ1KHlS9WbfpCw==", "dependencies": { - "xunit.extensibility.core": "[2.5.0]", - "xunit.extensibility.execution": "[2.5.0]" + "xunit.extensibility.core": "[2.6.5]", + "xunit.extensibility.execution": "[2.6.5]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.5.0", - "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", + "resolved": "2.6.5", + "contentHash": "dSGRkVxzH27XaL83+Z9kNPllqgsmsiPayXw+0weCGsrZQxfSCBNNkSb9nYUpkVoEBCUviXOmo1tfApqhgqTjog==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1847,26 +1904,26 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.5.0", - "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", + "resolved": "2.6.5", + "contentHash": "jUMr88e0lSqDq8Vut0XVqx7plFg91QsKW/rX6gaVnJL6Z19LmNSDmyqd7cg6HQGfboAmyoFZyydA4Kcgouu1BA==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.5.0]" + "xunit.extensibility.core": "[2.6.5]" } }, "ZstdSharp.Port": { "type": "Transitive", - "resolved": "0.6.2", - "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" }, "monai.deploy.workflowmanager": { "type": "Project", "dependencies": { - "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.22, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.6, )", - "Monai.Deploy.Security": "[0.1.3, )", - "Monai.Deploy.Storage.MinIO": "[0.2.18, )", + "AspNetCore.HealthChecks.MongoDb": "[8.0.0, )", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[8.0.0, )", + "Monai.Deploy.Messaging.RabbitMQ": "[2.0.0, )", + "Monai.Deploy.Security": "[1.0.0, )", + "Monai.Deploy.Storage.MinIO": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", @@ -1876,8 +1933,8 @@ "Monai.Deploy.WorkflowManager.PayloadListener": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Services": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "NLog": "[5.2.4, )", - "NLog.Web.AspNetCore": "[5.3.4, )", + "NLog": "[5.2.8, )", + "NLog.Web.AspNetCore": "[5.3.8, )", "Swashbuckle.AspNetCore": "[6.5.0, )" } }, @@ -1892,15 +1949,15 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[2.0.0, )", + "Monai.Deploy.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.1.1, )" + "fo-dicom": "[5.1.2, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { @@ -1915,9 +1972,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.21.0, )" + "MongoDB.Bson": "[2.23.1, )" } }, "monai.deploy.workflowmanager.database": { @@ -1926,7 +1983,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.21.0, )" + "MongoDB.Driver": "[2.23.1, )" } }, "monai.deploy.workflowmanager.logging": { @@ -1955,7 +2012,7 @@ "monai.deploy.workflowmanager.services": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Http": "[6.0.0, )", + "Microsoft.Extensions.Http": "[8.0.0, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )" } @@ -1963,7 +2020,7 @@ "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Monai.Deploy.Storage": "[0.2.18, )", + "Monai.Deploy.Storage": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } @@ -1971,7 +2028,7 @@ "monai.deploy.workloadmanager.workflowexecuter": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.6, )", + "Monai.Deploy.Messaging": "[2.0.0, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )",