diff --git a/Dockerfile b/Dockerfile index 5a1dd4c85..2187ffc4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ WORKDIR /app COPY . ./ RUN echo "Building MONAI Workflow Manager $Version ($FileVersion)..." -RUN dotnet publish -c Release -o out --nologo /p:Version=$Version /p:FileVersion=$FileVersion src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +RUN dotnet publish -c Release -o out --nologo /p:Version=$Version /p:FileVersion=$FileVersion src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj RUN echo "Fetching mc executable for minio..." RUN wget https://dl.min.io/client/mc/release/linux-amd64/mc diff --git a/build.sh b/build.sh index 45a162613..b8b390a54 100755 --- a/build.sh +++ b/build.sh @@ -24,8 +24,3 @@ echo "Building Workflow Manager Docker Image. VERSION=$VERSION, FILEVERSION=$FIL pushd $SCRIPT_DIR docker build --tag monai/workflow-manager:$VERSION --build-arg Version=$VERSION --build-arg FileVersion=$FILEVERSION . popd - -pushd $SCRIPT_DIR/src/CLI -echo "Building Workflow Manager CLI: linux-x64" -dotnet publish -r linux-x64 -c Release --self-contained -o $SCRIPT_DIR/cli/linux-x64 -popd diff --git a/src/CLI/Monai.Deploy.WorkflowManager.CLI.csproj b/src/CLI/Monai.Deploy.WorkflowManager.CLI.csproj deleted file mode 100644 index 2be1d9139..000000000 --- a/src/CLI/Monai.Deploy.WorkflowManager.CLI.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - Exe - net6.0 - true - false - true - Monai.Deploy.WorkflowManager.CLI - - - - - - - - - - - - - - - - true - true - - diff --git a/src/Monai.Deploy.WorkflowManager.sln b/src/Monai.Deploy.WorkflowManager.sln index 6072e76ed..8cf68d64b 100644 --- a/src/Monai.Deploy.WorkflowManager.sln +++ b/src/Monai.Deploy.WorkflowManager.sln @@ -19,28 +19,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32328.378 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager", "WorkflowManager\Monai.Deploy.WorkflowManager.csproj", "{4BABBAE0-5C3B-4DDB-B52C-8EFF2A115DAC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.CLI", "CLI\Monai.Deploy.WorkflowManager.CLI.csproj", "{6A6F01AA-83A7-44FD-B9E9-E5A04BD2786B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Database", "Database\Monai.Deploy.WorkflowManager.Database.csproj", "{FE07AE59-97C9-49FF-9D36-485090E6B14D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Configuration", "Configuration\Monai.Deploy.WorkflowManager.Configuration.csproj", "{3D16153E-F052-48BB-B5F0-BA113DE4CB29}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Contracts", "Contracts\Monai.Deploy.WorkflowManager.Contracts.csproj", "{7E2B81A9-1951-4D8F-BC91-19DD69AF3328}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.PayloadListener", "PayloadListener\Monai.Deploy.WorkflowManager.PayloadListener.csproj", "{AB662390-B075-4621-ADC7-59A2F4702366}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Logging", "Logging\Monai.Deploy.WorkflowManager.Logging.csproj", "{ADCC3969-E32D-441B-B76A-9FD432DC6A77}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Common", "Common\Monai.Deploy.WorkflowManager.Common.csproj", "{34C41B48-7B14-4C16-9644-9AB20E6B9435}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{71DDEE7B-E213-4E39-A7F4-4646783A27F7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkloadManager.WorkfowExecuter", "WorkflowExecuter\Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj", "{BF0FB5E4-2C58-4AC3-9D68-5FB6BD196C45}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.CLI.Tests", "..\tests\UnitTests\CLI.Tests\Monai.Deploy.WorkflowManager.CLI.Tests.csproj", "{D593E28A-0FD2-45EA-9A75-10433AE517C8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Configuration.Tests", "..\tests\UnitTests\Configuration.Tests\Monai.Deploy.WorkflowManager.Configuration.Tests.csproj", "{A3E8A54A-063A-4274-8C1F-EE65AC1AF588}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Database.Tests", "..\tests\UnitTests\Database.Tests\Monai.Deploy.WorkflowManager.Database.Tests.csproj", "{24DC4287-D24B-41BD-9135-19F68B190AC4}" @@ -53,26 +33,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManage EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Task Manager", "Task Manager", "{78B0EB6E-2636-48A7-8FDB-4334C3F3FFF1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager", "TaskManager\Monai.Deploy.WorkflowManager.TaskManager.csproj", "{5FF2D787-4A97-4FE0-9533-9E490FCACEA9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager", "TaskManager\TaskManager\Monai.Deploy.WorkflowManager.TaskManager.csproj", "{5FF2D787-4A97-4FE0-9533-9E490FCACEA9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.API", "TaskManager\API\Monai.Deploy.WorkflowManager.TaskManager.API.csproj", "{CE4FF14A-6399-44E2-BD29-A2D3F7D1ABB4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.Argo", "TaskManager\Plug-ins\Argo\Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj", "{1D5EC18D-96AE-4F67-803E-595E1621C664}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.Runner", "TaskManager\Runner\Monai.Deploy.WorkflowManager.TaskManager.Runner.csproj", "{93129B08-1983-40E4-805E-C2A0BC245839}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests", "..\tests\UnitTests\TaskManager.Argo.Tests\Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj", "{2DA40575-4748-4198-BE57-F4AF070DE8E3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.Tests", "..\tests\UnitTests\TaskManager.Tests\Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj", "{89D3D817-CCFE-4933-9089-D1283F2EA1B5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.ConditionsResolver", "ConditionsResolver\Monai.Deploy.WorkflowManager.ConditionsResolver.csproj", "{9FC45A71-46A0-49DD-A706-D9A8A6DFD4B3}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.ConditionsResolver.Tests", "..\tests\UnitTests\ConditionsResolver.Tests\Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj", "{918E4DE3-A7BF-4B7F-9B5A-5C36FEFA3C30}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Common.Tests", "..\tests\UnitTests\WorkflowManager.Common.Tests\Monai.Deploy.WorkflowManager.Common.Tests.csproj", "{A44F975E-70CA-49D6-8513-78F2D5210EAF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Storage", "Monai.Deploy.WorkflowManager.Storage\Monai.Deploy.WorkflowManager.Storage.csproj", "{3CCAEF98-6A23-4CFB-8030-D3A754A97AD6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Storage.Tests", "..\tests\UnitTests\Storage.Tests\Monai.Deploy.WorkflowManager.Storage.Tests.csproj", "{722C0D57-49F8-4178-88F0-06E369B797A3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview", "TaskManager\Plug-ins\AideClinicalReview\Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj", "{013395D4-2091-4AB8-96CB-867C0F982096}" @@ -85,56 +57,42 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManage EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests", "..\tests\IntegrationTests\TaskManager.IntegrationTests\Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj", "{A966A7B9-2D4E-4A93-8D20-BD140E7A7F85}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monai.Deploy.WorkflowManager.TaskManager.Database", "TaskManager\Database\Monai.Deploy.WorkflowManager.TaskManager.Database.csproj", "{1ACB9766-0227-430E-ACC2-C2F87AB65FC5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.Database", "TaskManager\Database\Monai.Deploy.WorkflowManager.TaskManager.Database.csproj", "{1ACB9766-0227-430E-ACC2-C2F87AB65FC5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plug-ins", "Plug-ins", "{541C5347-5D7D-44B7-95D3-B6FB3D9EB955}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflow Manager", "Workflow Manager", "{AC5B198A-C3F2-4AD2-B532-E71B4630BDD5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Common", "WorkflowManager\Common\Monai.Deploy.WorkflowManager.Common.csproj", "{E25A9EED-1293-4E7A-9818-90B6E8D4768A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager", "WorkflowManager\WorkflowManager\Monai.Deploy.WorkflowManager.csproj", "{23AD27A4-40B2-4090-9409-7BABD383A1CD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkloadManager.WorkfowExecuter", "WorkflowManager\WorkflowExecuter\Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj", "{1E485856-E99F-46E0-A1D5-D56DF1657D84}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.PayloadListener", "WorkflowManager\PayloadListener\Monai.Deploy.WorkflowManager.PayloadListener.csproj", "{F1C458DB-3954-4C1C-9294-846DDB68B0DB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Database", "WorkflowManager\Database\Monai.Deploy.WorkflowManager.Database.csproj", "{75AC3965-EB74-4EB5-821A-630D16DCCBE7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.ConditionsResolver", "WorkflowManager\ConditionsResolver\Monai.Deploy.WorkflowManager.ConditionsResolver.csproj", "{E97D60FC-D351-4D36-9EBA-673134D3A472}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Logging", "WorkflowManager\Logging\Monai.Deploy.WorkflowManager.Logging.csproj", "{4D444C7D-0D47-4383-A31A-FE0E69559F92}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Contracts", "WorkflowManager\Contracts\Monai.Deploy.WorkflowManager.Contracts.csproj", "{CE5DD469-64DE-466E-94DB-F57B9FAFD038}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Storage", "WorkflowManager\Storage\Monai.Deploy.WorkflowManager.Storage.csproj", "{ED1808DD-C873-44DE-8D7F-399104D1FF8E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{37A19144-CEA5-47A2-9FFD-22C522E8B895}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Configuration", "Shared\Configuration\Monai.Deploy.WorkflowManager.Configuration.csproj", "{DD11E3E8-1D6F-47F9-98A7-5D2CC7A53C43}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Common.Tests", "..\tests\UnitTests\Common.Tests\Monai.Deploy.WorkflowManager.Common.Tests.csproj", "{99A847CA-7444-49BD-8814-C7CB68A0392F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4BABBAE0-5C3B-4DDB-B52C-8EFF2A115DAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BABBAE0-5C3B-4DDB-B52C-8EFF2A115DAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BABBAE0-5C3B-4DDB-B52C-8EFF2A115DAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BABBAE0-5C3B-4DDB-B52C-8EFF2A115DAC}.Release|Any CPU.Build.0 = Release|Any CPU - {6A6F01AA-83A7-44FD-B9E9-E5A04BD2786B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A6F01AA-83A7-44FD-B9E9-E5A04BD2786B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A6F01AA-83A7-44FD-B9E9-E5A04BD2786B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A6F01AA-83A7-44FD-B9E9-E5A04BD2786B}.Release|Any CPU.Build.0 = Release|Any CPU - {FE07AE59-97C9-49FF-9D36-485090E6B14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE07AE59-97C9-49FF-9D36-485090E6B14D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE07AE59-97C9-49FF-9D36-485090E6B14D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE07AE59-97C9-49FF-9D36-485090E6B14D}.Release|Any CPU.Build.0 = Release|Any CPU - {3D16153E-F052-48BB-B5F0-BA113DE4CB29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D16153E-F052-48BB-B5F0-BA113DE4CB29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D16153E-F052-48BB-B5F0-BA113DE4CB29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D16153E-F052-48BB-B5F0-BA113DE4CB29}.Release|Any CPU.Build.0 = Release|Any CPU - {7E2B81A9-1951-4D8F-BC91-19DD69AF3328}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E2B81A9-1951-4D8F-BC91-19DD69AF3328}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E2B81A9-1951-4D8F-BC91-19DD69AF3328}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E2B81A9-1951-4D8F-BC91-19DD69AF3328}.Release|Any CPU.Build.0 = Release|Any CPU - {AB662390-B075-4621-ADC7-59A2F4702366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB662390-B075-4621-ADC7-59A2F4702366}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB662390-B075-4621-ADC7-59A2F4702366}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB662390-B075-4621-ADC7-59A2F4702366}.Release|Any CPU.Build.0 = Release|Any CPU - {ADCC3969-E32D-441B-B76A-9FD432DC6A77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADCC3969-E32D-441B-B76A-9FD432DC6A77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADCC3969-E32D-441B-B76A-9FD432DC6A77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADCC3969-E32D-441B-B76A-9FD432DC6A77}.Release|Any CPU.Build.0 = Release|Any CPU - {34C41B48-7B14-4C16-9644-9AB20E6B9435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34C41B48-7B14-4C16-9644-9AB20E6B9435}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34C41B48-7B14-4C16-9644-9AB20E6B9435}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34C41B48-7B14-4C16-9644-9AB20E6B9435}.Release|Any CPU.Build.0 = Release|Any CPU - {BF0FB5E4-2C58-4AC3-9D68-5FB6BD196C45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF0FB5E4-2C58-4AC3-9D68-5FB6BD196C45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF0FB5E4-2C58-4AC3-9D68-5FB6BD196C45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF0FB5E4-2C58-4AC3-9D68-5FB6BD196C45}.Release|Any CPU.Build.0 = Release|Any CPU - {D593E28A-0FD2-45EA-9A75-10433AE517C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D593E28A-0FD2-45EA-9A75-10433AE517C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D593E28A-0FD2-45EA-9A75-10433AE517C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D593E28A-0FD2-45EA-9A75-10433AE517C8}.Release|Any CPU.Build.0 = Release|Any CPU {A3E8A54A-063A-4274-8C1F-EE65AC1AF588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A3E8A54A-063A-4274-8C1F-EE65AC1AF588}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3E8A54A-063A-4274-8C1F-EE65AC1AF588}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -167,10 +125,6 @@ Global {1D5EC18D-96AE-4F67-803E-595E1621C664}.Debug|Any CPU.Build.0 = Debug|Any CPU {1D5EC18D-96AE-4F67-803E-595E1621C664}.Release|Any CPU.ActiveCfg = Release|Any CPU {1D5EC18D-96AE-4F67-803E-595E1621C664}.Release|Any CPU.Build.0 = Release|Any CPU - {93129B08-1983-40E4-805E-C2A0BC245839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93129B08-1983-40E4-805E-C2A0BC245839}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93129B08-1983-40E4-805E-C2A0BC245839}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93129B08-1983-40E4-805E-C2A0BC245839}.Release|Any CPU.Build.0 = Release|Any CPU {2DA40575-4748-4198-BE57-F4AF070DE8E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2DA40575-4748-4198-BE57-F4AF070DE8E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DA40575-4748-4198-BE57-F4AF070DE8E3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -179,22 +133,10 @@ Global {89D3D817-CCFE-4933-9089-D1283F2EA1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU {89D3D817-CCFE-4933-9089-D1283F2EA1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU {89D3D817-CCFE-4933-9089-D1283F2EA1B5}.Release|Any CPU.Build.0 = Release|Any CPU - {9FC45A71-46A0-49DD-A706-D9A8A6DFD4B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FC45A71-46A0-49DD-A706-D9A8A6DFD4B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FC45A71-46A0-49DD-A706-D9A8A6DFD4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FC45A71-46A0-49DD-A706-D9A8A6DFD4B3}.Release|Any CPU.Build.0 = Release|Any CPU {918E4DE3-A7BF-4B7F-9B5A-5C36FEFA3C30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {918E4DE3-A7BF-4B7F-9B5A-5C36FEFA3C30}.Debug|Any CPU.Build.0 = Debug|Any CPU {918E4DE3-A7BF-4B7F-9B5A-5C36FEFA3C30}.Release|Any CPU.ActiveCfg = Release|Any CPU {918E4DE3-A7BF-4B7F-9B5A-5C36FEFA3C30}.Release|Any CPU.Build.0 = Release|Any CPU - {A44F975E-70CA-49D6-8513-78F2D5210EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A44F975E-70CA-49D6-8513-78F2D5210EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A44F975E-70CA-49D6-8513-78F2D5210EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A44F975E-70CA-49D6-8513-78F2D5210EAF}.Release|Any CPU.Build.0 = Release|Any CPU - {3CCAEF98-6A23-4CFB-8030-D3A754A97AD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CCAEF98-6A23-4CFB-8030-D3A754A97AD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CCAEF98-6A23-4CFB-8030-D3A754A97AD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CCAEF98-6A23-4CFB-8030-D3A754A97AD6}.Release|Any CPU.Build.0 = Release|Any CPU {722C0D57-49F8-4178-88F0-06E369B797A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {722C0D57-49F8-4178-88F0-06E369B797A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {722C0D57-49F8-4178-88F0-06E369B797A3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -223,12 +165,55 @@ Global {1ACB9766-0227-430E-ACC2-C2F87AB65FC5}.Debug|Any CPU.Build.0 = Debug|Any CPU {1ACB9766-0227-430E-ACC2-C2F87AB65FC5}.Release|Any CPU.ActiveCfg = Release|Any CPU {1ACB9766-0227-430E-ACC2-C2F87AB65FC5}.Release|Any CPU.Build.0 = Release|Any CPU + {E25A9EED-1293-4E7A-9818-90B6E8D4768A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E25A9EED-1293-4E7A-9818-90B6E8D4768A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E25A9EED-1293-4E7A-9818-90B6E8D4768A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E25A9EED-1293-4E7A-9818-90B6E8D4768A}.Release|Any CPU.Build.0 = Release|Any CPU + {23AD27A4-40B2-4090-9409-7BABD383A1CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {23AD27A4-40B2-4090-9409-7BABD383A1CD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {23AD27A4-40B2-4090-9409-7BABD383A1CD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {23AD27A4-40B2-4090-9409-7BABD383A1CD}.Release|Any CPU.Build.0 = Release|Any CPU + {1E485856-E99F-46E0-A1D5-D56DF1657D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E485856-E99F-46E0-A1D5-D56DF1657D84}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E485856-E99F-46E0-A1D5-D56DF1657D84}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E485856-E99F-46E0-A1D5-D56DF1657D84}.Release|Any CPU.Build.0 = Release|Any CPU + {F1C458DB-3954-4C1C-9294-846DDB68B0DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1C458DB-3954-4C1C-9294-846DDB68B0DB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1C458DB-3954-4C1C-9294-846DDB68B0DB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1C458DB-3954-4C1C-9294-846DDB68B0DB}.Release|Any CPU.Build.0 = Release|Any CPU + {75AC3965-EB74-4EB5-821A-630D16DCCBE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {75AC3965-EB74-4EB5-821A-630D16DCCBE7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {75AC3965-EB74-4EB5-821A-630D16DCCBE7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {75AC3965-EB74-4EB5-821A-630D16DCCBE7}.Release|Any CPU.Build.0 = Release|Any CPU + {E97D60FC-D351-4D36-9EBA-673134D3A472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E97D60FC-D351-4D36-9EBA-673134D3A472}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E97D60FC-D351-4D36-9EBA-673134D3A472}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E97D60FC-D351-4D36-9EBA-673134D3A472}.Release|Any CPU.Build.0 = Release|Any CPU + {4D444C7D-0D47-4383-A31A-FE0E69559F92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4D444C7D-0D47-4383-A31A-FE0E69559F92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4D444C7D-0D47-4383-A31A-FE0E69559F92}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4D444C7D-0D47-4383-A31A-FE0E69559F92}.Release|Any CPU.Build.0 = Release|Any CPU + {CE5DD469-64DE-466E-94DB-F57B9FAFD038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE5DD469-64DE-466E-94DB-F57B9FAFD038}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE5DD469-64DE-466E-94DB-F57B9FAFD038}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE5DD469-64DE-466E-94DB-F57B9FAFD038}.Release|Any CPU.Build.0 = Release|Any CPU + {ED1808DD-C873-44DE-8D7F-399104D1FF8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED1808DD-C873-44DE-8D7F-399104D1FF8E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED1808DD-C873-44DE-8D7F-399104D1FF8E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED1808DD-C873-44DE-8D7F-399104D1FF8E}.Release|Any CPU.Build.0 = Release|Any CPU + {DD11E3E8-1D6F-47F9-98A7-5D2CC7A53C43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD11E3E8-1D6F-47F9-98A7-5D2CC7A53C43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD11E3E8-1D6F-47F9-98A7-5D2CC7A53C43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD11E3E8-1D6F-47F9-98A7-5D2CC7A53C43}.Release|Any CPU.Build.0 = Release|Any CPU + {99A847CA-7444-49BD-8814-C7CB68A0392F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {99A847CA-7444-49BD-8814-C7CB68A0392F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {99A847CA-7444-49BD-8814-C7CB68A0392F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {99A847CA-7444-49BD-8814-C7CB68A0392F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {D593E28A-0FD2-45EA-9A75-10433AE517C8} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {A3E8A54A-063A-4274-8C1F-EE65AC1AF588} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {24DC4287-D24B-41BD-9135-19F68B190AC4} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {5B9F3B66-E622-4B72-BB3D-8C6A11FD50CD} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} @@ -237,19 +222,28 @@ Global {5FF2D787-4A97-4FE0-9533-9E490FCACEA9} = {78B0EB6E-2636-48A7-8FDB-4334C3F3FFF1} {CE4FF14A-6399-44E2-BD29-A2D3F7D1ABB4} = {78B0EB6E-2636-48A7-8FDB-4334C3F3FFF1} {1D5EC18D-96AE-4F67-803E-595E1621C664} = {541C5347-5D7D-44B7-95D3-B6FB3D9EB955} - {93129B08-1983-40E4-805E-C2A0BC245839} = {78B0EB6E-2636-48A7-8FDB-4334C3F3FFF1} {2DA40575-4748-4198-BE57-F4AF070DE8E3} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {89D3D817-CCFE-4933-9089-D1283F2EA1B5} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {918E4DE3-A7BF-4B7F-9B5A-5C36FEFA3C30} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} - {A44F975E-70CA-49D6-8513-78F2D5210EAF} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {722C0D57-49F8-4178-88F0-06E369B797A3} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {013395D4-2091-4AB8-96CB-867C0F982096} = {541C5347-5D7D-44B7-95D3-B6FB3D9EB955} {57D00445-0798-4D86-97D4-1586E1B020BC} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {91A0D599-472F-4238-A1A3-07807F9C5F61} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} - {7D85E95C-A263-429F-BF8B-8F4A922FD579} = {78B0EB6E-2636-48A7-8FDB-4334C3F3FFF1} + {7D85E95C-A263-429F-BF8B-8F4A922FD579} = {541C5347-5D7D-44B7-95D3-B6FB3D9EB955} {A966A7B9-2D4E-4A93-8D20-BD140E7A7F85} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} {1ACB9766-0227-430E-ACC2-C2F87AB65FC5} = {78B0EB6E-2636-48A7-8FDB-4334C3F3FFF1} {541C5347-5D7D-44B7-95D3-B6FB3D9EB955} = {78B0EB6E-2636-48A7-8FDB-4334C3F3FFF1} + {E25A9EED-1293-4E7A-9818-90B6E8D4768A} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} + {23AD27A4-40B2-4090-9409-7BABD383A1CD} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} + {1E485856-E99F-46E0-A1D5-D56DF1657D84} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} + {F1C458DB-3954-4C1C-9294-846DDB68B0DB} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} + {75AC3965-EB74-4EB5-821A-630D16DCCBE7} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} + {E97D60FC-D351-4D36-9EBA-673134D3A472} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} + {4D444C7D-0D47-4383-A31A-FE0E69559F92} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} + {CE5DD469-64DE-466E-94DB-F57B9FAFD038} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} + {ED1808DD-C873-44DE-8D7F-399104D1FF8E} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5} + {DD11E3E8-1D6F-47F9-98A7-5D2CC7A53C43} = {37A19144-CEA5-47A2-9FFD-22C522E8B895} + {99A847CA-7444-49BD-8814-C7CB68A0392F} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DC0D56C8-D8CB-45CE-B528-F3DCF86D63ED} diff --git a/src/Configuration/ConfigurationValidator.cs b/src/Shared/Configuration/ConfigurationValidator.cs similarity index 100% rename from src/Configuration/ConfigurationValidator.cs rename to src/Shared/Configuration/ConfigurationValidator.cs diff --git a/src/Configuration/DicomAgentConfiguration.cs b/src/Shared/Configuration/DicomAgentConfiguration.cs similarity index 100% rename from src/Configuration/DicomAgentConfiguration.cs rename to src/Shared/Configuration/DicomAgentConfiguration.cs diff --git a/src/Configuration/Exceptions/ConfigurationException.cs b/src/Shared/Configuration/Exceptions/ConfigurationException.cs similarity index 100% rename from src/Configuration/Exceptions/ConfigurationException.cs rename to src/Shared/Configuration/Exceptions/ConfigurationException.cs diff --git a/src/WorkflowManager/Logging/FileLoggingTextFormatter.cs b/src/Shared/Configuration/Logging/FileLoggingTextFormatter.cs similarity index 97% rename from src/WorkflowManager/Logging/FileLoggingTextFormatter.cs rename to src/Shared/Configuration/Logging/FileLoggingTextFormatter.cs index bd352a8a8..35851a4dd 100644 --- a/src/WorkflowManager/Logging/FileLoggingTextFormatter.cs +++ b/src/Shared/Configuration/Logging/FileLoggingTextFormatter.cs @@ -20,7 +20,7 @@ using Karambolo.Extensions.Logging.File; using Microsoft.Extensions.Logging; -namespace Monai.Deploy.WorkflowManager.Logging +namespace Monai.Deploy.WorkflowManager.Configuration.Logging { public class FileLoggingTextFormatter : FileLogEntryTextBuilder { diff --git a/src/Configuration/MessageBrokerConfiguration.cs b/src/Shared/Configuration/MessageBrokerConfiguration.cs similarity index 100% rename from src/Configuration/MessageBrokerConfiguration.cs rename to src/Shared/Configuration/MessageBrokerConfiguration.cs diff --git a/src/Configuration/MessageBrokerConfigurationKeys.cs b/src/Shared/Configuration/MessageBrokerConfigurationKeys.cs similarity index 100% rename from src/Configuration/MessageBrokerConfigurationKeys.cs rename to src/Shared/Configuration/MessageBrokerConfigurationKeys.cs diff --git a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj similarity index 78% rename from src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj rename to src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj index b33284825..20466ffdc 100644 --- a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj +++ b/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj @@ -1,4 +1,4 @@ - - - - - - net6.0 - enable - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - ..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - 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 de3290ec6..eddce6266 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 @@ -27,7 +27,6 @@ - diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index c4c3c29c4..650006658 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -20,11 +20,10 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Common; -using Monai.Deploy.WorkflowManager.Common.Extensions; using Monai.Deploy.WorkflowManager.TaskManager.API; using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging; using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues; +using Monai.Deploy.WorkflowManager.TaskManager.API.Extensions; using Newtonsoft.Json; namespace Monai.Deploy.WorkflowManager.TaskManager.Argo 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 c33441c2f..6707aaa9a 100644 --- a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj +++ b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 0a1a6abee..4e382d8c0 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -86,23 +86,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.11", - "contentHash": "Tb6llf5tUU8FiptuB6Xq8vaJpxXDRcWL39nkEiHkDhdctj9l2kPL0DydrCNCAVwLWWTlPXyLUD8i37Rm0mRjaw==" + "resolved": "3.7.12", + "contentHash": "mIQRvJhLwIB90hxMaRBMOs9FKd8fHZcOKIToYELupCMOPzkwthh0S4y674ExL8n5f+wQ/5m4U26lm1yBkHtqtA==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.176", - "contentHash": "VrUC7q6XTUUNVFlMxPKXKNRdXcZm+I7qOj3EFGOmNXVwmIGM4IsV1V5sCCb2KWZ9Thv/RlR3dA+YxjFP3a/3vw==", + "resolved": "3.7.1.165", + "contentHash": "vz0ryVyjs6r9FD2cy9yzujNR5MKesRivfEJJ6tOaSNcw1gw268fq9dXBLD70H/Ppdw++xxMD9HuFwANj7d8mUg==", "dependencies": { - "AWSSDK.Core": "[3.7.12.11, 4.0.0)" - } - }, - "DnsClient": { - "type": "Transitive", - "resolved": "1.6.1", - "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", - "dependencies": { - "Microsoft.Win32.Registry": "5.0.0" + "AWSSDK.Core": "[3.7.12, 4.0.0)" } }, "Fractions": { @@ -123,6 +115,17 @@ "resolved": "2021.3.0", "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" }, + "Karambolo.Extensions.Logging.File": { + "type": "Transitive", + "resolved": "3.3.1", + "contentHash": "wkPTc/UEuSAwbO3/Ee+oCdotxncmc/DKwjM533Z0BKvJm94NLOvU2i7pifgMd6uAUJ8jy69OcFZRu7hXKbMW6g==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Physical": "3.0.0", + "Microsoft.Extensions.Logging.Configuration": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "3.0.0", + "System.Threading.Channels": "4.7.1" + } + }, "KubernetesClient.Basic": { "type": "Transitive", "resolved": "7.2.19", @@ -164,6 +167,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "iw3UL25Cw9GBILJOs8srwcId2UCz5+BxTu//EN5dO2dOFNtHcNJgnUiqIlmcGi0orIco0pDuDXuIDvhkrY/sGQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "3.0.0" + } + }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", "resolved": "6.0.0", @@ -178,6 +189,28 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "kahEeykb6FyQytoZNNXuz74X85B4weIEt8Kd+0klK48bkXDWOIHAOvNjlGsPMcS9CL935Te8QGQS83JqCbpdHA==", + "dependencies": { + "Microsoft.Extensions.Primitives": "3.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Physical": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "76yB1N8hvzDaTqx3epda5sl/3HATw2FskztmmLmfWuvaooaNgbDa37Jyc7IyBCC4PreXEW/XLEET9w6fiJZOFg==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Abstractions": "3.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "3.0.0" + } + }, + "Microsoft.Extensions.FileSystemGlobbing": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "E1GcUu8JvY/8QfqMUYTs6HlDLefMYhEzeHsjrhRqOZguBmDTFU8d8m+mGtHEyYHWMRT1TEiha0a8I2AuozDUWQ==" + }, "Microsoft.Extensions.Http": { "type": "Transitive", "resolved": "3.1.9", @@ -202,8 +235,17 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.0", + "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==" + }, + "Microsoft.Extensions.Logging.Configuration": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "Z+3mqptSt3pCo0Nl4pmwK+nTpBpRxNe2lFaBCCtsT0bb88GeFKvw6Mg+0IeEgDrfj7h4qzMYRbL5cSFMpENQZA==", + "dependencies": { + "Microsoft.Extensions.Logging": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "3.0.0" + } }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -214,6 +256,17 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "g4V1TXEKUDgOnp1ZKREKSvITYxcUsTqfxNlOaCG7/xlCurLLzFupm+ULkGqIBUIBK+q3kHmt42pVyHwGIcCBmg==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "3.0.0", + "Microsoft.Extensions.Configuration.Binder": "3.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.0.0", + "Microsoft.Extensions.Options": "3.0.0" + } + }, "Microsoft.Extensions.Primitives": { "type": "Transitive", "resolved": "6.0.0", @@ -247,23 +300,14 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", "resolved": "0.2.0-rc0014", @@ -281,33 +325,6 @@ "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, - "MongoDB.Driver": { - "type": "Transitive", - "resolved": "2.17.0", - "contentHash": "NFqjuDNrGNGEsblqoKBoOSUU8vx1UbZjKP3nVhxhGnK9p8ef0t3fyPcjxmYbO5vdFpDQw2A0Ly4dPzyRW3QEug==", - "dependencies": { - "MongoDB.Bson": "2.17.0", - "MongoDB.Driver.Core": "2.17.0", - "MongoDB.Libmongocrypt": "1.5.4" - } - }, - "MongoDB.Driver.Core": { - "type": "Transitive", - "resolved": "2.17.0", - "contentHash": "bQLdFZNywlApJ5H5KnFXxGik3dZ/VOIUQ7YQniZd9eNmNZFEwEMr+/yoCJ8FigyzOd7iKYOLpmUWGwG2M2e2aQ==", - "dependencies": { - "DnsClient": "1.6.1", - "MongoDB.Bson": "2.17.0", - "MongoDB.Libmongocrypt": "1.5.4", - "SharpCompress": "0.30.1", - "System.Buffers": "4.5.1" - } - }, - "MongoDB.Libmongocrypt": { - "type": "Transitive", - "resolved": "1.5.4", - "contentHash": "JQrfonPIGey2n38tYmhkYOjmoHeGCwvbEru/G7zciYcx198neZerSPylIt6kTGtpGQDMhjCg0Nvt9eCBm6TWZQ==" - }, "prometheus-net": { "type": "Transitive", "resolved": "5.0.1", @@ -325,16 +342,6 @@ "System.Threading.Channels": "4.7.1" } }, - "SharpCompress": { - "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, "System.ComponentModel.Annotations": { "type": "Transitive", "resolved": "5.0.0", @@ -381,8 +388,8 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.0.18", - "contentHash": "x0iIMdP+PCLIkz8h13xHCecaiysFgHPe9mM3FdyfSmkl5+MtMCmgFFIe38Aibkzd0UAY/OMoXMKGR2RK10rebQ==" + "resolved": "17.0.24", + "contentHash": "hA7bacntMiZv1Yf9xtjwl/GP3GT1mG84QxhAk7ijAUD0pJhJaVVwXScE13vMpXnNtlaRDW6SeyZdWg2j2qrh4w==" }, "System.Memory": { "type": "Transitive", @@ -463,25 +470,11 @@ "System.Runtime.Extensions": "4.3.0" } }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "5.0.0", - "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", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", @@ -529,63 +522,17 @@ "resolved": "11.2.1", "contentHash": "tBt8K+korVfrjH9wyDEhiLKxbs8qoLCLIFwvYgkSUuMC9//w3z0cFQ8LQAI/5MCKq+BMil0cfRTRvPeE7eXhQw==" }, - "monai.deploy.workflowmanager.common": { - "type": "Project", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" - } - }, - "monai.deploy.workflowmanager.conditionsresolver": { + "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" - } - }, - "monai.deploy.workflowmanager.contracts": { - "type": "Project", - "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.176", + "Karambolo.Extensions.Logging.File": "3.3.1", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0010", - "MongoDB.Bson": "2.17.0", - "Newtonsoft.Json": "13.0.1" - } - }, - "monai.deploy.workflowmanager.database": { - "type": "Project", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "MongoDB.Bson": "2.17.0", - "MongoDB.Driver": "2.17.0" - } - }, - "monai.deploy.workflowmanager.logging": { - "type": "Project", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" - } - }, - "monai.deploy.workflowmanager.storage": { - "type": "Project", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", "Monai.Deploy.Storage": "0.2.0-rc0014", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0" + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.0.24" } }, "monai.deploy.workflowmanager.taskmanager.api": { diff --git a/src/TaskManager/Runner/Monai.Deploy.WorkflowManager.TaskManager.Runner.csproj b/src/TaskManager/Runner/Monai.Deploy.WorkflowManager.TaskManager.Runner.csproj deleted file mode 100644 index 2153fbb63..000000000 --- a/src/TaskManager/Runner/Monai.Deploy.WorkflowManager.TaskManager.Runner.csproj +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - Exe - net6.0 - enable - enable - - - - - - - - - - - - - - - - - - - - - - - Always - - - Always - - - diff --git a/src/TaskManager/Runner/Program.cs b/src/TaskManager/Runner/Program.cs deleted file mode 100644 index 8ec9949df..000000000 --- a/src/TaskManager/Runner/Program.cs +++ /dev/null @@ -1,230 +0,0 @@ -/* - * 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.Globalization; -using System.IO.Abstractions; -using Ardalis.GuardClauses; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Monai.Deploy.Messaging; -using Monai.Deploy.Messaging.API; -using Monai.Deploy.Messaging.Configuration; -using Monai.Deploy.Messaging.Events; -using Monai.Deploy.Messaging.Messages; -using Monai.Deploy.Storage; -using Monai.Deploy.Storage.Configuration; -using Monai.Deploy.TaskManager.API; -using Monai.Deploy.WorkflowManager.Common; -using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.Common.Services; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Database.Options; -using Monai.Deploy.WorkflowManager.Database.Repositories; -using Monai.Deploy.WorkflowManager.Storage.Services; -using Monai.Deploy.WorkflowManager.TaskManager.Argo; -using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues; -using Monai.Deploy.WorkflowManager.TaskManager.Database; -using Monai.Deploy.WorkflowManager.TaskManager.Services; -using MongoDB.Driver; - -namespace Monai.Deploy.WorkflowManager.TaskManager.Runner -{ - internal class Program - { - protected Program() - { } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2254:Template should be a static expression", Justification = "Test application")] - private static async Task Main(string[] args) - { - var exitEvent = new ManualResetEvent(false); - var host = CreateHostBuilder(args).Build(); - _ = host.StartAsync(); - - var messagingKeys = new MessageBrokerConfigurationKeys(); - var taskManager = host.Services.GetRequiredService(); - Guard.Against.NullService(taskManager, nameof(TaskManager)); - var logger = host.Services.GetRequiredService>(); - Guard.Against.NullService(logger, nameof(ILogger)); - var publisher = host.Services.GetRequiredService(); - Guard.Against.NullService(publisher, nameof(IMessageBrokerPublisherService)); - var subscriber = host.Services.GetRequiredService(); - Guard.Against.NullService(subscriber, nameof(IMessageBrokerSubscriberService)); - var wmConfig = host.Services.GetRequiredService>(); - Guard.Against.NullService(wmConfig, nameof(IOptions)); - - subscriber.Subscribe(messagingKeys.TaskUpdateRequest, messagingKeys.TaskUpdateRequest, (e) => - { - logger.LogInformation($"{e.Message.MessageDescription} received."); - var updateMessage = e.Message.ConvertToJsonMessage(); - - logger.LogInformation($"Task updated with new status: {updateMessage.Body.Status}"); - subscriber.Acknowledge(e.Message); - }, 1); - - while (taskManager.Status != Contracts.Rest.ServiceStatus.Running) - { - logger.LogInformation($"Waiting for Task Manager to be ready: state={taskManager.Status}..."); - await Task.Delay(100).ConfigureAwait(false); - } - Console.CancelKeyPress += (sender, eventArgs) => - { - eventArgs.Cancel = true; - exitEvent.Set(); - }; - - // await Task.Run(() => - // { - // var message = GenerateDispatchEvent(args[0], wmConfig.Value); - // logger.LogInformation($"Queuing new job with correlation ID={message.CorrelationId}."); - // publisher.Publish(messagingKeys.TaskDispatchRequest, message); - // }).ConfigureAwait(false); - - exitEvent.WaitOne(); - logger.LogInformation("Stopping Task Manager..."); - - await host.StopAsync(CancellationToken.None).ConfigureAwait(false); - } - - private static Message GenerateDispatchEvent(string argBaseUri, WorkflowManagerOptions wmConfig) - { - var correlationId = Guid.NewGuid().ToString(); - var message = new JsonMessage(new TaskDispatchEvent - { - WorkflowInstanceId = Guid.NewGuid().ToString(), - TaskId = Guid.NewGuid().ToString(), - ExecutionId = Guid.NewGuid().ToString(), - CorrelationId = correlationId, - TaskPluginType = PluginStrings.Argo, - }, applicationId: "TaskManagerRunner", correlationId: correlationId, deliveryTag: "1"); - message.Body.TaskPluginArguments.Add(Keys.BaseUrl, argBaseUri); - message.Body.TaskPluginArguments.Add(Keys.WorkflowTemplateName, "list-input-artifacts-template"); - message.Body.TaskPluginArguments.Add(Keys.MessagingEnddpoint, @$"{wmConfig.Messaging.PublisherSettings["endpoint"]}/{wmConfig.Messaging.PublisherSettings["virtualHost"]}"); - message.Body.TaskPluginArguments.Add(Keys.MessagingUsername, wmConfig.Messaging.PublisherSettings["username"]); - message.Body.TaskPluginArguments.Add(Keys.MessagingPassword, wmConfig.Messaging.PublisherSettings["password"]); - message.Body.TaskPluginArguments.Add(Keys.MessagingExchange, wmConfig.Messaging.PublisherSettings["exchange"]); - message.Body.TaskPluginArguments.Add(Keys.MessagingTopic, wmConfig.Messaging.Topics.TaskCallbackRequest); - message.Body.Inputs.Add(new Messaging.Common.Storage - { - Name = "input-dicom", - Endpoint = wmConfig.Storage.Settings["endpoint"], - Bucket = wmConfig.Storage.Settings["bucket"], - SecuredConnection = Convert.ToBoolean(wmConfig.Storage.Settings["securedConnection"], CultureInfo.InvariantCulture), - RelativeRootPath = "/e08b7d7d-f30c-4f31-87d5-8ce5049aa956/dcm" - }); - message.Body.Inputs.Add(new Messaging.Common.Storage - { - Name = "input-ehr", - Endpoint = wmConfig.Storage.Settings["endpoint"], - Bucket = wmConfig.Storage.Settings["bucket"], - SecuredConnection = Convert.ToBoolean(wmConfig.Storage.Settings["securedConnection"], CultureInfo.InvariantCulture), - RelativeRootPath = "/e08b7d7d-f30c-4f31-87d5-8ce5049aa956/ehr" - }); - message.Body.IntermediateStorage = new Messaging.Common.Storage - { - Name = "tempStorage", - Endpoint = wmConfig.Storage.Settings["endpoint"], - Bucket = wmConfig.Storage.Settings["bucket"], - SecuredConnection = Convert.ToBoolean(wmConfig.Storage.Settings["securedConnection"], CultureInfo.InvariantCulture), - RelativeRootPath = "/rabbit" - }; - message.Body.Outputs.Add(new Messaging.Common.Storage - { - Name = "tempStorage", - Endpoint = wmConfig.Storage.Settings["endpoint"], - Bucket = wmConfig.Storage.Settings["bucket"], - SecuredConnection = Convert.ToBoolean(wmConfig.Storage.Settings["securedConnection"], CultureInfo.InvariantCulture), - RelativeRootPath = "/rabbit" - }); - message.Body.PayloadId = "e08b7d7d-f30c-4f31-87d5-8ce5049aa956"; - return message.ToMessage(); - } - - private static void PrintHelp() - { - Console.WriteLine($"Arguments: Argo_endpoint MinIO_endpoint"); - Console.WriteLine($"\te.g.: 'http://argo:2746/'"); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureHostConfiguration(configHost => - { - configHost.SetBasePath(Directory.GetCurrentDirectory()); - configHost.AddCommandLine(args); - }) - .ConfigureAppConfiguration((builderContext, config) => - { - var env = builderContext.HostingEnvironment; - config - .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true) - .AddEnvironmentVariables(); - }) - .ConfigureLogging((builderContext, configureLogging) => - { - configureLogging.AddConfiguration(builderContext.Configuration.GetSection("Logging")); - configureLogging.AddFile(o => o.RootPath = AppContext.BaseDirectory); - }) - .ConfigureServices((hostContext, services) => - { - services.AddOptions().Bind(hostContext.Configuration.GetSection("WorkflowManager")); - services.AddOptions().Bind(hostContext.Configuration.GetSection("WorkflowManager:storage")); - services.AddOptions().Bind(hostContext.Configuration.GetSection("WorkflowManager:messaging")); - services.AddHttpClient(); - - services.AddMonaiDeployStorageService(hostContext.Configuration.GetSection("WorkflowManager:storage:serviceAssemblyName").Value); - services.AddMonaiDeployMessageBrokerPublisherService(hostContext.Configuration.GetSection("WorkflowManager:messaging:publisherServiceAssemblyName").Value); - services.AddMonaiDeployMessageBrokerSubscriberService(hostContext.Configuration.GetSection("WorkflowManager:messaging:subscriberServiceAssemblyName").Value); - - // Mongo DB (Workflow Manager) - services.Configure(hostContext.Configuration.GetSection("WorkloadManagerDatabase")); - services.Configure(hostContext.Configuration.GetSection("WorkloadManagerDatabase")); - services.AddSingleton(s => new MongoClient(hostContext.Configuration["WorkloadManagerDatabase:ConnectionString"])); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddTransient(); - services.AddTransient(); - - services.AddHttpClient("Argo"); - services.AddHttpClient("Argo-Insecure").ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler - { - ClientCertificateOptions = ClientCertificateOption.Manual, - ServerCertificateCustomValidationCallback = - (httpRequestMessage, cert, cetChain, policyErrors) => - { - return true; - } - }); - - services.AddHostedService(p => p.GetRequiredService()); - }); - } -} diff --git a/src/TaskManager/AssemblyInfo.cs b/src/TaskManager/TaskManager/AssemblyInfo.cs similarity index 100% rename from src/TaskManager/AssemblyInfo.cs rename to src/TaskManager/TaskManager/AssemblyInfo.cs diff --git a/src/WorkflowManager/Extentions/TaskManagerExtensions.cs b/src/TaskManager/TaskManager/Extensions/TaskManagerExtensions.cs similarity index 93% rename from src/WorkflowManager/Extentions/TaskManagerExtensions.cs rename to src/TaskManager/TaskManager/Extensions/TaskManagerExtensions.cs index 41389edc9..3d1a4395a 100644 --- a/src/WorkflowManager/Extentions/TaskManagerExtensions.cs +++ b/src/TaskManager/TaskManager/Extensions/TaskManagerExtensions.cs @@ -1,4 +1,4 @@ -/* +/* * Copyright 2022 MONAI Consortium * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +14,6 @@ * limitations under the License. */ -using System.Net.Http; using Ardalis.GuardClauses; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -22,7 +21,7 @@ using Monai.Deploy.WorkflowManager.TaskManager.Argo; using Monai.Deploy.WorkflowManager.TaskManager.Services; -namespace Monai.Deploy.WorkflowManager.Services +namespace Monai.Deploy.WorkflowManager.TaskManager.Extensions { /// /// Sets up task manager service collection. @@ -43,8 +42,8 @@ public static IServiceCollection AddTaskManager(this IServiceCollection services services.AddSingleton(); services.AddTransient(); - services.AddSingleton(); - services.AddHostedService(p => p.GetRequiredService()); + services.AddSingleton(); + services.AddHostedService(p => p.GetRequiredService()); services.AddHttpClient("Argo"); services.AddHttpClient("Argo-Insecure").ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler diff --git a/src/TaskManager/Logging/Log.cs b/src/TaskManager/TaskManager/Logging/Log.cs similarity index 100% rename from src/TaskManager/Logging/Log.cs rename to src/TaskManager/TaskManager/Logging/Log.cs diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj new file mode 100644 index 000000000..bd06c5b56 --- /dev/null +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -0,0 +1,103 @@ + + + + + + Exe + net6.0 + enable + enable + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + Always + + + PreserveNewest + + + + + true + true + ..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + + + + + + + + + + + + + + + + + + diff --git a/src/TaskManager/PluginStrings.cs b/src/TaskManager/TaskManager/PluginStrings.cs similarity index 100% rename from src/TaskManager/PluginStrings.cs rename to src/TaskManager/TaskManager/PluginStrings.cs diff --git a/src/TaskManager/TaskManager/Program.cs b/src/TaskManager/TaskManager/Program.cs new file mode 100644 index 000000000..5c4e0dc06 --- /dev/null +++ b/src/TaskManager/TaskManager/Program.cs @@ -0,0 +1,91 @@ +/* + * 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.IO.Abstractions; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using Monai.Deploy.Messaging; +using Monai.Deploy.Messaging.Configuration; +using Monai.Deploy.Storage; +using Monai.Deploy.Storage.Configuration; +using Monai.Deploy.WorkflowManager.Configuration; +using Monai.Deploy.WorkflowManager.TaskManager.Database; +using Monai.Deploy.WorkflowManager.TaskManager.Database.Options; +using Monai.Deploy.WorkflowManager.TaskManager.Extensions; +using MongoDB.Driver; + +namespace Monai.Deploy.WorkflowManager.TaskManager +{ + internal class Program + { + protected Program() + { } + + private static void Main(string[] args) + { + var host = CreateHostBuilder(args).Build(); + + host.Run(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureHostConfiguration(configHost => + { + configHost.SetBasePath(Directory.GetCurrentDirectory()); + configHost.AddCommandLine(args); + }) + .ConfigureAppConfiguration((builderContext, config) => + { + var env = builderContext.HostingEnvironment; + config + .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) + .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true) + .AddEnvironmentVariables(); + }) + .ConfigureLogging((builderContext, configureLogging) => + { + configureLogging.AddConfiguration(builderContext.Configuration.GetSection("Logging")); + configureLogging.AddFile(o => o.RootPath = AppContext.BaseDirectory); + }) + .ConfigureServices((hostContext, services) => + { + ConfigureServices(hostContext, services); + }); + + private static void ConfigureServices(HostBuilderContext hostContext, IServiceCollection services) + { + services.AddOptions().Bind(hostContext.Configuration.GetSection("WorkflowManager")); + services.AddOptions().Bind(hostContext.Configuration.GetSection("WorkflowManager:storage")); + services.AddOptions().Bind(hostContext.Configuration.GetSection("WorkflowManager:messaging")); + services.AddHttpClient(); + + services.AddMonaiDeployStorageService(hostContext.Configuration.GetSection("WorkflowManager:storage:serviceAssemblyName").Value); + services.AddMonaiDeployMessageBrokerPublisherService(hostContext.Configuration.GetSection("WorkflowManager:messaging:publisherServiceAssemblyName").Value); + services.AddMonaiDeployMessageBrokerSubscriberService(hostContext.Configuration.GetSection("WorkflowManager:messaging:subscriberServiceAssemblyName").Value); + + // Mongo DB (Workflow Manager) + services.Configure(hostContext.Configuration.GetSection("WorkloadManagerDatabase")); + services.AddSingleton(s => new MongoClient(hostContext.Configuration["WorkloadManagerDatabase:ConnectionString"])); + services.AddTransient(); + services.AddTransient(); + + services.AddTaskManager(hostContext); + } + } +} diff --git a/src/TaskManager/Services/TaskDispatchEventService.cs b/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs similarity index 100% rename from src/TaskManager/Services/TaskDispatchEventService.cs rename to src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs diff --git a/src/TaskManager/Strings.cs b/src/TaskManager/TaskManager/Strings.cs similarity index 100% rename from src/TaskManager/Strings.cs rename to src/TaskManager/TaskManager/Strings.cs diff --git a/src/TaskManager/TaskManager.cs b/src/TaskManager/TaskManager/TaskManager.cs similarity index 99% rename from src/TaskManager/TaskManager.cs rename to src/TaskManager/TaskManager/TaskManager.cs index e8f258d25..a1ac94a7a 100644 --- a/src/TaskManager/TaskManager.cs +++ b/src/TaskManager/TaskManager/TaskManager.cs @@ -26,12 +26,10 @@ using Monai.Deploy.Storage.API; using Monai.Deploy.Storage.S3Policy.Policies; using Monai.Deploy.TaskManager.API; -using Monai.Deploy.WorkflowManager.Common; -using Monai.Deploy.WorkflowManager.Common.Services; -using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Rest; using Monai.Deploy.WorkflowManager.TaskManager.API; using Monai.Deploy.WorkflowManager.TaskManager.API.Models; +using Monai.Deploy.WorkflowManager.Configuration; +using Monai.Deploy.WorkflowManager.TaskManager.API.Extensions; using Monai.Deploy.WorkflowManager.TaskManager.Logging; namespace Monai.Deploy.WorkflowManager.TaskManager diff --git a/src/TaskManager/TaskManagerException.cs b/src/TaskManager/TaskManager/TaskManagerException.cs similarity index 100% rename from src/TaskManager/TaskManagerException.cs rename to src/TaskManager/TaskManager/TaskManagerException.cs diff --git a/src/WorkflowManager/appsettings.Development.json b/src/TaskManager/TaskManager/appsettings.Development.json similarity index 96% rename from src/WorkflowManager/appsettings.Development.json rename to src/TaskManager/TaskManager/appsettings.Development.json index 04220c9cf..e3047c5a9 100644 --- a/src/WorkflowManager/appsettings.Development.json +++ b/src/TaskManager/TaskManager/appsettings.Development.json @@ -99,7 +99,7 @@ "MaxFileSize": 10485760, "IncludeScopes": true, "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager", + "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", "Files": [ { "Path": "MWM--.log" diff --git a/src/WorkflowManager/appsettings.Local.json b/src/TaskManager/TaskManager/appsettings.Local.json similarity index 96% rename from src/WorkflowManager/appsettings.Local.json rename to src/TaskManager/TaskManager/appsettings.Local.json index c741142c6..29a4f2dc8 100644 --- a/src/WorkflowManager/appsettings.Local.json +++ b/src/TaskManager/TaskManager/appsettings.Local.json @@ -101,7 +101,7 @@ "MaxFileSize": 10485760, "IncludeScopes": true, "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager", + "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", "Files": [ { "Path": "MWM--.log" diff --git a/src/WorkflowManager/appsettings.json b/src/TaskManager/TaskManager/appsettings.json similarity index 96% rename from src/WorkflowManager/appsettings.json rename to src/TaskManager/TaskManager/appsettings.json index 63ba88bf3..3d1750d01 100644 --- a/src/WorkflowManager/appsettings.json +++ b/src/TaskManager/TaskManager/appsettings.json @@ -104,7 +104,7 @@ "MaxFileSize": 10485760, "IncludeScopes": true, "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager", + "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", "Files": [ { "Path": "MWM--.log" diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json new file mode 100644 index 000000000..9fb2efa4c --- /dev/null +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -0,0 +1,1273 @@ +{ + "version": 1, + "dependencies": { + "net6.0": { + "Karambolo.Extensions.Logging.File": { + "type": "Direct", + "requested": "[3.3.1, )", + "resolved": "3.3.1", + "contentHash": "wkPTc/UEuSAwbO3/Ee+oCdotxncmc/DKwjM533Z0BKvJm94NLOvU2i7pifgMd6uAUJ8jy69OcFZRu7hXKbMW6g==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Physical": "3.0.0", + "Microsoft.Extensions.Logging.Configuration": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "3.0.0", + "System.Threading.Channels": "4.7.1" + } + }, + "Microsoft.Extensions.Hosting": { + "type": "Direct", + "requested": "[6.0.1, )", + "resolved": "6.0.1", + "contentHash": "hbmizc9KPWOacLU8Z8YMaBG6KWdZFppczYV/KwnPGU/8xebWxQxdDeJmLOgg968prb7g2oQgnp6JVLX6lgby8g==", + "dependencies": { + "Microsoft.Extensions.Configuration": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.Configuration.Binder": "6.0.0", + "Microsoft.Extensions.Configuration.CommandLine": "6.0.0", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", + "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", + "Microsoft.Extensions.Configuration.Json": "6.0.0", + "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Physical": "6.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Configuration": "6.0.0", + "Microsoft.Extensions.Logging.Console": "6.0.0", + "Microsoft.Extensions.Logging.Debug": "6.0.0", + "Microsoft.Extensions.Logging.EventLog": "6.0.0", + "Microsoft.Extensions.Logging.EventSource": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Logging": { + "type": "Direct", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.Console": { + "type": "Direct", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "gsqKzOEdsvq28QiXFxagmn1oRB9GeI5GgYCkoybZtQA0IUb7QPwf1WmN3AwJeNIsadTvIFQCiVK0OVIgKfOBGg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Configuration": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Text.Json": "6.0.0" + } + }, + "Microsoft.Extensions.Options": { + "type": "Direct", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Monai.Deploy.Messaging": { + "type": "Direct", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Newtonsoft.Json": "13.0.1", + "RabbitMQ.Client": "6.4.0", + "System.ComponentModel.Annotations": "5.0.0", + "System.IO.Abstractions": "17.0.18" + } + }, + "Monai.Deploy.Messaging.RabbitMQ": { + "type": "Direct", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", + "dependencies": { + "Monai.Deploy.Messaging": "0.1.3-rc0010" + } + }, + "Monai.Deploy.Storage": { + "type": "Direct", + "requested": "[0.2.0-rc0014, )", + "resolved": "0.2.0-rc0014", + "contentHash": "PC+zwr7VZBvU701GefZ297b98gdJaHlJQZ0altXvUGyzh1tLMpRdjdqZ1gMB5QzYwWkdS3u7wp6MOnJdzebkDw==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.165", + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0014", + "System.IO.Abstractions": "17.0.18" + } + }, + "Monai.Deploy.Storage.MinIO": { + "type": "Direct", + "requested": "[0.2.0-rc0014, )", + "resolved": "0.2.0-rc0014", + "contentHash": "p63Y/d85c4gTaD4Idyl0/v5QvJEXMGOUOwvufA3KuqxafTptFkW7dZf3dnHgOtZ2q28g0h+MegqkuDBweQPKug==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.165", + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Minio": "4.0.4", + "Monai.Deploy.Storage": "0.2.0-rc0014", + "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0014" + } + }, + "Ardalis.GuardClauses": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", + "dependencies": { + "JetBrains.Annotations": "2021.3.0" + } + }, + "AutoMapper": { + "type": "Transitive", + "resolved": "10.1.1", + "contentHash": "uMgbqOdu9ZG5cIOty0C85hzzayBH2i9BthnS5FlMqKtMSHDv4ts81a2jS1VFaDBVhlBeIqJ/kQKjQY95BZde9w==", + "dependencies": { + "Microsoft.CSharp": "4.7.0", + "System.Reflection.Emit": "4.7.0" + } + }, + "AWSSDK.Core": { + "type": "Transitive", + "resolved": "3.7.12", + "contentHash": "mIQRvJhLwIB90hxMaRBMOs9FKd8fHZcOKIToYELupCMOPzkwthh0S4y674ExL8n5f+wQ/5m4U26lm1yBkHtqtA==" + }, + "AWSSDK.SecurityToken": { + "type": "Transitive", + "resolved": "3.7.1.165", + "contentHash": "vz0ryVyjs6r9FD2cy9yzujNR5MKesRivfEJJ6tOaSNcw1gw268fq9dXBLD70H/Ppdw++xxMD9HuFwANj7d8mUg==", + "dependencies": { + "AWSSDK.Core": "[3.7.12, 4.0.0)" + } + }, + "Crc32.NET": { + "type": "Transitive", + "resolved": "1.2.0", + "contentHash": "wNW/huzolu8MNKUnwCVKxjfAlCFpeI8AZVfF46iAWJ1+P6bTU1AZct7VAkDDEjgeeTJCVTkGZaD6jSd/fOiUkA==", + "dependencies": { + "NETStandard.Library": "2.0.0" + } + }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + } + }, + "Fractions": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "1uv2IqQ6AsLtrcsibOTEyyHLQpxgjONssPrI0Ug84AIuSVqVDcotaNkTaJTprFvxbCNi7Kp/3WAAtnytuQP3qQ==", + "dependencies": { + "System.Runtime.Numerics": "4.3.0" + } + }, + "IdentityModel": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "nuhkbaDH9l5QzNJp2MtP3qio57MPtiRneUN8Ocr7od0JvSYaIe3gBj/vxllr11S/Qvu1AG4GZXoyv5469ewYDA==" + }, + "IdentityModel.OidcClient": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "4KTG0+M3UBxr0UraGo8MfqEGT9MeMDtaBvPyZccmwW+JH+UG3psW5IVITKgobpgWmK+OKoE2FQQ4XBlaLfyCyw==", + "dependencies": { + "IdentityModel": "5.2.0", + "Microsoft.Extensions.Logging": "6.0.0" + } + }, + "JetBrains.Annotations": { + "type": "Transitive", + "resolved": "2021.3.0", + "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" + }, + "KubernetesClient": { + "type": "Transitive", + "resolved": "7.2.19", + "contentHash": "wycP/ApzjNToo6N0is0cDVK6m282MOXSlJDaZPmMibpdgZf2MKjS289MRUIXz3+Syftu4zsqlinDMGbmi5Xjog==", + "dependencies": { + "IdentityModel.OidcClient": "4.0.0", + "KubernetesClient.Basic": "7.2.19", + "KubernetesClient.Models": "7.2.19", + "System.IO.Abstractions": "13.2.47", + "System.IdentityModel.Tokens.Jwt": "6.13.1", + "prometheus-net": "5.0.1" + } + }, + "KubernetesClient.Basic": { + "type": "Transitive", + "resolved": "7.2.19", + "contentHash": "1LboFwnEg9gxB8gF9BqaS8gnNVetqRGS9XWyVMlzAxpeYaTF5mNCoj4OCZyLj8Ogo0kdrASjG9qOjozpQDWZlg==", + "dependencies": { + "KubernetesClient.Models": "7.2.19" + } + }, + "KubernetesClient.Models": { + "type": "Transitive", + "resolved": "7.2.19", + "contentHash": "ekEK90+eJTKN1KzW7kFcJofSjv3X+Q4MhLxAZdgn7pTCJg0qk4/FhV8sYJ/ZMw20Ue5Rob3vAw9WROHZaLNIdQ==", + "dependencies": { + "AutoMapper": "10.1.1", + "Fractions": "7.0.0", + "System.Text.Json": "6.0.2", + "YamlDotNet": "11.2.1" + } + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "b3ErKzND8LIC7o08QAVlKfaEIYEvLJbtmVbFZVBRXeu9YkKfSSzLZfR1SUfQPBIy9mKLhEtJgGYImkcMNaKE0A==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.CommandLine": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "3nL1qCkZ1Oxx14ZTzgo4MmlO7tso7F+TtMZAY2jUAtTLyAcDp+EDjk3RqafoKiNaePyPvvlleEcBxh3b2Hzl1g==", + "dependencies": { + "Microsoft.Extensions.Configuration": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.EnvironmentVariables": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "pnyXV1LFOsYjGveuC07xp0YHIyGq7jRq5Ncb5zrrIieMLWVwgMyYxcOH0jTnBedDT4Gh1QinSqsjqzcieHk1og==", + "dependencies": { + "Microsoft.Extensions.Configuration": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.FileExtensions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "V4Dth2cYMZpw3HhGw9XUDIijpI6gN+22LDt0AhufIgOppCUfpWX4483OmN+dFXRJkJLc8Tv0Q8QK+1ingT2+KQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Physical": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.Json": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "GJGery6QytCzS/BxJ96klgG9in3uH26KcUBbiVG/coNDXCRq6LGVVlUT4vXq34KPuM+R2av+LeYdX9h4IZOCUg==", + "dependencies": { + "Microsoft.Extensions.Configuration": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", + "System.Text.Json": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.UserSecrets": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "Fy8yr4V6obi7ZxvKYI1i85jqtwMq8tqyxQVZpRSkgeA8enqy/KvBIMdcuNdznlxQMZa72mvbHqb7vbg4Pyx95w==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.Configuration.Json": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Physical": "6.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Physical": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "QvkL7l0nM8udt3gfyu0Vw8bbCXblxaKOl7c2oBfgGy4LCURRaL9XWZX1FWJrQc43oMokVneVxH38iz+bY1sbhg==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.FileSystemGlobbing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" + }, + "Microsoft.Extensions.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Http": { + "type": "Transitive", + "resolved": "3.1.9", + "contentHash": "sRyrkBJGS+8ucKak+RmAPkAiIm6amA5ztpIkp0zrPn5+kDX2j8XJdRARr4Eh003RIGQxzvNGQ+j/voAhlPoXyw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9", + "Microsoft.Extensions.Logging": "3.1.9", + "Microsoft.Extensions.Options": "3.1.9" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + }, + "Microsoft.Extensions.Logging.Configuration": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "ZDskjagmBAbv+K8rYW9VhjPplhbOE63xUD0DiuydZJwt15dRyoqicYklLd86zzeintUc7AptDkHn+YhhYkYo8A==", + "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.Logging.Debug": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "M9g/JixseSZATJE9tcMn9uzoD4+DbSglivFqVx8YkRJ7VVPmnvCEbOZ0AAaxsL1EKyI4cz07DXOOJExxNsUOHw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.EventLog": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "rlo0RxlMd0WtLG3CHI0qOTp6fFn7MvQjlrCjucA31RqmiMFCZkF8CHNbe8O7tbBIyyoLGWB1he9CbaA5iyHthg==", + "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", + "System.Diagnostics.EventLog": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.EventSource": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "BeDyyqt7nkm/nr+Gdk+L8n1tUT/u33VkbXAOesgYSNsxDM9hJ1NOBGoZfj9rCbeD2+9myElI6JOVVFmnzgeWQA==", + "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.Primitives": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "6.0.0" + } + }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "bXWINbTn0vC0FYc9GaQTISbxhQLAMrvtbuvD9N6JelEaIS/Pr62wUCinrq5bf1WRBGczt1v4wDhxFtVFNcMdUQ==", + "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.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.13.1", + "contentHash": "seLGCIo8bDz93PGgKY9vV4PAHpu1iXwH4Xm6O+HOJbIcnpiJz4f4C/MVFKfOb+yKGMtix2qyFkQMKOdVmArn0Q==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.13.1" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.13.1", + "contentHash": "pUr0kicIy3cNgrapB7old+N+OithDcowO/uqOg/z9dMC8u25/1YS7QirJWKi/0z31fBOE/uEFBHfSfnRCKRxsA==" + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.13.1", + "contentHash": "tUTbP9/wMuOGDiTBPXEN24M9rVAEJ8EOvk4pwoo5UKRNUK3bAZYqkzFpcgNOAY3PHHjwZJ2stk4Gf5jvspz0yg==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "Microsoft.IdentityModel.Logging": "6.13.1", + "System.Security.Cryptography.Cng": "4.5.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.3", + "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "Minio": { + "type": "Transitive", + "resolved": "4.0.4", + "contentHash": "nd8cZhmS8DxUQ9WRY1bxeerdYm6TiJxMOSEpyRVUgeg+O9Kig+e5soBswkKMBECND3Iew3Wt4gcfFtSrK/SgMw==", + "dependencies": { + "Crc32.NET": "1.2.0", + "Microsoft.CSharp": "4.7.0", + "Newtonsoft.Json": "13.0.1", + "System.Net.Http": "4.3.4", + "System.Net.Primitives": "4.3.1", + "System.Reactive.Linq": "5.0.0", + "System.ValueTuple": "4.4.0" + } + }, + "Monai.Deploy.Storage.S3Policy": { + "type": "Transitive", + "resolved": "0.2.0-rc0014", + "contentHash": "ClEa022hoQhw/74rUfO+p5OrZ0suk8Ehj3jT7HcfAhjSQiMOTrYVfnCxeW2QxyJa/TeIrmQjd1H2f50hZ8RPXQ==", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Newtonsoft.Json": "13.0.1" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "2.17.0", + "contentHash": "wGUX8GMQ0DYG68u1ENAUtJTx6cmQTt6/BfMjqB+Q+aWu2ZkBZ09mA1QbBU5mcbVqulF5U72bGzxChtjYxaS9Dg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "MongoDB.Driver": { + "type": "Transitive", + "resolved": "2.17.0", + "contentHash": "NFqjuDNrGNGEsblqoKBoOSUU8vx1UbZjKP3nVhxhGnK9p8ef0t3fyPcjxmYbO5vdFpDQw2A0Ly4dPzyRW3QEug==", + "dependencies": { + "MongoDB.Bson": "2.17.0", + "MongoDB.Driver.Core": "2.17.0", + "MongoDB.Libmongocrypt": "1.5.4" + } + }, + "MongoDB.Driver.Core": { + "type": "Transitive", + "resolved": "2.17.0", + "contentHash": "bQLdFZNywlApJ5H5KnFXxGik3dZ/VOIUQ7YQniZd9eNmNZFEwEMr+/yoCJ8FigyzOd7iKYOLpmUWGwG2M2e2aQ==", + "dependencies": { + "DnsClient": "1.6.1", + "MongoDB.Bson": "2.17.0", + "MongoDB.Libmongocrypt": "1.5.4", + "SharpCompress": "0.30.1", + "System.Buffers": "4.5.1" + } + }, + "MongoDB.Libmongocrypt": { + "type": "Transitive", + "resolved": "1.5.4", + "contentHash": "JQrfonPIGey2n38tYmhkYOjmoHeGCwvbEru/G7zciYcx198neZerSPylIt6kTGtpGQDMhjCg0Nvt9eCBm6TWZQ==" + }, + "NETStandard.Library": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "prometheus-net": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "tg+vGeKCUqaWPzHAuKI87/rqQD4RKjb/jlRqSPaAdGRFd/SFDFRHPE8Rcy5Rx2f4xqdR+s3qTQ/0Y/IHbI3D1Q==", + "dependencies": { + "Microsoft.Extensions.Http": "3.1.9" + } + }, + "RabbitMQ.Client": { + "type": "Transitive", + "resolved": "6.4.0", + "contentHash": "1znR1gGU+xYVSpO5z8nQolcUKA/yydnxQn7Ug9+RUXxTSLMm/eE58VKGwahPBjELXvDnX0k/kBrAitFLRjx9LA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Threading.Channels": "4.7.1" + } + }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" + }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw==" + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.13.1", + "contentHash": "BTVPnmvqpKxv+ucl3Ii7HnRVvXvfm/P5iq3rnTnJ0YuneZUS7zGtE+DRrVQWSd431ntjZuHBGPbjaB+nCSq9Uw==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.13.1", + "Microsoft.IdentityModel.Tokens": "6.13.1" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.Abstractions": { + "type": "Transitive", + "resolved": "17.0.24", + "contentHash": "hA7bacntMiZv1Yf9xtjwl/GP3GT1mG84QxhAk7ijAUD0pJhJaVVwXScE13vMpXnNtlaRDW6SeyZdWg2j2qrh4w==" + }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Linq": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.DiagnosticSource": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.Net.Primitives": "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.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "System.Net.Primitives": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "OHzPhSme78BbmLe9UBxHM69ZYjClS5URuhce6Ta4ikiLgaUGiG/X84fZpI6zy7CsUH5R9cYzI2tv9dWPqdTkUg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3", + "System.Runtime": "4.3.1", + "System.Runtime.Handles": "4.3.0" + } + }, + "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" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ==" + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.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.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + }, + "System.Security.Cryptography.Csp": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "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.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "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.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.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.Runtime.Numerics": "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", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "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.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "0nE2gwXLn3PTBOPwORLqwuYvWB+Beomt9ZBX+6LmogMNKUvfD1SoDb/ycB1vBntT94rGaB/SvxEyeLu14H6aEg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" + }, + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ==" + }, + "YamlDotNet": { + "type": "Transitive", + "resolved": "11.2.1", + "contentHash": "tBt8K+korVfrjH9wyDEhiLKxbs8qoLCLIFwvYgkSUuMC9//w3z0cFQ8LQAI/5MCKq+BMil0cfRTRvPeE7eXhQw==" + }, + "monai.deploy.workflowmanager.configuration": { + "type": "Project", + "dependencies": { + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Storage": "0.2.0-rc0014", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.0.24" + } + }, + "monai.deploy.workflowmanager.taskmanager.api": { + "type": "Project", + "dependencies": { + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Storage": "0.2.0-rc0014", + "MongoDB.Bson": "2.17.0" + } + }, + "monai.deploy.workflowmanager.taskmanager.argo": { + "type": "Project", + "dependencies": { + "IdentityModel.OidcClient": "5.0.0", + "KubernetesClient": "7.2.19", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Storage": "0.2.0-rc0014", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", + "Newtonsoft.Json": "13.0.1" + } + }, + "monai.deploy.workflowmanager.taskmanager.database": { + "type": "Project", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", + "MongoDB.Bson": "2.17.0", + "MongoDB.Driver": "2.17.0" + } + } + } + } +} \ No newline at end of file diff --git a/src/TaskManager/packages.lock.json b/src/TaskManager/packages.lock.json index 12a326ce1..f8f9922b4 100644 --- a/src/TaskManager/packages.lock.json +++ b/src/TaskManager/packages.lock.json @@ -2,6 +2,18 @@ "version": 1, "dependencies": { "net6.0": { + "Karambolo.Extensions.Logging.File": { + "type": "Direct", + "requested": "[3.3.1, )", + "resolved": "3.3.1", + "contentHash": "wkPTc/UEuSAwbO3/Ee+oCdotxncmc/DKwjM533Z0BKvJm94NLOvU2i7pifgMd6uAUJ8jy69OcFZRu7hXKbMW6g==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Physical": "3.0.0", + "Microsoft.Extensions.Logging.Configuration": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "3.0.0", + "System.Threading.Channels": "4.7.1" + } + }, "Microsoft.Extensions.Hosting": { "type": "Direct", "requested": "[6.0.1, )", @@ -31,22 +43,32 @@ "Microsoft.Extensions.Options": "6.0.0" } }, - "Microsoft.Extensions.Hosting.Abstractions": { + "Microsoft.Extensions.Logging": { "type": "Direct", "requested": "[6.0.0, )", "resolved": "6.0.0", - "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection": "6.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0" } }, - "Microsoft.Extensions.Logging.Abstractions": { + "Microsoft.Extensions.Logging.Console": { "type": "Direct", - "requested": "[6.0.1, )", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "gsqKzOEdsvq28QiXFxagmn1oRB9GeI5GgYCkoybZtQA0IUb7QPwf1WmN3AwJeNIsadTvIFQCiVK0OVIgKfOBGg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Configuration": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Text.Json": "6.0.0" + } }, "Microsoft.Extensions.Options": { "type": "Direct", @@ -73,6 +95,15 @@ "System.IO.Abstractions": "17.0.18" } }, + "Monai.Deploy.Messaging.RabbitMQ": { + "type": "Direct", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", + "dependencies": { + "Monai.Deploy.Messaging": "0.1.3-rc0010" + } + }, "Monai.Deploy.Storage": { "type": "Direct", "requested": "[0.2.0-rc0014, )", @@ -87,6 +118,21 @@ "System.IO.Abstractions": "17.0.18" } }, + "Monai.Deploy.Storage.MinIO": { + "type": "Direct", + "requested": "[0.2.0-rc0014, )", + "resolved": "0.2.0-rc0014", + "contentHash": "p63Y/d85c4gTaD4Idyl0/v5QvJEXMGOUOwvufA3KuqxafTptFkW7dZf3dnHgOtZ2q28g0h+MegqkuDBweQPKug==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.165", + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Minio": "4.0.4", + "Monai.Deploy.Storage": "0.2.0-rc0014", + "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0014" + } + }, "Ardalis.GuardClauses": { "type": "Transitive", "resolved": "4.0.1", @@ -95,17 +141,34 @@ "JetBrains.Annotations": "2021.3.0" } }, + "AutoMapper": { + "type": "Transitive", + "resolved": "10.1.1", + "contentHash": "uMgbqOdu9ZG5cIOty0C85hzzayBH2i9BthnS5FlMqKtMSHDv4ts81a2jS1VFaDBVhlBeIqJ/kQKjQY95BZde9w==", + "dependencies": { + "Microsoft.CSharp": "4.7.0", + "System.Reflection.Emit": "4.7.0" + } + }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.11", - "contentHash": "Tb6llf5tUU8FiptuB6Xq8vaJpxXDRcWL39nkEiHkDhdctj9l2kPL0DydrCNCAVwLWWTlPXyLUD8i37Rm0mRjaw==" + "resolved": "3.7.12", + "contentHash": "mIQRvJhLwIB90hxMaRBMOs9FKd8fHZcOKIToYELupCMOPzkwthh0S4y674ExL8n5f+wQ/5m4U26lm1yBkHtqtA==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.176", - "contentHash": "VrUC7q6XTUUNVFlMxPKXKNRdXcZm+I7qOj3EFGOmNXVwmIGM4IsV1V5sCCb2KWZ9Thv/RlR3dA+YxjFP3a/3vw==", + "resolved": "3.7.1.165", + "contentHash": "vz0ryVyjs6r9FD2cy9yzujNR5MKesRivfEJJ6tOaSNcw1gw268fq9dXBLD70H/Ppdw++xxMD9HuFwANj7d8mUg==", + "dependencies": { + "AWSSDK.Core": "[3.7.12, 4.0.0)" + } + }, + "Crc32.NET": { + "type": "Transitive", + "resolved": "1.2.0", + "contentHash": "wNW/huzolu8MNKUnwCVKxjfAlCFpeI8AZVfF46iAWJ1+P6bTU1AZct7VAkDDEjgeeTJCVTkGZaD6jSd/fOiUkA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.11, 4.0.0)" + "NETStandard.Library": "2.0.0" } }, "DnsClient": { @@ -116,11 +179,70 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Fractions": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "1uv2IqQ6AsLtrcsibOTEyyHLQpxgjONssPrI0Ug84AIuSVqVDcotaNkTaJTprFvxbCNi7Kp/3WAAtnytuQP3qQ==", + "dependencies": { + "System.Runtime.Numerics": "4.3.0" + } + }, + "IdentityModel": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "nuhkbaDH9l5QzNJp2MtP3qio57MPtiRneUN8Ocr7od0JvSYaIe3gBj/vxllr11S/Qvu1AG4GZXoyv5469ewYDA==" + }, + "IdentityModel.OidcClient": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "4KTG0+M3UBxr0UraGo8MfqEGT9MeMDtaBvPyZccmwW+JH+UG3psW5IVITKgobpgWmK+OKoE2FQQ4XBlaLfyCyw==", + "dependencies": { + "IdentityModel": "5.2.0", + "Microsoft.Extensions.Logging": "6.0.0" + } + }, "JetBrains.Annotations": { "type": "Transitive", "resolved": "2021.3.0", "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" }, + "KubernetesClient": { + "type": "Transitive", + "resolved": "7.2.19", + "contentHash": "wycP/ApzjNToo6N0is0cDVK6m282MOXSlJDaZPmMibpdgZf2MKjS289MRUIXz3+Syftu4zsqlinDMGbmi5Xjog==", + "dependencies": { + "IdentityModel.OidcClient": "4.0.0", + "KubernetesClient.Basic": "7.2.19", + "KubernetesClient.Models": "7.2.19", + "System.IO.Abstractions": "13.2.47", + "System.IdentityModel.Tokens.Jwt": "6.13.1", + "prometheus-net": "5.0.1" + } + }, + "KubernetesClient.Basic": { + "type": "Transitive", + "resolved": "7.2.19", + "contentHash": "1LboFwnEg9gxB8gF9BqaS8gnNVetqRGS9XWyVMlzAxpeYaTF5mNCoj4OCZyLj8Ogo0kdrASjG9qOjozpQDWZlg==", + "dependencies": { + "KubernetesClient.Models": "7.2.19" + } + }, + "KubernetesClient.Models": { + "type": "Transitive", + "resolved": "7.2.19", + "contentHash": "ekEK90+eJTKN1KzW7kFcJofSjv3X+Q4MhLxAZdgn7pTCJg0qk4/FhV8sYJ/ZMw20Ue5Rob3vAw9WROHZaLNIdQ==", + "dependencies": { + "AutoMapper": "10.1.1", + "Fractions": "7.0.0", + "System.Text.Json": "6.0.2", + "YamlDotNet": "11.2.1" + } + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, "Microsoft.Extensions.Configuration": { "type": "Transitive", "resolved": "6.0.1", @@ -236,18 +358,31 @@ "resolved": "6.0.0", "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" }, - "Microsoft.Extensions.Logging": { + "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "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.FileProviders.Abstractions": "6.0.0" } }, + "Microsoft.Extensions.Http": { + "type": "Transitive", + "resolved": "3.1.9", + "contentHash": "sRyrkBJGS+8ucKak+RmAPkAiIm6amA5ztpIkp0zrPn5+kDX2j8XJdRARr4Eh003RIGQxzvNGQ+j/voAhlPoXyw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9", + "Microsoft.Extensions.Logging": "3.1.9", + "Microsoft.Extensions.Options": "3.1.9" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", "resolved": "6.0.0", @@ -263,19 +398,6 @@ "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0" } }, - "Microsoft.Extensions.Logging.Console": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gsqKzOEdsvq28QiXFxagmn1oRB9GeI5GgYCkoybZtQA0IUb7QPwf1WmN3AwJeNIsadTvIFQCiVK0OVIgKfOBGg==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Configuration": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Text.Json": "6.0.0" - } - }, "Microsoft.Extensions.Logging.Debug": { "type": "Transitive", "resolved": "6.0.0", @@ -332,11 +454,39 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.13.1", + "contentHash": "seLGCIo8bDz93PGgKY9vV4PAHpu1iXwH4Xm6O+HOJbIcnpiJz4f4C/MVFKfOb+yKGMtix2qyFkQMKOdVmArn0Q==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.13.1" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.13.1", + "contentHash": "pUr0kicIy3cNgrapB7old+N+OithDcowO/uqOg/z9dMC8u25/1YS7QirJWKi/0z31fBOE/uEFBHfSfnRCKRxsA==" + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.13.1", + "contentHash": "tUTbP9/wMuOGDiTBPXEN24M9rVAEJ8EOvk4pwoo5UKRNUK3bAZYqkzFpcgNOAY3PHHjwZJ2stk4Gf5jvspz0yg==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "Microsoft.IdentityModel.Logging": "6.13.1", + "System.Security.Cryptography.Cng": "4.5.0" + } + }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.3", + "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -346,6 +496,20 @@ "System.Security.Principal.Windows": "5.0.0" } }, + "Minio": { + "type": "Transitive", + "resolved": "4.0.4", + "contentHash": "nd8cZhmS8DxUQ9WRY1bxeerdYm6TiJxMOSEpyRVUgeg+O9Kig+e5soBswkKMBECND3Iew3Wt4gcfFtSrK/SgMw==", + "dependencies": { + "Crc32.NET": "1.2.0", + "Microsoft.CSharp": "4.7.0", + "Newtonsoft.Json": "13.0.1", + "System.Net.Http": "4.3.4", + "System.Net.Primitives": "4.3.1", + "System.Reactive.Linq": "5.0.0", + "System.ValueTuple": "4.4.0" + } + }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", "resolved": "0.2.0-rc0014", @@ -390,11 +554,27 @@ "resolved": "1.5.4", "contentHash": "JQrfonPIGey2n38tYmhkYOjmoHeGCwvbEru/G7zciYcx198neZerSPylIt6kTGtpGQDMhjCg0Nvt9eCBm6TWZQ==" }, + "NETStandard.Library": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, "Newtonsoft.Json": { "type": "Transitive", "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, + "prometheus-net": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "tg+vGeKCUqaWPzHAuKI87/rqQD4RKjb/jlRqSPaAdGRFd/SFDFRHPE8Rcy5Rx2f4xqdR+s3qTQ/0Y/IHbI3D1Q==", + "dependencies": { + "Microsoft.Extensions.Http": "3.1.9" + } + }, "RabbitMQ.Client": { "type": "Transitive", "resolved": "6.4.0", @@ -404,6 +584,104 @@ "System.Threading.Channels": "4.7.1" } }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" + }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", @@ -414,11 +692,48 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, "System.ComponentModel.Annotations": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", "resolved": "6.0.0", @@ -432,21 +747,271 @@ "resolved": "6.0.0", "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw==" }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.13.1", + "contentHash": "BTVPnmvqpKxv+ucl3Ii7HnRVvXvfm/P5iq3rnTnJ0YuneZUS7zGtE+DRrVQWSd431ntjZuHBGPbjaB+nCSq9Uw==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.13.1", + "Microsoft.IdentityModel.Tokens": "6.13.1" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, "System.IO.Abstractions": { "type": "Transitive", "resolved": "17.0.24", "contentHash": "hA7bacntMiZv1Yf9xtjwl/GP3GT1mG84QxhAk7ijAUD0pJhJaVVwXScE13vMpXnNtlaRDW6SeyZdWg2j2qrh4w==" }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Linq": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, "System.Memory": { "type": "Transitive", "resolved": "4.5.4", "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.DiagnosticSource": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.Net.Primitives": "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.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "System.Net.Primitives": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "OHzPhSme78BbmLe9UBxHM69ZYjClS5URuhce6Ta4ikiLgaUGiG/X84fZpI6zy7CsUH5R9cYzI2tv9dWPqdTkUg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3", + "System.Runtime": "4.3.1", + "System.Runtime.Handles": "4.3.0" + } + }, + "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" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ==" + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3" + } + }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, "System.Security.AccessControl": { "type": "Transitive", "resolved": "5.0.0", @@ -456,11 +1021,152 @@ "System.Security.Principal.Windows": "5.0.0" } }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.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.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + }, + "System.Security.Cryptography.Csp": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "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.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "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.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.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.Runtime.Numerics": "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", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "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.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "6.0.0", @@ -471,28 +1177,52 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==", + "resolved": "6.0.2", + "contentHash": "0nE2gwXLn3PTBOPwORLqwuYvWB+Beomt9ZBX+6LmogMNKUvfD1SoDb/ycB1vBntT94rGaB/SvxEyeLu14H6aEg==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" } }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, "System.Threading.Channels": { "type": "Transitive", "resolved": "4.7.1", "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" }, - "monai.deploy.workflowmanager.common": { - "type": "Project", + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" } }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ==" + }, + "YamlDotNet": { + "type": "Transitive", + "resolved": "11.2.1", + "contentHash": "tBt8K+korVfrjH9wyDEhiLKxbs8qoLCLIFwvYgkSUuMC9//w3z0cFQ8LQAI/5MCKq+BMil0cfRTRvPeE7eXhQw==" + }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { @@ -504,51 +1234,24 @@ "System.IO.Abstractions": "17.0.24" } }, - "monai.deploy.workflowmanager.contracts": { - "type": "Project", - "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.176", - "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0010", - "MongoDB.Bson": "2.17.0", - "Newtonsoft.Json": "13.0.1" - } - }, - "monai.deploy.workflowmanager.database": { + "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "MongoDB.Bson": "2.17.0", - "MongoDB.Driver": "2.17.0" - } - }, - "monai.deploy.workflowmanager.logging": { - "type": "Project", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" - } - }, - "monai.deploy.workflowmanager.storage": { - "type": "Project", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", "Monai.Deploy.Storage": "0.2.0-rc0014", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0" + "MongoDB.Bson": "2.17.0" } }, - "monai.deploy.workflowmanager.taskmanager.api": { + "monai.deploy.workflowmanager.taskmanager.argo": { "type": "Project", "dependencies": { + "IdentityModel.OidcClient": "5.0.0", + "KubernetesClient": "7.2.19", "Monai.Deploy.Messaging": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.2.0-rc0014", - "MongoDB.Bson": "2.17.0" + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", + "Newtonsoft.Json": "13.0.1" } }, "monai.deploy.workflowmanager.taskmanager.database": { @@ -558,7 +1261,6 @@ "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", "MongoDB.Bson": "2.17.0", "MongoDB.Driver": "2.17.0" diff --git a/src/Common/Extensions/ArrayExtensions.cs b/src/WorkflowManager/Common/Extensions/ArrayExtensions.cs similarity index 100% rename from src/Common/Extensions/ArrayExtensions.cs rename to src/WorkflowManager/Common/Extensions/ArrayExtensions.cs diff --git a/src/Common/Extensions/StorageListExtensions.cs b/src/WorkflowManager/Common/Extensions/StorageListExtensions.cs similarity index 100% rename from src/Common/Extensions/StorageListExtensions.cs rename to src/WorkflowManager/Common/Extensions/StorageListExtensions.cs diff --git a/src/Common/Interfaces/IPaginatedApi.cs b/src/WorkflowManager/Common/Interfaces/IPaginatedApi.cs similarity index 100% rename from src/Common/Interfaces/IPaginatedApi.cs rename to src/WorkflowManager/Common/Interfaces/IPaginatedApi.cs diff --git a/src/Common/Interfaces/IPayloadService.cs b/src/WorkflowManager/Common/Interfaces/IPayloadService.cs similarity index 100% rename from src/Common/Interfaces/IPayloadService.cs rename to src/WorkflowManager/Common/Interfaces/IPayloadService.cs diff --git a/src/Common/Interfaces/ITasksService.cs b/src/WorkflowManager/Common/Interfaces/ITasksService.cs similarity index 100% rename from src/Common/Interfaces/ITasksService.cs rename to src/WorkflowManager/Common/Interfaces/ITasksService.cs diff --git a/src/Common/Interfaces/IWorkflowInstanceService.cs b/src/WorkflowManager/Common/Interfaces/IWorkflowInstanceService.cs similarity index 100% rename from src/Common/Interfaces/IWorkflowInstanceService.cs rename to src/WorkflowManager/Common/Interfaces/IWorkflowInstanceService.cs diff --git a/src/Common/Interfaces/IWorkflowService.cs b/src/WorkflowManager/Common/Interfaces/IWorkflowService.cs similarity index 100% rename from src/Common/Interfaces/IWorkflowService.cs rename to src/WorkflowManager/Common/Interfaces/IWorkflowService.cs diff --git a/src/Common/Monai.Deploy.WorkflowManager.Common.csproj b/src/WorkflowManager/Common/Monai.Deploy.WorkflowManager.Common.csproj similarity index 74% rename from src/Common/Monai.Deploy.WorkflowManager.Common.csproj rename to src/WorkflowManager/Common/Monai.Deploy.WorkflowManager.Common.csproj index 8aee8a91d..fc6037102 100644 --- a/src/Common/Monai.Deploy.WorkflowManager.Common.csproj +++ b/src/WorkflowManager/Common/Monai.Deploy.WorkflowManager.Common.csproj @@ -20,12 +20,12 @@ net6.0 enable enable - ..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - + + @@ -36,7 +36,7 @@ - + diff --git a/src/Common/Services/IMonaiService.cs b/src/WorkflowManager/Common/Services/IMonaiService.cs similarity index 100% rename from src/Common/Services/IMonaiService.cs rename to src/WorkflowManager/Common/Services/IMonaiService.cs diff --git a/src/Common/Services/PayloadService.cs b/src/WorkflowManager/Common/Services/PayloadService.cs similarity index 100% rename from src/Common/Services/PayloadService.cs rename to src/WorkflowManager/Common/Services/PayloadService.cs diff --git a/src/Common/Services/TasksService.cs b/src/WorkflowManager/Common/Services/TasksService.cs similarity index 100% rename from src/Common/Services/TasksService.cs rename to src/WorkflowManager/Common/Services/TasksService.cs diff --git a/src/Common/Services/WorkflowInstanceService.cs b/src/WorkflowManager/Common/Services/WorkflowInstanceService.cs similarity index 100% rename from src/Common/Services/WorkflowInstanceService.cs rename to src/WorkflowManager/Common/Services/WorkflowInstanceService.cs diff --git a/src/Common/Services/WorkflowService.cs b/src/WorkflowManager/Common/Services/WorkflowService.cs similarity index 100% rename from src/Common/Services/WorkflowService.cs rename to src/WorkflowManager/Common/Services/WorkflowService.cs diff --git a/src/ConditionsResolver/Constants/ParameterConstants.cs b/src/WorkflowManager/ConditionsResolver/Constants/ParameterConstants.cs similarity index 100% rename from src/ConditionsResolver/Constants/ParameterConstants.cs rename to src/WorkflowManager/ConditionsResolver/Constants/ParameterConstants.cs diff --git a/src/ConditionsResolver/Extensions/RegexExtensions.cs b/src/WorkflowManager/ConditionsResolver/Extensions/RegexExtensions.cs similarity index 100% rename from src/ConditionsResolver/Extensions/RegexExtensions.cs rename to src/WorkflowManager/ConditionsResolver/Extensions/RegexExtensions.cs diff --git a/src/ConditionsResolver/Extensions/StringExtensions.cs b/src/WorkflowManager/ConditionsResolver/Extensions/StringExtensions.cs similarity index 100% rename from src/ConditionsResolver/Extensions/StringExtensions.cs rename to src/WorkflowManager/ConditionsResolver/Extensions/StringExtensions.cs diff --git a/src/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj b/src/WorkflowManager/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj similarity index 74% rename from src/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj rename to src/WorkflowManager/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj index 2ee31ef1b..38b88b5d4 100644 --- a/src/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj +++ b/src/WorkflowManager/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj @@ -20,12 +20,12 @@ net6.0 enable enable - ..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - + + @@ -36,7 +36,7 @@ - + diff --git a/src/ConditionsResolver/Parser/ConditionalParameterParser.cs b/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs similarity index 100% rename from src/ConditionsResolver/Parser/ConditionalParameterParser.cs rename to src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs diff --git a/src/ConditionsResolver/Parser/IConditionalParameterParser.cs b/src/WorkflowManager/ConditionsResolver/Parser/IConditionalParameterParser.cs similarity index 100% rename from src/ConditionsResolver/Parser/IConditionalParameterParser.cs rename to src/WorkflowManager/ConditionsResolver/Parser/IConditionalParameterParser.cs diff --git a/src/ConditionsResolver/Resovler/Conditional.cs b/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs similarity index 100% rename from src/ConditionsResolver/Resovler/Conditional.cs rename to src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs diff --git a/src/ConditionsResolver/Resovler/ConditionalGroup.cs b/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs similarity index 100% rename from src/ConditionsResolver/Resovler/ConditionalGroup.cs rename to src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs diff --git a/src/ConditionsResolver/Resovler/Keyword.cs b/src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs similarity index 100% rename from src/ConditionsResolver/Resovler/Keyword.cs rename to src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs diff --git a/src/Contracts/Constants/TaskTypeConstants.cs b/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs similarity index 100% rename from src/Contracts/Constants/TaskTypeConstants.cs rename to src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs diff --git a/src/Contracts/Models/Artifact.cs b/src/WorkflowManager/Contracts/Models/Artifact.cs similarity index 100% rename from src/Contracts/Models/Artifact.cs rename to src/WorkflowManager/Contracts/Models/Artifact.cs diff --git a/src/Contracts/Models/ArtifactMap.cs b/src/WorkflowManager/Contracts/Models/ArtifactMap.cs similarity index 100% rename from src/Contracts/Models/ArtifactMap.cs rename to src/WorkflowManager/Contracts/Models/ArtifactMap.cs diff --git a/src/Contracts/Models/DicomValue.cs b/src/WorkflowManager/Contracts/Models/DicomValue.cs similarity index 100% rename from src/Contracts/Models/DicomValue.cs rename to src/WorkflowManager/Contracts/Models/DicomValue.cs diff --git a/src/Contracts/Models/ExportDestination.cs b/src/WorkflowManager/Contracts/Models/ExportDestination.cs similarity index 100% rename from src/Contracts/Models/ExportDestination.cs rename to src/WorkflowManager/Contracts/Models/ExportDestination.cs diff --git a/src/Contracts/Models/ISoftDeleteable.cs b/src/WorkflowManager/Contracts/Models/ISoftDeleteable.cs similarity index 100% rename from src/Contracts/Models/ISoftDeleteable.cs rename to src/WorkflowManager/Contracts/Models/ISoftDeleteable.cs diff --git a/src/Contracts/Models/InformaticsGateway.cs b/src/WorkflowManager/Contracts/Models/InformaticsGateway.cs similarity index 100% rename from src/Contracts/Models/InformaticsGateway.cs rename to src/WorkflowManager/Contracts/Models/InformaticsGateway.cs diff --git a/src/Contracts/Models/PatientDetails.cs b/src/WorkflowManager/Contracts/Models/PatientDetails.cs similarity index 100% rename from src/Contracts/Models/PatientDetails.cs rename to src/WorkflowManager/Contracts/Models/PatientDetails.cs diff --git a/src/Contracts/Models/Payload.cs b/src/WorkflowManager/Contracts/Models/Payload.cs similarity index 100% rename from src/Contracts/Models/Payload.cs rename to src/WorkflowManager/Contracts/Models/Payload.cs diff --git a/src/Contracts/Models/Status.cs b/src/WorkflowManager/Contracts/Models/Status.cs similarity index 100% rename from src/Contracts/Models/Status.cs rename to src/WorkflowManager/Contracts/Models/Status.cs diff --git a/src/Contracts/Models/TaskDestination.cs b/src/WorkflowManager/Contracts/Models/TaskDestination.cs similarity index 100% rename from src/Contracts/Models/TaskDestination.cs rename to src/WorkflowManager/Contracts/Models/TaskDestination.cs diff --git a/src/Contracts/Models/TaskExecution.cs b/src/WorkflowManager/Contracts/Models/TaskExecution.cs similarity index 100% rename from src/Contracts/Models/TaskExecution.cs rename to src/WorkflowManager/Contracts/Models/TaskExecution.cs diff --git a/src/Contracts/Models/TaskObject.cs b/src/WorkflowManager/Contracts/Models/TaskObject.cs similarity index 100% rename from src/Contracts/Models/TaskObject.cs rename to src/WorkflowManager/Contracts/Models/TaskObject.cs diff --git a/src/Contracts/Models/Workflow.cs b/src/WorkflowManager/Contracts/Models/Workflow.cs similarity index 100% rename from src/Contracts/Models/Workflow.cs rename to src/WorkflowManager/Contracts/Models/Workflow.cs diff --git a/src/Contracts/Models/WorkflowInstance.cs b/src/WorkflowManager/Contracts/Models/WorkflowInstance.cs similarity index 100% rename from src/Contracts/Models/WorkflowInstance.cs rename to src/WorkflowManager/Contracts/Models/WorkflowInstance.cs diff --git a/src/Contracts/Models/WorkflowInstanceTasksUnwindResult.cs b/src/WorkflowManager/Contracts/Models/WorkflowInstanceTasksUnwindResult.cs similarity index 100% rename from src/Contracts/Models/WorkflowInstanceTasksUnwindResult.cs rename to src/WorkflowManager/Contracts/Models/WorkflowInstanceTasksUnwindResult.cs diff --git a/src/Contracts/Models/WorkflowRevision.cs b/src/WorkflowManager/Contracts/Models/WorkflowRevision.cs similarity index 100% rename from src/Contracts/Models/WorkflowRevision.cs rename to src/WorkflowManager/Contracts/Models/WorkflowRevision.cs diff --git a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj similarity index 80% rename from src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj rename to src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index 39c64ebff..ddb6ff20a 100644 --- a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -19,13 +19,13 @@ net6.0 Monai.Deploy.WorkflowManager.Contracts - ..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset enable - - + + diff --git a/src/Contracts/Responses/CreateWorkflowResponse.cs b/src/WorkflowManager/Contracts/Responses/CreateWorkflowResponse.cs similarity index 100% rename from src/Contracts/Responses/CreateWorkflowResponse.cs rename to src/WorkflowManager/Contracts/Responses/CreateWorkflowResponse.cs diff --git a/src/Contracts/Rest/ServiceStatus.cs b/src/WorkflowManager/Contracts/Rest/ServiceStatus.cs similarity index 100% rename from src/Contracts/Rest/ServiceStatus.cs rename to src/WorkflowManager/Contracts/Rest/ServiceStatus.cs diff --git a/src/Database/Interfaces/IPayloadRepsitory.cs b/src/WorkflowManager/Database/Interfaces/IPayloadRepsitory.cs similarity index 100% rename from src/Database/Interfaces/IPayloadRepsitory.cs rename to src/WorkflowManager/Database/Interfaces/IPayloadRepsitory.cs diff --git a/src/Database/Interfaces/ITasksRepository.cs b/src/WorkflowManager/Database/Interfaces/ITasksRepository.cs similarity index 100% rename from src/Database/Interfaces/ITasksRepository.cs rename to src/WorkflowManager/Database/Interfaces/ITasksRepository.cs diff --git a/src/Database/Interfaces/IWorkflowInstanceRepository.cs b/src/WorkflowManager/Database/Interfaces/IWorkflowInstanceRepository.cs similarity index 100% rename from src/Database/Interfaces/IWorkflowInstanceRepository.cs rename to src/WorkflowManager/Database/Interfaces/IWorkflowInstanceRepository.cs diff --git a/src/Database/Interfaces/IWorkflowRepository.cs b/src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs similarity index 100% rename from src/Database/Interfaces/IWorkflowRepository.cs rename to src/WorkflowManager/Database/Interfaces/IWorkflowRepository.cs diff --git a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj b/src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj similarity index 85% rename from src/Database/Monai.Deploy.WorkflowManager.Database.csproj rename to src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj index bd6bb7211..8b24ca612 100644 --- a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj +++ b/src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj @@ -19,7 +19,7 @@ net6.0 Monai.Deploy.WorkflowManager.Database - ..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset enable @@ -30,8 +30,8 @@ - - + + diff --git a/src/Database/Options/WorkloadManagerDatabaseSettings.cs b/src/WorkflowManager/Database/Options/WorkloadManagerDatabaseSettings.cs similarity index 100% rename from src/Database/Options/WorkloadManagerDatabaseSettings.cs rename to src/WorkflowManager/Database/Options/WorkloadManagerDatabaseSettings.cs diff --git a/src/Database/Repositories/PayloadRepository.cs b/src/WorkflowManager/Database/Repositories/PayloadRepository.cs similarity index 100% rename from src/Database/Repositories/PayloadRepository.cs rename to src/WorkflowManager/Database/Repositories/PayloadRepository.cs diff --git a/src/Database/Repositories/RepositoryBase.cs b/src/WorkflowManager/Database/Repositories/RepositoryBase.cs similarity index 100% rename from src/Database/Repositories/RepositoryBase.cs rename to src/WorkflowManager/Database/Repositories/RepositoryBase.cs diff --git a/src/Database/Repositories/TasksRepository.cs b/src/WorkflowManager/Database/Repositories/TasksRepository.cs similarity index 100% rename from src/Database/Repositories/TasksRepository.cs rename to src/WorkflowManager/Database/Repositories/TasksRepository.cs diff --git a/src/Database/Repositories/WorkflowInstanceRepository.cs b/src/WorkflowManager/Database/Repositories/WorkflowInstanceRepository.cs similarity index 100% rename from src/Database/Repositories/WorkflowInstanceRepository.cs rename to src/WorkflowManager/Database/Repositories/WorkflowInstanceRepository.cs diff --git a/src/Database/Repositories/WorkflowRepository.cs b/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs similarity index 100% rename from src/Database/Repositories/WorkflowRepository.cs rename to src/WorkflowManager/Database/Repositories/WorkflowRepository.cs diff --git a/src/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json similarity index 100% rename from src/Database/packages.lock.json rename to src/WorkflowManager/Database/packages.lock.json diff --git a/src/Logging/LoggerHelpers.cs b/src/WorkflowManager/Logging/LoggerHelpers.cs similarity index 100% rename from src/Logging/LoggerHelpers.cs rename to src/WorkflowManager/Logging/LoggerHelpers.cs diff --git a/src/Logging/Logging/Log.cs b/src/WorkflowManager/Logging/Logging/Log.cs similarity index 100% rename from src/Logging/Logging/Log.cs rename to src/WorkflowManager/Logging/Logging/Log.cs diff --git a/src/Logging/Models/ObjectLog.cs b/src/WorkflowManager/Logging/Models/ObjectLog.cs similarity index 100% rename from src/Logging/Models/ObjectLog.cs rename to src/WorkflowManager/Logging/Models/ObjectLog.cs diff --git a/src/Logging/Monai.Deploy.WorkflowManager.Logging.csproj b/src/WorkflowManager/Logging/Monai.Deploy.WorkflowManager.Logging.csproj similarity index 100% rename from src/Logging/Monai.Deploy.WorkflowManager.Logging.csproj rename to src/WorkflowManager/Logging/Monai.Deploy.WorkflowManager.Logging.csproj diff --git a/src/PayloadListener/Extensions/CollectionExtensions.cs b/src/WorkflowManager/PayloadListener/Extensions/CollectionExtensions.cs similarity index 100% rename from src/PayloadListener/Extensions/CollectionExtensions.cs rename to src/WorkflowManager/PayloadListener/Extensions/CollectionExtensions.cs diff --git a/src/PayloadListener/Extensions/ValidationExtensions.cs b/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs similarity index 100% rename from src/PayloadListener/Extensions/ValidationExtensions.cs rename to src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs diff --git a/src/PayloadListener/Extensions/WorkflowExtensions.cs b/src/WorkflowManager/PayloadListener/Extensions/WorkflowExtensions.cs similarity index 100% rename from src/PayloadListener/Extensions/WorkflowExtensions.cs rename to src/WorkflowManager/PayloadListener/Extensions/WorkflowExtensions.cs diff --git a/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj b/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj similarity index 85% rename from src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj rename to src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj index 2ce9b7eaf..069012969 100644 --- a/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj +++ b/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj @@ -22,8 +22,8 @@ - - + + @@ -34,7 +34,7 @@ - + diff --git a/src/PayloadListener/Services/EventPayloadRecieverService.cs b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs similarity index 100% rename from src/PayloadListener/Services/EventPayloadRecieverService.cs rename to src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs diff --git a/src/PayloadListener/Services/IEventPayloadRecieverService.cs b/src/WorkflowManager/PayloadListener/Services/IEventPayloadRecieverService.cs similarity index 100% rename from src/PayloadListener/Services/IEventPayloadRecieverService.cs rename to src/WorkflowManager/PayloadListener/Services/IEventPayloadRecieverService.cs diff --git a/src/PayloadListener/Services/PayloadListenerService.cs b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs similarity index 100% rename from src/PayloadListener/Services/PayloadListenerService.cs rename to src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs diff --git a/src/PayloadListener/Validators/EventPayloadValidator.cs b/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs similarity index 100% rename from src/PayloadListener/Validators/EventPayloadValidator.cs rename to src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs diff --git a/src/PayloadListener/Validators/IEventPayloadValidator.cs b/src/WorkflowManager/PayloadListener/Validators/IEventPayloadValidator.cs similarity index 100% rename from src/PayloadListener/Validators/IEventPayloadValidator.cs rename to src/WorkflowManager/PayloadListener/Validators/IEventPayloadValidator.cs diff --git a/src/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json similarity index 85% rename from src/PayloadListener/packages.lock.json rename to src/WorkflowManager/PayloadListener/packages.lock.json index 1b06097ee..79b103e2b 100644 --- a/src/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -77,6 +77,17 @@ "resolved": "2021.3.0", "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" }, + "Karambolo.Extensions.Logging.File": { + "type": "Transitive", + "resolved": "3.3.1", + "contentHash": "wkPTc/UEuSAwbO3/Ee+oCdotxncmc/DKwjM533Z0BKvJm94NLOvU2i7pifgMd6uAUJ8jy69OcFZRu7hXKbMW6g==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Physical": "3.0.0", + "Microsoft.Extensions.Logging.Configuration": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "3.0.0", + "System.Threading.Channels": "4.7.1" + } + }, "Microsoft.Extensions.Configuration": { "type": "Transitive", "resolved": "6.0.1", @@ -94,6 +105,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "iw3UL25Cw9GBILJOs8srwcId2UCz5+BxTu//EN5dO2dOFNtHcNJgnUiqIlmcGi0orIco0pDuDXuIDvhkrY/sGQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "3.0.0" + } + }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", "resolved": "6.0.0", @@ -116,6 +135,20 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, + "Microsoft.Extensions.FileProviders.Physical": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "76yB1N8hvzDaTqx3epda5sl/3HATw2FskztmmLmfWuvaooaNgbDa37Jyc7IyBCC4PreXEW/XLEET9w6fiJZOFg==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Abstractions": "3.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "3.0.0" + } + }, + "Microsoft.Extensions.FileSystemGlobbing": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "E1GcUu8JvY/8QfqMUYTs6HlDLefMYhEzeHsjrhRqOZguBmDTFU8d8m+mGtHEyYHWMRT1TEiha0a8I2AuozDUWQ==" + }, "Microsoft.Extensions.Logging": { "type": "Transitive", "resolved": "6.0.0", @@ -133,6 +166,15 @@ "resolved": "6.0.1", "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" }, + "Microsoft.Extensions.Logging.Configuration": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "Z+3mqptSt3pCo0Nl4pmwK+nTpBpRxNe2lFaBCCtsT0bb88GeFKvw6Mg+0IeEgDrfj7h4qzMYRbL5cSFMpENQZA==", + "dependencies": { + "Microsoft.Extensions.Logging": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "3.0.0" + } + }, "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "6.0.0", @@ -142,6 +184,17 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "g4V1TXEKUDgOnp1ZKREKSvITYxcUsTqfxNlOaCG7/xlCurLLzFupm+ULkGqIBUIBK+q3kHmt42pVyHwGIcCBmg==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "3.0.0", + "Microsoft.Extensions.Configuration.Binder": "3.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.0.0", + "Microsoft.Extensions.Options": "3.0.0" + } + }, "Microsoft.Extensions.Primitives": { "type": "Transitive", "resolved": "6.0.0", @@ -302,7 +355,9 @@ "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { + "Karambolo.Extensions.Logging.File": "3.3.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.2.0-rc0014", diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Constants/DicomTagConstants.cs b/src/WorkflowManager/Storage/Constants/DicomTagConstants.cs similarity index 100% rename from src/Monai.Deploy.WorkflowManager.Storage/Constants/DicomTagConstants.cs rename to src/WorkflowManager/Storage/Constants/DicomTagConstants.cs diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Monai.Deploy.WorkflowManager.Storage.csproj b/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj similarity index 81% rename from src/Monai.Deploy.WorkflowManager.Storage/Monai.Deploy.WorkflowManager.Storage.csproj rename to src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj index 13933a7df..abcace460 100644 --- a/src/Monai.Deploy.WorkflowManager.Storage/Monai.Deploy.WorkflowManager.Storage.csproj +++ b/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj @@ -18,14 +18,14 @@ net6.0 - ..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset enable enable - - + + diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Services/DicomService.cs b/src/WorkflowManager/Storage/Services/DicomService.cs similarity index 100% rename from src/Monai.Deploy.WorkflowManager.Storage/Services/DicomService.cs rename to src/WorkflowManager/Storage/Services/DicomService.cs diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Services/IDicomService.cs b/src/WorkflowManager/Storage/Services/IDicomService.cs similarity index 100% rename from src/Monai.Deploy.WorkflowManager.Storage/Services/IDicomService.cs rename to src/WorkflowManager/Storage/Services/IDicomService.cs diff --git a/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json similarity index 97% rename from src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json rename to src/WorkflowManager/Storage/packages.lock.json index 624e86794..a91221906 100644 --- a/src/Monai.Deploy.WorkflowManager.Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -1,208 +1,208 @@ -{ - "version": 1, - "dependencies": { - "net6.0": { - "Ardalis.GuardClauses": { - "type": "Direct", - "requested": "[4.0.1, )", - "resolved": "4.0.1", - "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", - "dependencies": { - "JetBrains.Annotations": "2021.3.0" - } - }, - "Monai.Deploy.Storage": { - "type": "Direct", - "requested": "[0.2.0-rc0014, )", - "resolved": "0.2.0-rc0014", - "contentHash": "PC+zwr7VZBvU701GefZ297b98gdJaHlJQZ0altXvUGyzh1tLMpRdjdqZ1gMB5QzYwWkdS3u7wp6MOnJdzebkDw==", - "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.165", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0014", - "System.IO.Abstractions": "17.0.18" - } - }, - "AWSSDK.Core": { - "type": "Transitive", - "resolved": "3.7.12.11", - "contentHash": "Tb6llf5tUU8FiptuB6Xq8vaJpxXDRcWL39nkEiHkDhdctj9l2kPL0DydrCNCAVwLWWTlPXyLUD8i37Rm0mRjaw==" - }, - "AWSSDK.SecurityToken": { - "type": "Transitive", - "resolved": "3.7.1.176", - "contentHash": "VrUC7q6XTUUNVFlMxPKXKNRdXcZm+I7qOj3EFGOmNXVwmIGM4IsV1V5sCCb2KWZ9Thv/RlR3dA+YxjFP3a/3vw==", - "dependencies": { - "AWSSDK.Core": "[3.7.12.11, 4.0.0)" - } - }, - "JetBrains.Annotations": { - "type": "Transitive", - "resolved": "2021.3.0", - "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" - }, - "Microsoft.Extensions.Configuration": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.Abstractions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", - "dependencies": { - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.DependencyInjection": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" - }, - "Microsoft.Extensions.Logging": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.0" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" - }, - "Microsoft.Extensions.Options": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.Primitives": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "Monai.Deploy.Messaging": { - "type": "Transitive", - "resolved": "0.1.3-rc0010", - "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Newtonsoft.Json": "13.0.1", - "RabbitMQ.Client": "6.4.0", - "System.ComponentModel.Annotations": "5.0.0", - "System.IO.Abstractions": "17.0.18" - } - }, - "Monai.Deploy.Storage.S3Policy": { - "type": "Transitive", - "resolved": "0.2.0-rc0014", - "contentHash": "ClEa022hoQhw/74rUfO+p5OrZ0suk8Ehj3jT7HcfAhjSQiMOTrYVfnCxeW2QxyJa/TeIrmQjd1H2f50hZ8RPXQ==", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Newtonsoft.Json": "13.0.1" - } - }, - "MongoDB.Bson": { - "type": "Transitive", - "resolved": "2.17.0", - "contentHash": "wGUX8GMQ0DYG68u1ENAUtJTx6cmQTt6/BfMjqB+Q+aWu2ZkBZ09mA1QbBU5mcbVqulF5U72bGzxChtjYxaS9Dg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } - }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, - "RabbitMQ.Client": { - "type": "Transitive", - "resolved": "6.4.0", - "contentHash": "1znR1gGU+xYVSpO5z8nQolcUKA/yydnxQn7Ug9+RUXxTSLMm/eE58VKGwahPBjELXvDnX0k/kBrAitFLRjx9LA==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Threading.Channels": "4.7.1" - } - }, - "System.ComponentModel.Annotations": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.IO.Abstractions": { - "type": "Transitive", - "resolved": "17.0.18", - "contentHash": "x0iIMdP+PCLIkz8h13xHCecaiysFgHPe9mM3FdyfSmkl5+MtMCmgFFIe38Aibkzd0UAY/OMoXMKGR2RK10rebQ==" - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "4.7.1", - "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" - }, - "monai.deploy.workflowmanager.contracts": { - "type": "Project", - "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.176", - "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0010", - "MongoDB.Bson": "2.17.0", - "Newtonsoft.Json": "13.0.1" - } - }, - "monai.deploy.workflowmanager.logging": { - "type": "Project", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" - } - } - } - } +{ + "version": 1, + "dependencies": { + "net6.0": { + "Ardalis.GuardClauses": { + "type": "Direct", + "requested": "[4.0.1, )", + "resolved": "4.0.1", + "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", + "dependencies": { + "JetBrains.Annotations": "2021.3.0" + } + }, + "Monai.Deploy.Storage": { + "type": "Direct", + "requested": "[0.2.0-rc0014, )", + "resolved": "0.2.0-rc0014", + "contentHash": "PC+zwr7VZBvU701GefZ297b98gdJaHlJQZ0altXvUGyzh1tLMpRdjdqZ1gMB5QzYwWkdS3u7wp6MOnJdzebkDw==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.165", + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0014", + "System.IO.Abstractions": "17.0.18" + } + }, + "AWSSDK.Core": { + "type": "Transitive", + "resolved": "3.7.12.11", + "contentHash": "Tb6llf5tUU8FiptuB6Xq8vaJpxXDRcWL39nkEiHkDhdctj9l2kPL0DydrCNCAVwLWWTlPXyLUD8i37Rm0mRjaw==" + }, + "AWSSDK.SecurityToken": { + "type": "Transitive", + "resolved": "3.7.1.176", + "contentHash": "VrUC7q6XTUUNVFlMxPKXKNRdXcZm+I7qOj3EFGOmNXVwmIGM4IsV1V5sCCb2KWZ9Thv/RlR3dA+YxjFP3a/3vw==", + "dependencies": { + "AWSSDK.Core": "[3.7.12.11, 4.0.0)" + } + }, + "JetBrains.Annotations": { + "type": "Transitive", + "resolved": "2021.3.0", + "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + }, + "Microsoft.Extensions.Logging": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Monai.Deploy.Messaging": { + "type": "Transitive", + "resolved": "0.1.3-rc0010", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Newtonsoft.Json": "13.0.1", + "RabbitMQ.Client": "6.4.0", + "System.ComponentModel.Annotations": "5.0.0", + "System.IO.Abstractions": "17.0.18" + } + }, + "Monai.Deploy.Storage.S3Policy": { + "type": "Transitive", + "resolved": "0.2.0-rc0014", + "contentHash": "ClEa022hoQhw/74rUfO+p5OrZ0suk8Ehj3jT7HcfAhjSQiMOTrYVfnCxeW2QxyJa/TeIrmQjd1H2f50hZ8RPXQ==", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Newtonsoft.Json": "13.0.1" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "2.17.0", + "contentHash": "wGUX8GMQ0DYG68u1ENAUtJTx6cmQTt6/BfMjqB+Q+aWu2ZkBZ09mA1QbBU5mcbVqulF5U72bGzxChtjYxaS9Dg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "RabbitMQ.Client": { + "type": "Transitive", + "resolved": "6.4.0", + "contentHash": "1znR1gGU+xYVSpO5z8nQolcUKA/yydnxQn7Ug9+RUXxTSLMm/eE58VKGwahPBjELXvDnX0k/kBrAitFLRjx9LA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Threading.Channels": "4.7.1" + } + }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.IO.Abstractions": { + "type": "Transitive", + "resolved": "17.0.18", + "contentHash": "x0iIMdP+PCLIkz8h13xHCecaiysFgHPe9mM3FdyfSmkl5+MtMCmgFFIe38Aibkzd0UAY/OMoXMKGR2RK10rebQ==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" + }, + "monai.deploy.workflowmanager.contracts": { + "type": "Project", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.176", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "MongoDB.Bson": "2.17.0", + "Newtonsoft.Json": "13.0.1" + } + }, + "monai.deploy.workflowmanager.logging": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" + } + } + } + } } \ No newline at end of file diff --git a/src/WorkflowExecuter/Common/ArtifactMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs similarity index 100% rename from src/WorkflowExecuter/Common/ArtifactMapper.cs rename to src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs diff --git a/src/WorkflowExecuter/Common/EventMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs similarity index 100% rename from src/WorkflowExecuter/Common/EventMapper.cs rename to src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs diff --git a/src/WorkflowExecuter/Common/IArtifactMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/IArtifactMapper.cs similarity index 100% rename from src/WorkflowExecuter/Common/IArtifactMapper.cs rename to src/WorkflowManager/WorkflowExecuter/Common/IArtifactMapper.cs diff --git a/src/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs b/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs similarity index 100% rename from src/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs rename to src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs diff --git a/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj similarity index 78% rename from src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj rename to src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj index 0248bc49b..31f2a4d6d 100644 --- a/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj +++ b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj @@ -18,14 +18,14 @@ net6.0 - ..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset enable enable - - + + @@ -37,13 +37,13 @@ + - - + diff --git a/src/WorkflowExecuter/Services/IWorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/IWorkflowExecuterService.cs similarity index 100% rename from src/WorkflowExecuter/Services/IWorkflowExecuterService.cs rename to src/WorkflowManager/WorkflowExecuter/Services/IWorkflowExecuterService.cs diff --git a/src/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs similarity index 100% rename from src/WorkflowExecuter/Services/WorkflowExecuterService.cs rename to src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs diff --git a/src/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json similarity index 82% rename from src/WorkflowExecuter/packages.lock.json rename to src/WorkflowManager/WorkflowExecuter/packages.lock.json index 9383fba94..f261da076 100644 --- a/src/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -73,6 +73,17 @@ "resolved": "2021.3.0", "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" }, + "Karambolo.Extensions.Logging.File": { + "type": "Transitive", + "resolved": "3.3.1", + "contentHash": "wkPTc/UEuSAwbO3/Ee+oCdotxncmc/DKwjM533Z0BKvJm94NLOvU2i7pifgMd6uAUJ8jy69OcFZRu7hXKbMW6g==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Physical": "3.0.0", + "Microsoft.Extensions.Logging.Configuration": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "3.0.0", + "System.Threading.Channels": "4.7.1" + } + }, "Microsoft.Extensions.Configuration": { "type": "Transitive", "resolved": "6.0.1", @@ -90,6 +101,14 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "iw3UL25Cw9GBILJOs8srwcId2UCz5+BxTu//EN5dO2dOFNtHcNJgnUiqIlmcGi0orIco0pDuDXuIDvhkrY/sGQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "3.0.0" + } + }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", "resolved": "6.0.0", @@ -104,6 +123,28 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "kahEeykb6FyQytoZNNXuz74X85B4weIEt8Kd+0klK48bkXDWOIHAOvNjlGsPMcS9CL935Te8QGQS83JqCbpdHA==", + "dependencies": { + "Microsoft.Extensions.Primitives": "3.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Physical": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "76yB1N8hvzDaTqx3epda5sl/3HATw2FskztmmLmfWuvaooaNgbDa37Jyc7IyBCC4PreXEW/XLEET9w6fiJZOFg==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Abstractions": "3.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "3.0.0" + } + }, + "Microsoft.Extensions.FileSystemGlobbing": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "E1GcUu8JvY/8QfqMUYTs6HlDLefMYhEzeHsjrhRqOZguBmDTFU8d8m+mGtHEyYHWMRT1TEiha0a8I2AuozDUWQ==" + }, "Microsoft.Extensions.Logging": { "type": "Transitive", "resolved": "6.0.0", @@ -121,6 +162,15 @@ "resolved": "6.0.1", "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" }, + "Microsoft.Extensions.Logging.Configuration": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "Z+3mqptSt3pCo0Nl4pmwK+nTpBpRxNe2lFaBCCtsT0bb88GeFKvw6Mg+0IeEgDrfj7h4qzMYRbL5cSFMpENQZA==", + "dependencies": { + "Microsoft.Extensions.Logging": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "3.0.0" + } + }, "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "6.0.0", @@ -130,6 +180,17 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "g4V1TXEKUDgOnp1ZKREKSvITYxcUsTqfxNlOaCG7/xlCurLLzFupm+ULkGqIBUIBK+q3kHmt42pVyHwGIcCBmg==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "3.0.0", + "Microsoft.Extensions.Configuration.Binder": "3.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.0.0", + "Microsoft.Extensions.Options": "3.0.0" + } + }, "Microsoft.Extensions.Primitives": { "type": "Transitive", "resolved": "6.0.0", @@ -285,7 +346,9 @@ "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { + "Karambolo.Extensions.Logging.File": "3.3.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.2.0-rc0014", diff --git a/src/WorkflowManager/AssemblyInfo.cs b/src/WorkflowManager/WorkflowManager/AssemblyInfo.cs similarity index 100% rename from src/WorkflowManager/AssemblyInfo.cs rename to src/WorkflowManager/WorkflowManager/AssemblyInfo.cs diff --git a/src/WorkflowManager/Common/ServiceProviderExtensions.cs b/src/WorkflowManager/WorkflowManager/Common/ServiceProviderExtensions.cs similarity index 100% rename from src/WorkflowManager/Common/ServiceProviderExtensions.cs rename to src/WorkflowManager/WorkflowManager/Common/ServiceProviderExtensions.cs diff --git a/src/WorkflowManager/Controllers/ApiControllerBase.cs b/src/WorkflowManager/WorkflowManager/Controllers/ApiControllerBase.cs similarity index 100% rename from src/WorkflowManager/Controllers/ApiControllerBase.cs rename to src/WorkflowManager/WorkflowManager/Controllers/ApiControllerBase.cs diff --git a/src/WorkflowManager/Controllers/PayloadController.cs b/src/WorkflowManager/WorkflowManager/Controllers/PayloadController.cs similarity index 100% rename from src/WorkflowManager/Controllers/PayloadController.cs rename to src/WorkflowManager/WorkflowManager/Controllers/PayloadController.cs diff --git a/src/WorkflowManager/Controllers/TasksController.cs b/src/WorkflowManager/WorkflowManager/Controllers/TasksController.cs similarity index 100% rename from src/WorkflowManager/Controllers/TasksController.cs rename to src/WorkflowManager/WorkflowManager/Controllers/TasksController.cs diff --git a/src/WorkflowManager/Controllers/WorkflowInstanceController.cs b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs similarity index 100% rename from src/WorkflowManager/Controllers/WorkflowInstanceController.cs rename to src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs diff --git a/src/WorkflowManager/Controllers/WorkflowsController.cs b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs similarity index 100% rename from src/WorkflowManager/Controllers/WorkflowsController.cs rename to src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs diff --git a/src/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs b/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs similarity index 100% rename from src/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs rename to src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs diff --git a/src/WorkflowManager/Filter/PaginationFilter.cs b/src/WorkflowManager/WorkflowManager/Filter/PaginationFilter.cs similarity index 100% rename from src/WorkflowManager/Filter/PaginationFilter.cs rename to src/WorkflowManager/WorkflowManager/Filter/PaginationFilter.cs diff --git a/src/WorkflowManager/Models/TasksRequest.cs b/src/WorkflowManager/WorkflowManager/Models/TasksRequest.cs similarity index 100% rename from src/WorkflowManager/Models/TasksRequest.cs rename to src/WorkflowManager/WorkflowManager/Models/TasksRequest.cs diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj similarity index 82% rename from src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj rename to src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 78af26477..c5179e483 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -19,7 +19,7 @@ Exe net6.0 Monai.Deploy.WorkflowManager - ..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset false false @@ -29,8 +29,8 @@ - - + + @@ -57,18 +57,13 @@ + - - - - - - diff --git a/src/WorkflowManager/Program.cs b/src/WorkflowManager/WorkflowManager/Program.cs similarity index 95% rename from src/WorkflowManager/Program.cs rename to src/WorkflowManager/WorkflowManager/Program.cs index 889d58078..476bfd23f 100644 --- a/src/WorkflowManager/Program.cs +++ b/src/WorkflowManager/WorkflowManager/Program.cs @@ -36,7 +36,6 @@ using Monai.Deploy.WorkflowManager.Services; using Monai.Deploy.WorkflowManager.Services.DataRetentionService; using Monai.Deploy.WorkflowManager.Services.Http; -using Monai.Deploy.WorkflowManager.TaskManager.Database; using MongoDB.Driver; namespace Monai.Deploy.WorkflowManager @@ -117,13 +116,11 @@ private static void ConfigureServices(HostBuilderContext hostContext, IServiceCo // Mongo DB services.Configure(hostContext.Configuration.GetSection("WorkloadManagerDatabase")); - services.Configure(hostContext.Configuration.GetSection("WorkloadManagerDatabase")); services.AddSingleton(s => new MongoClient(hostContext.Configuration["WorkloadManagerDatabase:ConnectionString"])); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); // StorageService services.AddMonaiDeployStorageService(hostContext.Configuration.GetSection("WorkflowManager:storage:serviceAssemblyName").Value); @@ -134,7 +131,6 @@ private static void ConfigureServices(HostBuilderContext hostContext, IServiceCo services.AddHostedService(p => p.GetService()); - services.AddTaskManager(hostContext); services.AddWorkflowExecutor(hostContext); services.AddHttpContextAccessor(); diff --git a/src/WorkflowManager/Properties/launchSettings.json b/src/WorkflowManager/WorkflowManager/Properties/launchSettings.json similarity index 96% rename from src/WorkflowManager/Properties/launchSettings.json rename to src/WorkflowManager/WorkflowManager/Properties/launchSettings.json index 3d447b370..bc0fc05a7 100644 --- a/src/WorkflowManager/Properties/launchSettings.json +++ b/src/WorkflowManager/WorkflowManager/Properties/launchSettings.json @@ -1,18 +1,18 @@ -{ - "profiles": { - "Monai.Deploy.WorkflowManager": { - "commandName": "Project", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Local", - "WorkflowManager__messaging__subscriberSettings__endpoint": "localhost" - } - }, - "WSL": { - "commandName": "WSL2", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "distributionName": "" - } - } +{ + "profiles": { + "Monai.Deploy.WorkflowManager": { + "commandName": "Project", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Local", + "WorkflowManager__messaging__subscriberSettings__endpoint": "localhost" + } + }, + "WSL": { + "commandName": "WSL2", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "distributionName": "" + } + } } \ No newline at end of file diff --git a/src/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs b/src/WorkflowManager/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs similarity index 100% rename from src/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs rename to src/WorkflowManager/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs diff --git a/src/WorkflowManager/Services/Http/Startup.cs b/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs similarity index 100% rename from src/WorkflowManager/Services/Http/Startup.cs rename to src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs diff --git a/src/WorkflowManager/Services/IUriService.cs b/src/WorkflowManager/WorkflowManager/Services/IUriService.cs similarity index 100% rename from src/WorkflowManager/Services/IUriService.cs rename to src/WorkflowManager/WorkflowManager/Services/IUriService.cs diff --git a/src/WorkflowManager/Services/UriService.cs b/src/WorkflowManager/WorkflowManager/Services/UriService.cs similarity index 100% rename from src/WorkflowManager/Services/UriService.cs rename to src/WorkflowManager/WorkflowManager/Services/UriService.cs diff --git a/src/WorkflowManager/Validators/WorkflowValidator.cs b/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs similarity index 100% rename from src/WorkflowManager/Validators/WorkflowValidator.cs rename to src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs diff --git a/src/WorkflowManager/Wrappers/PagedResponse.cs b/src/WorkflowManager/WorkflowManager/Wrappers/PagedResponse.cs similarity index 100% rename from src/WorkflowManager/Wrappers/PagedResponse.cs rename to src/WorkflowManager/WorkflowManager/Wrappers/PagedResponse.cs diff --git a/src/WorkflowManager/Wrappers/Response.cs b/src/WorkflowManager/WorkflowManager/Wrappers/Response.cs similarity index 100% rename from src/WorkflowManager/Wrappers/Response.cs rename to src/WorkflowManager/WorkflowManager/Wrappers/Response.cs diff --git a/src/TaskManager/Runner/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.Development.json similarity index 61% rename from src/TaskManager/Runner/appsettings.json rename to src/WorkflowManager/WorkflowManager/appsettings.Development.json index 5192da5a4..e3047c5a9 100644 --- a/src/TaskManager/Runner/appsettings.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.Development.json @@ -1,14 +1,17 @@ { "WorkloadManagerDatabase": { - "ConnectionString": "mongodb://root:rootpassword@127.0.0.1:27017", - "DatabaseName": "TaskManager", + "ConnectionString": "mongodb://root:rootpassword@localhost:27017", + "DatabaseName": "WorkloadManager", "WorkflowCollectionName": "Workflows", "WorkflowInstanceCollectionName": "WorkflowInstances", - "PayloadCollectionName": "Payloads", - "TaskDispatchEventCollectionName": "TaskDispatchEvents" + "PayloadCollectionName": "Payloads" }, "WorkflowManager": { - "taskManager": { + "endpointSettings": { + "defaultPageSize": 10, + "maxPageSize": 1000000 + }, + "TaskManager": { "concurrency": 1, "plug-ins": { "argo": "Monai.Deploy.WorkflowManager.TaskManager.Argo.ArgoPlugin, Monai.Deploy.WorkflowManager.TaskManager.Argo", @@ -20,39 +23,51 @@ "test": "Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.Repositories.TestPluginRepository, Monai.Deploy.WorkflowManager.TaskManager.TestPlugin" } }, + "storage": { + "serviceAssemblyName": "Monai.Deploy.Storage.MinIO.MinIoStorageService, Monai.Deploy.Storage.MinIO", + "settings": { + "endpoint": "localhost:9000", + "accessKey": "minioadmin", + "accessToken": "minioadmin", + "bucket": "test-bucket", + "region": "eu-west-2", + "securedConnection": false, + "executableLocation": "/.", + "serviceName": "serviceName" + } + }, "messaging": { "publisherServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessagePublisherService, Monai.Deploy.Messaging.RabbitMQ", "publisherSettings": { - "endpoint": "10.110.54.121", - "username": "mdig", - "password": "gidm", + "endpoint": "localhost", + "username": "admin", + "password": "admin", "virtualHost": "monaideploy", - "exchange": "monaideploy" + "exchange": "monaideploy", + "deadLetterExchange": "monaideploy-dead-letter", + "deliveryLimit": 3, + "requeueDelay": 30 }, "subscriberServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessageSubscriberService, Monai.Deploy.Messaging.RabbitMQ", "subscriberSettings": { - "endpoint": "10.110.54.121", - "username": "mdig", - "password": "gidm", + "endpoint": "localhost", + "username": "admin", + "password": "admin", "virtualHost": "monaideploy", "exchange": "monaideploy", - "exportRequestQueue": "export_tasks", - "deadLetterExchange": "monaideploy-dead-letter", - "deliveryLimit": 3, - "requeueDelay": 30 - } - }, - "storage": { - "serviceAssemblyName": "Monai.Deploy.Storage.MinIO.MinIoStorageService, Monai.Deploy.Storage.MinIO", - "settings": { - "bucket": "monaideploy", - "endpoint": "10.105.3.254", - "accessKey": "monaideploy", - "accessToken": "monaideploy", - "securedConnection": false, - "region": "eu-west-2", - "executableLocation": "/usr/bin/mc", - "serviceName": "test" + "exportRequestQueue": "export_tasks" + }, + "retries": { + "retryDelays": "localhost" + }, + "topics": { + "workflowRequest": "md.workflow.request", + "exportComplete": "md.export.complete", + "exportRequestPrefix": "md.export.request" + }, + "dicomAgents": { + "dicomWebAgentName": "monaidicomweb", + "scuAgentName": "monaiscu" } } }, @@ -64,9 +79,10 @@ "Microsoft.EntityFrameworkCore": "Warning", "Microsoft.Hosting.Lifetime": "Information", "Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker": "Error", - "Monai": "Debug" + "Monai": "Information" }, "Console": { + "FormatterName": "Systemd", "FormatterOptions": { "ColorBehavior": "Disabled", "IncludeScopes": true, @@ -74,6 +90,21 @@ "TimestampFormat": " HH:mm:ss ", "UseUtcTimestamp": true } + }, + "File": { + "BasePath": "Logs", + "FileEncodingName": "utf-8", + "DateFormat": "yyyyMMdd", + "CounterFormat": "000", + "MaxFileSize": 10485760, + "IncludeScopes": true, + "MaxQueueSize": 100, + "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", + "Files": [ + { + "Path": "MWM--.log" + } + ] } }, "Kestrel": { @@ -88,4 +119,4 @@ } }, "AllowedHosts": "*" -} \ No newline at end of file +} diff --git a/src/WorkflowManager/WorkflowManager/appsettings.Local.json b/src/WorkflowManager/WorkflowManager/appsettings.Local.json new file mode 100644 index 000000000..29a4f2dc8 --- /dev/null +++ b/src/WorkflowManager/WorkflowManager/appsettings.Local.json @@ -0,0 +1,120 @@ +{ + "WorkloadManagerDatabase": { + "ConnectionString": "mongodb://root:rootpassword@localhost:30017", + "DatabaseName": "WorkloadManager", + "WorkflowCollectionName": "Workflows", + "WorkflowInstanceCollectionName": "WorkflowInstances", + "PayloadCollectionName": "Payloads" + }, + "WorkflowManager": { + "endpointSettings": { + "defaultPageSize": 10, + "maxPageSize": 1000000 + }, + "TaskManager": { + "concurrency": 1, + "plug-ins": { + "argo": "Monai.Deploy.WorkflowManager.TaskManager.Argo.ArgoPlugin, Monai.Deploy.WorkflowManager.TaskManager.Argo", + "aide_clinical_review": "Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.AideClinicalReviewPlugin, Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview", + "test": "Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.TestPlugin, Monai.Deploy.WorkflowManager.TaskManager.TestPlugin" + }, + "meta-data": { + "argo": "Monai.Deploy.WorkflowManager.TaskManager.Argo.Repositories.ArgoMetadataRepository, Monai.Deploy.WorkflowManager.TaskManager.Argo", + "test": "Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.Repositories.TestPluginRepository, Monai.Deploy.WorkflowManager.TaskManager.TestPlugin" + } + }, + "storage": { + "serviceAssemblyName": "Monai.Deploy.Storage.MinIO.MinIoStorageService, Monai.Deploy.Storage.MinIO", + "settings": { + "endpoint": "minio:9000", // note edit C:\Windows\System32\drivers\etc\Hosts and add `127.0.0.1 minio` + "accessKey": "admin", + "accessToken": "password", + "bucket": "test-bucket", + "region": "eu-west-2", + "securedConnection": false, + "executableLocation": "mc.exe", + "serviceName": "serviceName" + } + }, + "messaging": { + "publisherServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessagePublisherService, Monai.Deploy.Messaging.RabbitMQ", + "publisherSettings": { + "endpoint": "localhost", + "username": "admin", + "password": "admin", + "port": "30072", + "virtualHost": "monaideploy", + "exchange": "monaideploy", + "deadLetterExchange": "monaideploy-dead-letter", + "deliveryLimit": 3, + "requeueDelay": 30 + }, + "subscriberServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessageSubscriberService, Monai.Deploy.Messaging.RabbitMQ", + "subscriberSettings": { + "endpoint": "localhost", + "username": "admin", + "password": "admin", + "port": "30072", + "virtualHost": "monaideploy", + "exchange": "monaideploy", + "exportRequestQueue": "export_tasks" + }, + "retries": { + "retryDelays": "localhost" + }, + "topics": { + "workflowRequest": "md.workflow.request", + "exportComplete": "md.export.complete", + "exportRequestPrefix": "md.export.request" + }, + "dicomAgents": { + "dicomWebAgentName": "monaidicomweb", + "scuAgentName": "monaiscu" + } + } + }, + "Logging": { + "LogLevel": { + "Default": "Information", + "System": "Warning", + "Microsoft": "Warning", + "Microsoft.EntityFrameworkCore": "Warning", + "Microsoft.Hosting.Lifetime": "Information", + "Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker": "Error", + "Monai": "Information" + }, + "Console": { + "FormatterName": "Systemd", + "FormatterOptions": { + "ColorBehavior": "Disabled", + "IncludeScopes": true, + "SingleLine": false, + "TimestampFormat": " HH:mm:ss ", + "UseUtcTimestamp": true + } + }, + "File": { + "BasePath": "Logs", + "FileEncodingName": "utf-8", + "DateFormat": "yyyyMMdd", + "CounterFormat": "000", + "MaxFileSize": 10485760, + "IncludeScopes": true, + "MaxQueueSize": 100, + "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", + "Files": [ + { + "Path": "MWM--.log" + } + ] + } + }, + "Kestrel": { + "EndPoints": { + "Http": { + "Url": "http://localhost:5000" + } + } + }, + "AllowedHosts": "*" +} \ No newline at end of file diff --git a/src/WorkflowManager/WorkflowManager/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.json new file mode 100644 index 000000000..3d1750d01 --- /dev/null +++ b/src/WorkflowManager/WorkflowManager/appsettings.json @@ -0,0 +1,127 @@ +{ + "WorkloadManagerDatabase": { + "ConnectionString": "mongodb://root:rootpassword@localhost:27017", + "DatabaseName": "WorkloadManager", + "WorkflowCollectionName": "Workflows", + "WorkflowInstanceCollectionName": "WorkflowInstances", + "PayloadCollectionName": "Payloads", + "TaskDispatchEventCollectionName": "TaskDispatchEvents" + }, + "WorkflowManager": { + "endpointSettings": { + "defaultPageSize": 10, + "maxPageSize": 1000000 + }, + "TaskManager": { + "concurrency": 1, + "taskTimeoutMinutes": 60, + "plug-ins": { + "argo": "Monai.Deploy.WorkflowManager.TaskManager.Argo.ArgoPlugin, Monai.Deploy.WorkflowManager.TaskManager.Argo", + "aide_clinical_review": "Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.AideClinicalReviewPlugin, Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview", + "test": "Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.TestPlugin, Monai.Deploy.WorkflowManager.TaskManager.TestPlugin" + }, + "meta-data": { + "argo": "Monai.Deploy.WorkflowManager.TaskManager.Argo.Repositories.ArgoMetadataRepository, Monai.Deploy.WorkflowManager.TaskManager.Argo", + "test": "Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.Repositories.TestPluginRepository, Monai.Deploy.WorkflowManager.TaskManager.TestPlugin" + } + }, + "messaging": { + "retries": { + "retryDelays": "localhost" + }, + "topics": { + "workflowRequest": "md.workflow.request", + "exportComplete": "md.export.complete", + "exportRequestPrefix": "md.export.request" + }, + "dicomAgents": { + "dicomWebAgentName": "monaidicomweb", + "scuAgentName": "monaiscu" + }, + "publisherServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessagePublisherService, Monai.Deploy.Messaging.RabbitMQ", + "publisherSettings": { + "endpoint": "localhost", + "username": "admin", + "password": "admin", + "virtualHost": "monaideploy", + "exchange": "monaideploy", + "deadLetterExchange": "deadLetterExchange", + "deliveryLimit": "5", + "requeueDelay": "0" + }, + "subscriberServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessageSubscriberService, Monai.Deploy.Messaging.RabbitMQ", + "subscriberSettings": { + "endpoint": "localhost", + "username": "admin", + "password": "admin", + "virtualHost": "monaideploy", + "exchange": "monaideploy", + "deadLetterExchange": "monaideploy-dead-letter", + "exportRequestQueue": "export_tasks", + "deliveryLimit": 3, + "requeueDelay": 30 + } + }, + "storage": { + "serviceAssemblyName": "Monai.Deploy.Storage.MinIO.MinIoStorageService, Monai.Deploy.Storage.MinIO", + "settings": { + "endpoint": "localhost:9000", + "accessKey": "minioadmin", + "accessToken": "minioadmin", + "region": "eu-west-2", + "bucket": "test-bucket", + "securedConnection": false, + "executableLocation": "mc.exe", + "serviceName": "test" + } + } + }, + "Logging": { + "LogLevel": { + "Default": "Information", + "System": "Warning", + "Microsoft": "Warning", + "Microsoft.EntityFrameworkCore": "Warning", + "Microsoft.Hosting.Lifetime": "Information", + "Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker": "Error", + "Monai": "Information" + }, + "Console": { + "FormatterName": "Systemd", + "FormatterOptions": { + "ColorBehavior": "Disabled", + "IncludeScopes": true, + "SingleLine": false, + "TimestampFormat": " HH:mm:ss ", + "UseUtcTimestamp": true + } + }, + "File": { + "BasePath": "Logs", + "FileEncodingName": "utf-8", + "DateFormat": "yyyyMMdd", + "CounterFormat": "000", + "MaxFileSize": 10485760, + "IncludeScopes": true, + "MaxQueueSize": 100, + "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", + "Files": [ + { + "Path": "MWM--.log" + } + ] + } + }, + "Kestrel": { + "EndPoints": { + "Http": { + "Url": "http://localhost:5000" + }//, + //"Http2": { + // "Url": "https://localhost:7000", + // "Protocols": "Http2" + //} + } + }, + "AllowedHosts": "*" +} diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json new file mode 100644 index 000000000..154258fe7 --- /dev/null +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -0,0 +1,1368 @@ +{ + "version": 1, + "dependencies": { + "net6.0": { + "Ardalis.GuardClauses": { + "type": "Direct", + "requested": "[4.0.1, )", + "resolved": "4.0.1", + "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", + "dependencies": { + "JetBrains.Annotations": "2021.3.0" + } + }, + "Karambolo.Extensions.Logging.File": { + "type": "Direct", + "requested": "[3.3.1, )", + "resolved": "3.3.1", + "contentHash": "wkPTc/UEuSAwbO3/Ee+oCdotxncmc/DKwjM533Z0BKvJm94NLOvU2i7pifgMd6uAUJ8jy69OcFZRu7hXKbMW6g==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Physical": "3.0.0", + "Microsoft.Extensions.Logging.Configuration": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "3.0.0", + "System.Threading.Channels": "4.7.1" + } + }, + "Microsoft.AspNetCore.Mvc.NewtonsoftJson": { + "type": "Direct", + "requested": "[6.0.7, )", + "resolved": "6.0.7", + "contentHash": "zkt7EFRR5fZQUc6taa8sO8aG+EF7XQ6Z7+fPW3gXCh6l7+vyDpZ9PbTODYMsXaS1tOjP1b+jJgf7hY/kaciO4Q==", + "dependencies": { + "Microsoft.AspNetCore.JsonPatch": "6.0.7", + "Newtonsoft.Json": "13.0.1", + "Newtonsoft.Json.Bson": "1.0.2" + } + }, + "Microsoft.AspNetCore.Mvc.Versioning": { + "type": "Direct", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "mN9IARvNpHMBD2/oGmp5Bxp1Dg45Hfcp+LWaAyTtL2HisWLMOIcf0Ox1qW9IvCvdbHM+2A9dWEInhiqBsNxsJA==" + }, + "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer": { + "type": "Direct", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "GZH7F1iDtJKw23qkqQaAnBh9Rw+GVUq5SK0ldfAqMh+2syFRtzPkvQUl0V+qe2wuP0QRr1zG82G812ZN8AU6ig==", + "dependencies": { + "Microsoft.AspNetCore.Mvc.Versioning": "5.0.0" + } + }, + "Microsoft.EntityFrameworkCore": { + "type": "Direct", + "requested": "[6.0.7, )", + "resolved": "6.0.7", + "contentHash": "9BsvGSpTzxvqnxH19wLBFivK5TzWmsHZQc/1cQ4b2e+k85aIG9R4FYewQLHZdPrAxNQImXjTyW5nRI3s1rpt6A==", + "dependencies": { + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.7", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.7", + "Microsoft.Extensions.Caching.Memory": "6.0.1", + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "System.Collections.Immutable": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Direct", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + }, + "Microsoft.Extensions.Hosting": { + "type": "Direct", + "requested": "[6.0.1, )", + "resolved": "6.0.1", + "contentHash": "hbmizc9KPWOacLU8Z8YMaBG6KWdZFppczYV/KwnPGU/8xebWxQxdDeJmLOgg968prb7g2oQgnp6JVLX6lgby8g==", + "dependencies": { + "Microsoft.Extensions.Configuration": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.Configuration.Binder": "6.0.0", + "Microsoft.Extensions.Configuration.CommandLine": "6.0.0", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", + "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", + "Microsoft.Extensions.Configuration.Json": "6.0.0", + "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Physical": "6.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Configuration": "6.0.0", + "Microsoft.Extensions.Logging.Console": "6.0.0", + "Microsoft.Extensions.Logging.Debug": "6.0.0", + "Microsoft.Extensions.Logging.EventLog": "6.0.0", + "Microsoft.Extensions.Logging.EventSource": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Logging": { + "type": "Direct", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.Console": { + "type": "Direct", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "gsqKzOEdsvq28QiXFxagmn1oRB9GeI5GgYCkoybZtQA0IUb7QPwf1WmN3AwJeNIsadTvIFQCiVK0OVIgKfOBGg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Configuration": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Text.Json": "6.0.0" + } + }, + "Microsoft.Extensions.Options": { + "type": "Direct", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Monai.Deploy.Messaging": { + "type": "Direct", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Newtonsoft.Json": "13.0.1", + "RabbitMQ.Client": "6.4.0", + "System.ComponentModel.Annotations": "5.0.0", + "System.IO.Abstractions": "17.0.18" + } + }, + "Monai.Deploy.Messaging.RabbitMQ": { + "type": "Direct", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", + "dependencies": { + "Monai.Deploy.Messaging": "0.1.3-rc0010" + } + }, + "Monai.Deploy.Storage.MinIO": { + "type": "Direct", + "requested": "[0.2.0-rc0014, )", + "resolved": "0.2.0-rc0014", + "contentHash": "p63Y/d85c4gTaD4Idyl0/v5QvJEXMGOUOwvufA3KuqxafTptFkW7dZf3dnHgOtZ2q28g0h+MegqkuDBweQPKug==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.165", + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Minio": "4.0.4", + "Monai.Deploy.Storage": "0.2.0-rc0014", + "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0014" + } + }, + "Newtonsoft.Json": { + "type": "Direct", + "requested": "[13.0.1, )", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "StyleCop.Analyzers": { + "type": "Direct", + "requested": "[1.1.118, )", + "resolved": "1.1.118", + "contentHash": "Onx6ovGSqXSK07n/0eM3ZusiNdB6cIlJdabQhWGgJp3Vooy9AaLS/tigeybOJAobqbtggTamoWndz72JscZBvw==" + }, + "Swashbuckle.AspNetCore": { + "type": "Direct", + "requested": "[6.4.0, )", + "resolved": "6.4.0", + "contentHash": "eUBr4TW0up6oKDA5Xwkul289uqSMgY0xGN4pnbOIBqCcN9VKGGaPvHX3vWaG/hvocfGDP+MGzMA0bBBKz2fkmQ==", + "dependencies": { + "Microsoft.Extensions.ApiDescription.Server": "6.0.5", + "Swashbuckle.AspNetCore.Swagger": "6.4.0", + "Swashbuckle.AspNetCore.SwaggerGen": "6.4.0", + "Swashbuckle.AspNetCore.SwaggerUI": "6.4.0" + } + }, + "AWSSDK.Core": { + "type": "Transitive", + "resolved": "3.7.12.11", + "contentHash": "Tb6llf5tUU8FiptuB6Xq8vaJpxXDRcWL39nkEiHkDhdctj9l2kPL0DydrCNCAVwLWWTlPXyLUD8i37Rm0mRjaw==" + }, + "AWSSDK.SecurityToken": { + "type": "Transitive", + "resolved": "3.7.1.176", + "contentHash": "VrUC7q6XTUUNVFlMxPKXKNRdXcZm+I7qOj3EFGOmNXVwmIGM4IsV1V5sCCb2KWZ9Thv/RlR3dA+YxjFP3a/3vw==", + "dependencies": { + "AWSSDK.Core": "[3.7.12.11, 4.0.0)" + } + }, + "Crc32.NET": { + "type": "Transitive", + "resolved": "1.2.0", + "contentHash": "wNW/huzolu8MNKUnwCVKxjfAlCFpeI8AZVfF46iAWJ1+P6bTU1AZct7VAkDDEjgeeTJCVTkGZaD6jSd/fOiUkA==", + "dependencies": { + "NETStandard.Library": "2.0.0" + } + }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + } + }, + "JetBrains.Annotations": { + "type": "Transitive", + "resolved": "2021.3.0", + "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" + }, + "Microsoft.AspNetCore.JsonPatch": { + "type": "Transitive", + "resolved": "6.0.7", + "contentHash": "ybv3udO2SaGW74NKIxj06ozTtcEJf2yOCNj4OGY/ZvB+LG/mZGBVKrwZYaZBXaWR9dakrf4+M3LiMAhasTEamg==", + "dependencies": { + "Microsoft.CSharp": "4.7.0", + "Newtonsoft.Json": "13.0.1" + } + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, + "Microsoft.EntityFrameworkCore.Abstractions": { + "type": "Transitive", + "resolved": "6.0.7", + "contentHash": "bjU0CkTqldgpVPTSj9M+R/3EaTz+u0jMeQMIC91YdGYDbpX/tAN5UYx+Ihzk4AtP8gmhburQUgMTdnmCE9c5sA==" + }, + "Microsoft.EntityFrameworkCore.Analyzers": { + "type": "Transitive", + "resolved": "6.0.7", + "contentHash": "VAOrGma8mRspUb/9quwIr21UZVqfWOcRQqhcYNkHBUD7woenwFTBvntiC9h2Ebtvj/BrRfezqjaHpWVvPSg4dw==" + }, + "Microsoft.Extensions.ApiDescription.Server": { + "type": "Transitive", + "resolved": "6.0.5", + "contentHash": "Ckb5EDBUNJdFWyajfXzUIMRkhf52fHZOQuuZg/oiu8y7zDCVwD0iHhew6MnThjHmevanpxL3f5ci2TtHQEN6bw==" + }, + "Microsoft.Extensions.Caching.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "bcz5sSFJbganH0+YrfvIjJDIcKNW7TL07C4d1eTmXy/wOt52iz4LVogJb6pazs7W0+74j0YpXFErvp++Aq5Bsw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "B4y+Cev05eMcjf1na0v9gza6GUtahXbtY1JCypIgx3B4Ea/KAgsWyXEmW4q6zMbmTMtKzmPVk09rvFJirvMwTg==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "b3ErKzND8LIC7o08QAVlKfaEIYEvLJbtmVbFZVBRXeu9YkKfSSzLZfR1SUfQPBIy9mKLhEtJgGYImkcMNaKE0A==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.CommandLine": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "3nL1qCkZ1Oxx14ZTzgo4MmlO7tso7F+TtMZAY2jUAtTLyAcDp+EDjk3RqafoKiNaePyPvvlleEcBxh3b2Hzl1g==", + "dependencies": { + "Microsoft.Extensions.Configuration": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.EnvironmentVariables": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "pnyXV1LFOsYjGveuC07xp0YHIyGq7jRq5Ncb5zrrIieMLWVwgMyYxcOH0jTnBedDT4Gh1QinSqsjqzcieHk1og==", + "dependencies": { + "Microsoft.Extensions.Configuration": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.FileExtensions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "V4Dth2cYMZpw3HhGw9XUDIijpI6gN+22LDt0AhufIgOppCUfpWX4483OmN+dFXRJkJLc8Tv0Q8QK+1ingT2+KQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Physical": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.Json": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "GJGery6QytCzS/BxJ96klgG9in3uH26KcUBbiVG/coNDXCRq6LGVVlUT4vXq34KPuM+R2av+LeYdX9h4IZOCUg==", + "dependencies": { + "Microsoft.Extensions.Configuration": "6.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", + "System.Text.Json": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.UserSecrets": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "Fy8yr4V6obi7ZxvKYI1i85jqtwMq8tqyxQVZpRSkgeA8enqy/KvBIMdcuNdznlxQMZa72mvbHqb7vbg4Pyx95w==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.Configuration.Json": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Physical": "6.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Physical": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "QvkL7l0nM8udt3gfyu0Vw8bbCXblxaKOl7c2oBfgGy4LCURRaL9XWZX1FWJrQc43oMokVneVxH38iz+bY1sbhg==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.FileSystemGlobbing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" + }, + "Microsoft.Extensions.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + }, + "Microsoft.Extensions.Logging.Configuration": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "ZDskjagmBAbv+K8rYW9VhjPplhbOE63xUD0DiuydZJwt15dRyoqicYklLd86zzeintUc7AptDkHn+YhhYkYo8A==", + "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.Logging.Debug": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "M9g/JixseSZATJE9tcMn9uzoD4+DbSglivFqVx8YkRJ7VVPmnvCEbOZ0AAaxsL1EKyI4cz07DXOOJExxNsUOHw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.EventLog": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "rlo0RxlMd0WtLG3CHI0qOTp6fFn7MvQjlrCjucA31RqmiMFCZkF8CHNbe8O7tbBIyyoLGWB1he9CbaA5iyHthg==", + "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", + "System.Diagnostics.EventLog": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.EventSource": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "BeDyyqt7nkm/nr+Gdk+L8n1tUT/u33VkbXAOesgYSNsxDM9hJ1NOBGoZfj9rCbeD2+9myElI6JOVVFmnzgeWQA==", + "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.Primitives": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "6.0.0" + } + }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "bXWINbTn0vC0FYc9GaQTISbxhQLAMrvtbuvD9N6JelEaIS/Pr62wUCinrq5bf1WRBGczt1v4wDhxFtVFNcMdUQ==", + "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.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.3", + "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + }, + "Microsoft.OpenApi": { + "type": "Transitive", + "resolved": "1.2.3", + "contentHash": "Nug3rO+7Kl5/SBAadzSMAVgqDlfGjJZ0GenQrLywJ84XGKO0uRqkunz5Wyl0SDwcR71bAATXvSdbdzPrYRYKGw==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "Minio": { + "type": "Transitive", + "resolved": "4.0.4", + "contentHash": "nd8cZhmS8DxUQ9WRY1bxeerdYm6TiJxMOSEpyRVUgeg+O9Kig+e5soBswkKMBECND3Iew3Wt4gcfFtSrK/SgMw==", + "dependencies": { + "Crc32.NET": "1.2.0", + "Microsoft.CSharp": "4.7.0", + "Newtonsoft.Json": "13.0.1", + "System.Net.Http": "4.3.4", + "System.Net.Primitives": "4.3.1", + "System.Reactive.Linq": "5.0.0", + "System.ValueTuple": "4.4.0" + } + }, + "Monai.Deploy.Storage": { + "type": "Transitive", + "resolved": "0.2.0-rc0014", + "contentHash": "PC+zwr7VZBvU701GefZ297b98gdJaHlJQZ0altXvUGyzh1tLMpRdjdqZ1gMB5QzYwWkdS3u7wp6MOnJdzebkDw==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.165", + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0014", + "System.IO.Abstractions": "17.0.18" + } + }, + "Monai.Deploy.Storage.S3Policy": { + "type": "Transitive", + "resolved": "0.2.0-rc0014", + "contentHash": "ClEa022hoQhw/74rUfO+p5OrZ0suk8Ehj3jT7HcfAhjSQiMOTrYVfnCxeW2QxyJa/TeIrmQjd1H2f50hZ8RPXQ==", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Newtonsoft.Json": "13.0.1" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "2.17.0", + "contentHash": "wGUX8GMQ0DYG68u1ENAUtJTx6cmQTt6/BfMjqB+Q+aWu2ZkBZ09mA1QbBU5mcbVqulF5U72bGzxChtjYxaS9Dg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "MongoDB.Driver": { + "type": "Transitive", + "resolved": "2.17.0", + "contentHash": "NFqjuDNrGNGEsblqoKBoOSUU8vx1UbZjKP3nVhxhGnK9p8ef0t3fyPcjxmYbO5vdFpDQw2A0Ly4dPzyRW3QEug==", + "dependencies": { + "MongoDB.Bson": "2.17.0", + "MongoDB.Driver.Core": "2.17.0", + "MongoDB.Libmongocrypt": "1.5.4" + } + }, + "MongoDB.Driver.Core": { + "type": "Transitive", + "resolved": "2.17.0", + "contentHash": "bQLdFZNywlApJ5H5KnFXxGik3dZ/VOIUQ7YQniZd9eNmNZFEwEMr+/yoCJ8FigyzOd7iKYOLpmUWGwG2M2e2aQ==", + "dependencies": { + "DnsClient": "1.6.1", + "MongoDB.Bson": "2.17.0", + "MongoDB.Libmongocrypt": "1.5.4", + "SharpCompress": "0.30.1", + "System.Buffers": "4.5.1" + } + }, + "MongoDB.Libmongocrypt": { + "type": "Transitive", + "resolved": "1.5.4", + "contentHash": "JQrfonPIGey2n38tYmhkYOjmoHeGCwvbEru/G7zciYcx198neZerSPylIt6kTGtpGQDMhjCg0Nvt9eCBm6TWZQ==" + }, + "NETStandard.Library": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Newtonsoft.Json.Bson": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "QYFyxhaABwmq3p/21VrZNYvCg3DaEoN/wUuw5nmfAf0X3HLjgupwhkEWdgfb9nvGAUIv3osmZoD3kKl4jxEmYQ==", + "dependencies": { + "Newtonsoft.Json": "12.0.1" + } + }, + "RabbitMQ.Client": { + "type": "Transitive", + "resolved": "6.4.0", + "contentHash": "1znR1gGU+xYVSpO5z8nQolcUKA/yydnxQn7Ug9+RUXxTSLMm/eE58VKGwahPBjELXvDnX0k/kBrAitFLRjx9LA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Threading.Channels": "4.7.1" + } + }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + }, + "Swashbuckle.AspNetCore.Swagger": { + "type": "Transitive", + "resolved": "6.4.0", + "contentHash": "nl4SBgGM+cmthUcpwO/w1lUjevdDHAqRvfUoe4Xp/Uvuzt9mzGUwyFCqa3ODBAcZYBiFoKvrYwz0rabslJvSmQ==", + "dependencies": { + "Microsoft.OpenApi": "1.2.3" + } + }, + "Swashbuckle.AspNetCore.SwaggerGen": { + "type": "Transitive", + "resolved": "6.4.0", + "contentHash": "lXhcUBVqKrPFAQF7e/ZeDfb5PMgE8n5t6L5B6/BQSpiwxgHzmBcx8Msu42zLYFTvR5PIqE9Q9lZvSQAcwCxJjw==", + "dependencies": { + "Swashbuckle.AspNetCore.Swagger": "6.4.0" + } + }, + "Swashbuckle.AspNetCore.SwaggerUI": { + "type": "Transitive", + "resolved": "6.4.0", + "contentHash": "1Hh3atb3pi8c+v7n4/3N80Jj8RvLOXgWxzix6w3OZhB7zBGRwsy7FWr4e3hwgPweSBpwfElqj4V4nkjYabH9nQ==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" + }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw==" + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.Abstractions": { + "type": "Transitive", + "resolved": "17.0.24", + "contentHash": "hA7bacntMiZv1Yf9xtjwl/GP3GT1mG84QxhAk7ijAUD0pJhJaVVwXScE13vMpXnNtlaRDW6SeyZdWg2j2qrh4w==" + }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Linq": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.DiagnosticSource": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.Net.Primitives": "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.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "System.Net.Primitives": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "OHzPhSme78BbmLe9UBxHM69ZYjClS5URuhce6Ta4ikiLgaUGiG/X84fZpI6zy7CsUH5R9cYzI2tv9dWPqdTkUg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3", + "System.Runtime": "4.3.1", + "System.Runtime.Handles": "4.3.0" + } + }, + "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" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.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.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "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", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "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.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "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.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.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.Runtime.Numerics": "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", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "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.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" + }, + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ==" + }, + "monai.deploy.workflowmanager.common": { + "type": "Project", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + } + }, + "monai.deploy.workflowmanager.conditionsresolver": { + "type": "Project", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + } + }, + "monai.deploy.workflowmanager.configuration": { + "type": "Project", + "dependencies": { + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Storage": "0.2.0-rc0014", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.0.24" + } + }, + "monai.deploy.workflowmanager.contracts": { + "type": "Project", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.176", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "MongoDB.Bson": "2.17.0", + "Newtonsoft.Json": "13.0.1" + } + }, + "monai.deploy.workflowmanager.database": { + "type": "Project", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "MongoDB.Bson": "2.17.0", + "MongoDB.Driver": "2.17.0" + } + }, + "monai.deploy.workflowmanager.logging": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" + } + }, + "monai.deploy.workflowmanager.payloadlistener": { + "type": "Project", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Storage": "0.2.0-rc0014", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" + } + }, + "monai.deploy.workflowmanager.storage": { + "type": "Project", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Storage": "0.2.0-rc0014", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0" + } + }, + "monai.deploy.workloadmanager.workfowexecuter": { + "type": "Project", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.176", + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Storage": "0.2.0-rc0014", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0", + "Newtonsoft.Json": "13.0.1" + } + } + } + } +} \ No newline at end of file diff --git a/src/WorkflowManager/stylecop.json b/src/WorkflowManager/WorkflowManager/stylecop.json similarity index 100% rename from src/WorkflowManager/stylecop.json rename to src/WorkflowManager/WorkflowManager/stylecop.json diff --git a/src/WorkflowManager/packages.lock.json b/src/WorkflowManager/packages.lock.json index 4faac74d6..5bca265d3 100644 --- a/src/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/packages.lock.json @@ -1457,15 +1457,18 @@ "monai.deploy.workflowmanager.taskmanager": { "type": "Project", "dependencies": { + "Karambolo.Extensions.Logging.File": "3.3.1", "Microsoft.Extensions.Hosting": "6.0.1", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Console": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.2.0-rc0014", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.Storage.MinIO": "0.2.0-rc0014", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", + "Monai.Deploy.WorkflowManager.TaskManager.Argo": "1.0.0", + "Monai.Deploy.WorkflowManager.TaskManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.Database": "1.0.0" } }, @@ -1473,7 +1476,6 @@ "type": "Project", "dependencies": { "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0" } }, @@ -1492,11 +1494,13 @@ "KubernetesClient": "7.2.19", "Monai.Deploy.Messaging": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.2.0-rc0014", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", "Newtonsoft.Json": "13.0.1" } }, + "monai.deploy.workflowmanager.taskmanager.common": { + "type": "Project" + }, "monai.deploy.workflowmanager.taskmanager.database": { "type": "Project", "dependencies": { @@ -1504,7 +1508,6 @@ "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", "MongoDB.Bson": "2.17.0", "MongoDB.Driver": "2.17.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 13573bf27..8d7434426 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -42,7 +42,9 @@ - + + + diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs index 5538df9f9..9d41fd0dd 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs @@ -29,13 +29,9 @@ using Monai.Deploy.Storage; using Monai.Deploy.Storage.Configuration; using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Database.Interfaces; -using Monai.Deploy.WorkflowManager.Database.Options; -using Monai.Deploy.WorkflowManager.Database.Repositories; -using Monai.Deploy.WorkflowManager.Services; -using Monai.Deploy.WorkflowManager.Services.DataRetentionService; -using Monai.Deploy.WorkflowManager.Services.Http; +using Monai.Deploy.WorkflowManager.TaskManager.Extensions; using Monai.Deploy.WorkflowManager.TaskManager.Database; +using Monai.Deploy.WorkflowManager.TaskManager.Database.Options; using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests; using MongoDB.Driver; @@ -76,21 +72,13 @@ private static IHostBuilder CreateHostBuilder() => services.AddSingleton(); - services.AddSingleton(); - - services.AddHostedService(p => p.GetService()); - // Services services.AddTransient(); services.AddHttpClient(); // Mongo DB - services.Configure(hostContext.Configuration.GetSection("WorkloadManagerDatabase")); services.Configure(hostContext.Configuration.GetSection("WorkloadManagerDatabase")); services.AddSingleton(s => new MongoClient(hostContext.Configuration["WorkloadManagerDatabase:ConnectionString"])); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); services.AddTransient(); // StorageService @@ -100,15 +88,8 @@ private static IHostBuilder CreateHostBuilder() => services.AddMonaiDeployMessageBrokerPublisherService(hostContext.Configuration.GetSection("WorkflowManager:messaging:publisherServiceAssemblyName").Value); services.AddMonaiDeployMessageBrokerSubscriberService(hostContext.Configuration.GetSection("WorkflowManager:messaging:subscriberServiceAssemblyName").Value); - services.AddHostedService(p => p.GetService()); - services.AddTaskManager(hostContext); - }) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.CaptureStartupErrors(true); - webBuilder.UseStartup(); - }); + }); public static IHost StartTaskManager() { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/appsettings.Test.json b/tests/IntegrationTests/TaskManager.IntegrationTests/appsettings.Test.json index 4b81d5330..bfb602be9 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/appsettings.Test.json +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/appsettings.Test.json @@ -91,7 +91,7 @@ "MaxFileSize": 10485760, "IncludeScopes": true, "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager", + "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", "Files": [ { "Path": "MWM--.log" 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 1db068535..bb4fe402c 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj @@ -54,7 +54,7 @@ - + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/appsettings.Test.json b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/appsettings.Test.json index cfc03b3da..14b1ab8e9 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/appsettings.Test.json +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/appsettings.Test.json @@ -90,7 +90,7 @@ "MaxFileSize": 10485760, "IncludeScopes": true, "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager", + "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", "Files": [ { "Path": "MWM--.log" diff --git a/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj b/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj deleted file mode 100644 index 6656efaf7..000000000 --- a/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - net6.0 - Monai.Deploy.WorkflowManager.CLI.Test - - false - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - true - true - true - - diff --git a/tests/UnitTests/CLI.Tests/packages.lock.json b/tests/UnitTests/CLI.Tests/packages.lock.json deleted file mode 100644 index 9d14e64bf..000000000 --- a/tests/UnitTests/CLI.Tests/packages.lock.json +++ /dev/null @@ -1,1099 +0,0 @@ -{ - "version": 1, - "dependencies": { - "net6.0": { - "coverlet.collector": { - "type": "Direct", - "requested": "[3.1.2, )", - "resolved": "3.1.2", - "contentHash": "wuLDIDKD5XMt0A7lE31JPenT7QQwZPFkP5rRpdJeblyXZ9MGLI8rYjvm5fvAKln+2/X+4IxxQDxBtwdrqKNLZw==" - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[17.2.0, )", - "resolved": "17.2.0", - "contentHash": "kYmkDYbcDd+jNvmMH4TMtgHjsUYbIsWENM2VcjB0X7TawXbehL5I8OIsu2TgFS/nQCgZE94InrqMxrm7WDy+Lw==", - "dependencies": { - "Microsoft.CodeCoverage": "17.2.0", - "Microsoft.TestPlatform.TestHost": "17.2.0" - } - }, - "xunit": { - "type": "Direct", - "requested": "[2.4.1, )", - "resolved": "2.4.1", - "contentHash": "XNR3Yz9QTtec16O0aKcO6+baVNpXmOnPUxDkCY97J+8krUYxPvXT1szYYEUdKk4sB8GOI2YbAjRIOm8ZnXRfzQ==", - "dependencies": { - "xunit.analyzers": "0.10.0", - "xunit.assert": "[2.4.1]", - "xunit.core": "[2.4.1]" - } - }, - "xunit.runner.visualstudio": { - "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "17.2.0", - "contentHash": "MsKhJmwIfHxNDbTIlgQy29UpWSWPpbZOQPhQ7xalRy+ABnl8/neFHZGzSP3XlpW2dKAXHTFrtIcKzW/kopY2Bg==" - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "17h8b5mXa87XYKrrVqdgZ38JefSUqLChUQpXgSnpzsM0nDOhE40FTeNWOJ/YmySGV6tG6T8+hjz6vxbknHJr6A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading": "4.0.11" - } - }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, - "Microsoft.TestPlatform.ObjectModel": { - "type": "Transitive", - "resolved": "17.2.0", - "contentHash": "7j1KYDHLhU98XnCEbECMncXLydI9fNiFLcFsiBsP3lV6EkHOaj5kTPAWHYkKnPGRC9TbZUboSQq8rWI4dTQsxg==", - "dependencies": { - "NuGet.Frameworks": "5.11.0", - "System.Reflection.Metadata": "1.6.0" - } - }, - "Microsoft.TestPlatform.TestHost": { - "type": "Transitive", - "resolved": "17.2.0", - "contentHash": "bI67J+hers241h7eD2eecS02p9CbKcQDIeoRvO4FgMlTWg2ZTzc0D3uWLYr5U+K5x9O1pNmyMoMDbYIeWY/TWw==", - "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.2.0", - "Newtonsoft.Json": "9.0.1" - } - }, - "Microsoft.Win32.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "NETStandard.Library": { - "type": "Transitive", - "resolved": "1.6.1", - "contentHash": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.AppContext": "4.3.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.Compression.ZipFile": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "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.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Runtime.Numerics": "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.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Timer": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0" - } - }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "9.0.1", - "contentHash": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", - "dependencies": { - "Microsoft.CSharp": "4.0.1", - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Text.Encoding": "4.0.11", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Text.RegularExpressions": "4.1.0", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Xml.ReaderWriter": "4.0.11", - "System.Xml.XDocument": "4.0.11" - } - }, - "NuGet.Frameworks": { - "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" - }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==" - }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==" - }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", - "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" - } - }, - "runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==", - "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==" - }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==" - }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==" - }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==" - }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==" - }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" - }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fKC+rmaLfeIzUhagxY17Q9siv/sPrjjKcfNg1Ic8IlQkZLipo8ljcaZQu4VtI4Jqbzjc2VTjzGLF6WmsRXAEgA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Collections.Concurrent": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Console": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DHDrIxiqk1h03m6khKWV2X8p/uvN79rgSqpilL6uzpmSfxfU5ng8VcPtW4qsDsQDHiTv6IPV9TmD5M/vElPNLg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Diagnostics.Debug": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Diagnostics.Tools": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.Tracing": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11" - } - }, - "System.Globalization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Calendars": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.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.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.IO.Compression": "4.3.0" - } - }, - "System.IO.Compression.ZipFile": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==", - "dependencies": { - "System.Buffers": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.IO.FileSystem": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Linq.Expressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "sYg+FtILtRQuYWSIAuNOELwVuVsxVyJGWQyOnlAzhV4xvhyFnON1bAzYYC+jjRW8JREM45R0R5Dgi8MTC5sEwA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.DiagnosticSource": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Net.Primitives": "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.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Net.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Net.Sockets": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "m6icV6TqQOAdgt5N/9I5KNpjom/5NFtkmGseEH+AK/hny8XrytLH3+b5M8zL/Ycg3fhIocFpUMyl/wpFnVRvdw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Resources.ResourceManager": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Runtime.Numerics": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", - "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Runtime.Serialization.Primitives": { - "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "HZ6Du5QrTG8MNJbf4e4qMO3JRAkIboGT5Fk804uZtg3Gq516S7hAqTm2UZKUHa7/6HUGdVy3AqMQKbns06G/cg==", - "dependencies": { - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.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.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "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", - "resolved": "4.3.0", - "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "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.Threading": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "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.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", - "dependencies": { - "System.Collections": "4.3.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.Runtime.Numerics": "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", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "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.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Text.RegularExpressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "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", - "resolved": "4.3.0", - "contentHash": "Z6YfyYTCg7lOZjJzBjONJTFKGN9/NIYKSxhU5GRd+DTwHSZyvWp1xuI5aR+dLg+ayyC5Xv57KiY4oJ0tMO89fQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Xml.ReaderWriter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" - } - }, - "System.Xml.XDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "xunit.abstractions": { - "type": "Transitive", - "resolved": "2.0.3", - "contentHash": "pot1I4YOxlWjIb5jmwvvQNbTrZ3lJQ+jUGkGjWE3hEFM0l5gOnBWS+H3qsex68s5cO52g+44vpGzhAt+42vwKg==" - }, - "xunit.analyzers": { - "type": "Transitive", - "resolved": "0.10.0", - "contentHash": "4/IDFCJfIeg6bix9apmUtIMwvOsiwqdEexeO/R2D4GReIGPLIRODTpId/l4LRSrAJk9lEO3Zx1H0Zx6uohJDNg==" - }, - "xunit.assert": { - "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "O/Oe0BS5RmSsM+LQOb041TzuPo5MdH2Rov+qXGS37X+KFG1Hxz7kopYklM5+1Y+tRGeXrOx5+Xne1RuqLFQoyQ==", - "dependencies": { - "NETStandard.Library": "1.6.1" - } - }, - "xunit.core": { - "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "Zsj5OMU6JasNGERXZy8s72+pcheG6Q15atS5XpZXqAtULuyQiQ6XNnUsp1gyfC6WgqScqMvySiEHmHcOG6Eg0Q==", - "dependencies": { - "xunit.extensibility.core": "[2.4.1]", - "xunit.extensibility.execution": "[2.4.1]" - } - }, - "xunit.extensibility.core": { - "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "yKZKm/8QNZnBnGZFD9SewkllHBiK0DThybQD/G4PiAmQjKtEZyHi6ET70QPU9KtSMJGRYS6Syk7EyR2EVDU4Kg==", - "dependencies": { - "NETStandard.Library": "1.6.1", - "xunit.abstractions": "2.0.3" - } - }, - "xunit.extensibility.execution": { - "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "7e/1jqBpcb7frLkB6XDrHCGXAbKN4Rtdb88epYxCSRQuZDRW8UtTfdTEVpdTl8s4T56e07hOBVd4G0OdCxIY2A==", - "dependencies": { - "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.1]" - } - } - } - } -} \ No newline at end of file diff --git a/tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj b/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj similarity index 93% rename from tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj rename to tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj index d0e6cd398..1773edec8 100644 --- a/tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj +++ b/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj @@ -40,7 +40,7 @@ - + diff --git a/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManger.Common.Tests.csproj b/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManger.Common.Tests.csproj deleted file mode 100644 index 0706ef165..000000000 --- a/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManger.Common.Tests.csproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - net6.0 - enable - enable - - false - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - diff --git a/tests/UnitTests/WorkflowManager.Common.Tests/Services/PayloadServiceTests.cs b/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs similarity index 100% rename from tests/UnitTests/WorkflowManager.Common.Tests/Services/PayloadServiceTests.cs rename to tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs diff --git a/tests/UnitTests/WorkflowManager.Common.Tests/Services/TasksServiceTests.cs b/tests/UnitTests/Common.Tests/Services/TasksServiceTests.cs similarity index 100% rename from tests/UnitTests/WorkflowManager.Common.Tests/Services/TasksServiceTests.cs rename to tests/UnitTests/Common.Tests/Services/TasksServiceTests.cs diff --git a/tests/UnitTests/WorkflowManager.Common.Tests/StorageListExtensionsTests.cs b/tests/UnitTests/Common.Tests/StorageListExtensionsTests.cs similarity index 100% rename from tests/UnitTests/WorkflowManager.Common.Tests/StorageListExtensionsTests.cs rename to tests/UnitTests/Common.Tests/StorageListExtensionsTests.cs 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 90fb21f7e..1c923b063 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj +++ b/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj @@ -37,7 +37,7 @@ - + diff --git a/tests/UnitTests/WorkflowManager.Tests/Logging/FileLoggingTextFormatterTest.cs b/tests/UnitTests/Configuration.Tests/Logging/FileLoggingTextFormatterTest.cs similarity index 97% rename from tests/UnitTests/WorkflowManager.Tests/Logging/FileLoggingTextFormatterTest.cs rename to tests/UnitTests/Configuration.Tests/Logging/FileLoggingTextFormatterTest.cs index a546745e0..6a9251539 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Logging/FileLoggingTextFormatterTest.cs +++ b/tests/UnitTests/Configuration.Tests/Logging/FileLoggingTextFormatterTest.cs @@ -18,7 +18,7 @@ using System.Globalization; using System.Text; using Microsoft.Extensions.Logging; -using Monai.Deploy.WorkflowManager.Logging; +using Monai.Deploy.WorkflowManager.Configuration.Logging; using Xunit; namespace Monai.Deploy.WorkflowManager.Test.Logging 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 e9e1fbbfe..ffd277dcb 100644 --- a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj +++ b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj @@ -40,7 +40,7 @@ - + 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 4ac214a64..625e621f1 100644 --- a/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj +++ b/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj @@ -38,7 +38,7 @@ - + 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 ee9509da2..3dd270834 100644 --- a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj +++ b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj @@ -36,7 +36,7 @@ - + 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 0fe4f30e9..851fb4fd1 100644 --- a/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj +++ b/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj @@ -39,7 +39,7 @@ - + diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs index 66dd66412..ffe83d737 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs @@ -30,9 +30,7 @@ using Microsoft.Extensions.Options; using Monai.Deploy.Messaging.Configuration; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Common.Interfaces; using Monai.Deploy.WorkflowManager.SharedTest; -using Monai.Deploy.WorkflowManager.Storage.Services; using Monai.Deploy.WorkflowManager.TaskManager.API; using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues; using Moq; @@ -64,11 +62,6 @@ public ArgoPluginTest() _argoClient = new Mock(); _kubernetesClient = new Mock(); - var dicomService = new Mock(); - var workflowInstanceService = new Mock(); - var workflowService = new Mock(); - var payloadService = new Mock(); - _options = Options.Create(new MessageBrokerServiceConfiguration()); _options.Value.PublisherSettings.Add("username", "username"); _options.Value.PublisherSettings.Add("password", "password"); 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 10c60d231..6e9e1aa78 100644 --- a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj +++ b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj @@ -41,7 +41,7 @@ - + diff --git a/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs b/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs index b32f9e1a3..0c01f4f07 100644 --- a/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs +++ b/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs @@ -29,7 +29,6 @@ using Monai.Deploy.Storage.S3Policy.Policies; using Monai.Deploy.TaskManager.API; using Monai.Deploy.WorkflowManager.Configuration; -using Monai.Deploy.WorkflowManager.Contracts.Rest; using Monai.Deploy.WorkflowManager.TaskManager.API; using Moq; using Xunit; 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 7e01e82fa..3dcb50d35 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj +++ b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj @@ -39,7 +39,7 @@ - + diff --git a/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj b/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj index ca066e72c..94a99c1f7 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj +++ b/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj @@ -42,12 +42,11 @@ - - + diff --git a/tests/UnitTests/WorkflowManager.Tests/appsettings.json b/tests/UnitTests/WorkflowManager.Tests/appsettings.json index de741290e..a48885c83 100644 --- a/tests/UnitTests/WorkflowManager.Tests/appsettings.json +++ b/tests/UnitTests/WorkflowManager.Tests/appsettings.json @@ -88,7 +88,7 @@ "MaxFileSize": 10485760, "IncludeScopes": true, "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager", + "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", "Files": [ { "Path": "MWM--.log" diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 72ef63431..780ec2c00 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -98,15 +98,6 @@ "System.ComponentModel.Annotations": "4.3.0" } }, - "AutoMapper": { - "type": "Transitive", - "resolved": "10.1.1", - "contentHash": "uMgbqOdu9ZG5cIOty0C85hzzayBH2i9BthnS5FlMqKtMSHDv4ts81a2jS1VFaDBVhlBeIqJ/kQKjQY95BZde9w==", - "dependencies": { - "Microsoft.CSharp": "4.7.0", - "System.Reflection.Emit": "4.7.0" - } - }, "AWSSDK.Core": { "type": "Transitive", "resolved": "3.7.12.11", @@ -152,28 +143,6 @@ "NETStandard.Library": "1.6.1" } }, - "Fractions": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "1uv2IqQ6AsLtrcsibOTEyyHLQpxgjONssPrI0Ug84AIuSVqVDcotaNkTaJTprFvxbCNi7Kp/3WAAtnytuQP3qQ==", - "dependencies": { - "System.Runtime.Numerics": "4.3.0" - } - }, - "IdentityModel": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "nuhkbaDH9l5QzNJp2MtP3qio57MPtiRneUN8Ocr7od0JvSYaIe3gBj/vxllr11S/Qvu1AG4GZXoyv5469ewYDA==" - }, - "IdentityModel.OidcClient": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "4KTG0+M3UBxr0UraGo8MfqEGT9MeMDtaBvPyZccmwW+JH+UG3psW5IVITKgobpgWmK+OKoE2FQQ4XBlaLfyCyw==", - "dependencies": { - "IdentityModel": "5.2.0", - "Microsoft.Extensions.Logging": "6.0.0" - } - }, "JetBrains.Annotations": { "type": "Transitive", "resolved": "2021.3.0", @@ -190,38 +159,6 @@ "System.Threading.Channels": "4.7.1" } }, - "KubernetesClient": { - "type": "Transitive", - "resolved": "7.2.19", - "contentHash": "wycP/ApzjNToo6N0is0cDVK6m282MOXSlJDaZPmMibpdgZf2MKjS289MRUIXz3+Syftu4zsqlinDMGbmi5Xjog==", - "dependencies": { - "IdentityModel.OidcClient": "4.0.0", - "KubernetesClient.Basic": "7.2.19", - "KubernetesClient.Models": "7.2.19", - "System.IO.Abstractions": "13.2.47", - "System.IdentityModel.Tokens.Jwt": "6.13.1", - "prometheus-net": "5.0.1" - } - }, - "KubernetesClient.Basic": { - "type": "Transitive", - "resolved": "7.2.19", - "contentHash": "1LboFwnEg9gxB8gF9BqaS8gnNVetqRGS9XWyVMlzAxpeYaTF5mNCoj4OCZyLj8Ogo0kdrASjG9qOjozpQDWZlg==", - "dependencies": { - "KubernetesClient.Models": "7.2.19" - } - }, - "KubernetesClient.Models": { - "type": "Transitive", - "resolved": "7.2.19", - "contentHash": "ekEK90+eJTKN1KzW7kFcJofSjv3X+Q4MhLxAZdgn7pTCJg0qk4/FhV8sYJ/ZMw20Ue5Rob3vAw9WROHZaLNIdQ==", - "dependencies": { - "AutoMapper": "10.1.1", - "Fractions": "7.0.0", - "System.Text.Json": "6.0.2", - "YamlDotNet": "11.2.1" - } - }, "Microsoft.AspNetCore.JsonPatch": { "type": "Transitive", "resolved": "6.0.7", @@ -486,16 +423,6 @@ "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" } }, - "Microsoft.Extensions.Http": { - "type": "Transitive", - "resolved": "3.1.9", - "contentHash": "sRyrkBJGS+8ucKak+RmAPkAiIm6amA5ztpIkp0zrPn5+kDX2j8XJdRARr4Eh003RIGQxzvNGQ+j/voAhlPoXyw==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.9", - "Microsoft.Extensions.Logging": "3.1.9", - "Microsoft.Extensions.Options": "3.1.9" - } - }, "Microsoft.Extensions.Logging": { "type": "Transitive", "resolved": "6.0.0", @@ -601,29 +528,6 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.13.1", - "contentHash": "seLGCIo8bDz93PGgKY9vV4PAHpu1iXwH4Xm6O+HOJbIcnpiJz4f4C/MVFKfOb+yKGMtix2qyFkQMKOdVmArn0Q==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.13.1" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.13.1", - "contentHash": "pUr0kicIy3cNgrapB7old+N+OithDcowO/uqOg/z9dMC8u25/1YS7QirJWKi/0z31fBOE/uEFBHfSfnRCKRxsA==" - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.13.1", - "contentHash": "tUTbP9/wMuOGDiTBPXEN24M9rVAEJ8EOvk4pwoo5UKRNUK3bAZYqkzFpcgNOAY3PHHjwZJ2stk4Gf5jvspz0yg==", - "dependencies": { - "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.13.1", - "System.Security.Cryptography.Cng": "4.5.0" - } - }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", @@ -799,14 +703,6 @@ "resolved": "5.11.0", "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" }, - "prometheus-net": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "tg+vGeKCUqaWPzHAuKI87/rqQD4RKjb/jlRqSPaAdGRFd/SFDFRHPE8Rcy5Rx2f4xqdR+s3qTQ/0Y/IHbI3D1Q==", - "dependencies": { - "Microsoft.Extensions.Http": "3.1.9" - } - }, "RabbitMQ.Client": { "type": "Transitive", "resolved": "6.4.0", @@ -1071,15 +967,6 @@ "System.Runtime.InteropServices": "4.3.0" } }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.13.1", - "contentHash": "BTVPnmvqpKxv+ucl3Ii7HnRVvXvfm/P5iq3rnTnJ0YuneZUS7zGtE+DRrVQWSd431ntjZuHBGPbjaB+nCSq9Uw==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.13.1", - "Microsoft.IdentityModel.Tokens": "6.13.1" - } - }, "System.IO": { "type": "Transitive", "resolved": "4.3.0", @@ -1212,11 +1099,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ==" - }, "System.Reflection.Metadata": { "type": "Transitive", "resolved": "1.6.0", @@ -1334,8 +1216,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", @@ -1472,8 +1367,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "0nE2gwXLn3PTBOPwORLqwuYvWB+Beomt9ZBX+6LmogMNKUvfD1SoDb/ycB1vBntT94rGaB/SvxEyeLu14H6aEg==", + "resolved": "6.0.0", + "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1558,11 +1453,6 @@ "xunit.extensibility.core": "[2.4.1]" } }, - "YamlDotNet": { - "type": "Transitive", - "resolved": "11.2.1", - "contentHash": "tBt8K+korVfrjH9wyDEhiLKxbs8qoLCLIFwvYgkSUuMC9//w3z0cFQ8LQAI/5MCKq+BMil0cfRTRvPeE7eXhQw==" - }, "monai.deploy.workflowmanager": { "type": "Project", "dependencies": { @@ -1586,11 +1476,6 @@ "Monai.Deploy.WorkflowManager.Database": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "Monai.Deploy.WorkflowManager.PayloadListener": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.Argo": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.TestPlugin": "1.0.0", "Newtonsoft.Json": "13.0.1", "Swashbuckle.AspNetCore": "6.4.0" } @@ -1618,7 +1503,9 @@ "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { + "Karambolo.Extensions.Logging.File": "3.3.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.2.0-rc0014", @@ -1679,68 +1566,6 @@ "Monai.Deploy.WorkflowManager.Logging": "1.0.0" } }, - "monai.deploy.workflowmanager.taskmanager": { - "type": "Project", - "dependencies": { - "Microsoft.Extensions.Hosting": "6.0.1", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Storage": "0.2.0-rc0014", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.Database": "1.0.0" - } - }, - "monai.deploy.workflowmanager.taskmanager.aideclinicalreview": { - "type": "Project", - "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0" - } - }, - "monai.deploy.workflowmanager.taskmanager.api": { - "type": "Project", - "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Storage": "0.2.0-rc0014", - "MongoDB.Bson": "2.17.0" - } - }, - "monai.deploy.workflowmanager.taskmanager.argo": { - "type": "Project", - "dependencies": { - "IdentityModel.OidcClient": "5.0.0", - "KubernetesClient": "7.2.19", - "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Storage": "0.2.0-rc0014", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", - "Newtonsoft.Json": "13.0.1" - } - }, - "monai.deploy.workflowmanager.taskmanager.database": { - "type": "Project", - "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", - "MongoDB.Bson": "2.17.0", - "MongoDB.Driver": "2.17.0" - } - }, - "monai.deploy.workflowmanager.taskmanager.testplugin": { - "type": "Project", - "dependencies": { - "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0" - } - }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": {