diff --git a/.github/.gitversion.yml b/.github/.gitversion.yml index 39273af73..dd610fcfd 100644 --- a/.github/.gitversion.yml +++ b/.github/.gitversion.yml @@ -29,4 +29,4 @@ branches: ignore: sha: [] merge-message-formats: {} -next-version: 0.3.4 +next-version: 0.3.5 diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 298ecb4cc..b0f7f4063 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -93,7 +93,7 @@ - - :approve - Gherkin - :who: mocsharp - :why: MIT (https://github.com/cucumber/common/raw/main/LICENSE) + :why: MIT (https://github.com/cucumber/gherkin/raw/main/LICENSE) :versions: - 19.0.3 :when: 2022-08-16 23:05:34.184272525 Z @@ -326,63 +326,63 @@ - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.11 + - 6.0.12 :when: 2022-08-16 23:05:49.698463427 Z - - :approve - Microsoft.EntityFrameworkCore - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.11 + - 6.0.12 :when: 2022-08-16 23:05:50.137694970 Z - - :approve - Microsoft.EntityFrameworkCore.Abstractions - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.11 + - 6.0.12 :when: 2022-08-16 23:05:51.008105271 Z - - :approve - Microsoft.EntityFrameworkCore.Analyzers - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.11 + - 6.0.12 :when: 2022-08-16 23:05:51.445711308 Z - - :approve - Microsoft.EntityFrameworkCore.Design - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.11 + - 6.0.12 :when: 2022-08-16 23:05:51.922790944 Z - - :approve - Microsoft.EntityFrameworkCore.InMemory - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.11 + - 6.0.12 :when: 2022-08-16 23:05:52.375150938 Z - - :approve - Microsoft.EntityFrameworkCore.Relational - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.11 + - 6.0.12 :when: 2022-08-16 23:05:52.828879230 Z - - :approve - Microsoft.EntityFrameworkCore.Sqlite - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.11 + - 6.0.12 :when: 2022-08-16 23:05:53.270526921 Z - - :approve - Microsoft.EntityFrameworkCore.Sqlite.Core - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) :versions: - - 6.0.11 + - 6.0.12 :when: 2022-08-16 23:05:53.706997823 Z - - :approve - Microsoft.Extensions.ApiDescription.Server @@ -787,42 +787,42 @@ - :who: neilsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - - 0.1.18 + - 0.1.19 :when: 2022-08-16 23:06:21.051573547 Z - - :approve - Monai.Deploy.Messaging.RabbitMQ - :who: neilsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - - 0.1.18 + - 0.1.19 :when: 2022-08-16 23:06:21.511789690 Z - - :approve - Monai.Deploy.Storage - :who: mocsharp :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-storage/raw/main/LICENSE) :versions: - - 0.2.11 + - 0.2.13 :when: 2022-08-16 23:06:21.988183476 Z - - :approve - Monai.Deploy.Storage.MinIO - :who: mocsharp :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-storage/raw/main/LICENSE) :versions: - - 0.2.11 + - 0.2.13 :when: 2022-08-16 23:06:22.426838304 Z - - :approve - Monai.Deploy.Storage.S3Policy - :who: mocsharp :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-storage/raw/main/LICENSE) :versions: - - 0.2.11 + - 0.2.13 :when: 2022-08-16 23:06:22.881956546 Z - - :approve - Monai.Deploy.Security - :who: mocsharp :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-security/raw/develop/LICENSE) :versions: - - 0.1.1 + - 0.1.3 :when: 2022-08-16 23:06:21.051573547 Z - - :approve - Moq @@ -836,7 +836,7 @@ - :who: mocsharp :why: BSD 3-Clause License ( https://raw.githubusercontent.com/moq/moq4/main/License.txt) :versions: - - 4.18.2 + - 4.18.3 :when: 2022-08-16 23:06:23.843184482 Z - - :approve - NETStandard.Library @@ -901,28 +901,28 @@ - :who: mocsharp :why: Apache-2.0 (https://github.com/ericsink/SQLitePCL.raw/raw/master/LICENSE.TXT) :versions: - - 2.0.6 + - 2.1.2 :when: 2022-08-16 23:06:29.241291848 Z - - :approve - SQLitePCLRaw.core - :who: mocsharp :why: Apache-2.0 (https://github.com/ericsink/SQLitePCL.raw/raw/master/LICENSE.TXT) :versions: - - 2.0.6 + - 2.1.2 :when: 2022-08-16 23:06:29.688111783 Z - - :approve - SQLitePCLRaw.lib.e_sqlite3 - :who: mocsharp :why: Apache-2.0 (https://github.com/ericsink/SQLitePCL.raw/raw/master/LICENSE.TXT) :versions: - - 2.0.6 + - 2.1.2 :when: 2022-08-16 23:06:30.132403902 Z - - :approve - SQLitePCLRaw.provider.e_sqlite3 - :who: mocsharp :why: Apache-2.0 (https://github.com/ericsink/SQLitePCL.raw/raw/master/LICENSE.TXT) :versions: - - 2.0.6 + - 2.1.2 :when: 2022-08-16 23:06:30.585184235 Z - - :approve - SharpZipLib @@ -1220,32 +1220,18 @@ - 4.3.0 :when: 2022-08-16 23:06:49.709349587 Z - - :approve - - TestableIO.System.IO.Abstractions + - System.IO.Abstractions - :who: mocsharp :why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) :versions: - - 18.0.1 - :when: 2022-08-16 23:06:50.602318269 Z -- - :approve - - TestableIO.System.IO.Abstractions.Extensions - - :who: mocsharp - :why: MIT (https://github.com/TestableIO/System.IO.Abstractions.Extensions/raw/main/LICENSE.md) - :versions: - - 1.0.34 + - 17.2.3 :when: 2022-08-16 23:06:50.602318269 Z - - :approve - - TestableIO.System.IO.Abstractions.TestingHelpers + - System.IO.Abstractions.TestingHelpers - :who: mocsharp :why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) :versions: - - 18.0.1 - :when: 2022-08-16 23:06:51.524564913 Z -- - :approve - - TestableIO.System.IO.Abstractions.Wrappers - - :who: mocsharp - :why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) - :versions: - - 18.0.1 + - 17.2.3 :when: 2022-08-16 23:06:51.524564913 Z - - :approve - System.IO.Compression @@ -2496,3 +2482,11 @@ :versions: - 6.10.0 :when: 2022-10-14 23:37:56.206982078 Z +- - :approve + - AspNetCore.HealthChecks.MongoDb + - :who: mocsharp + :why: Apache-2.0 (https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/raw/master/LICENSE) + :versions: + - 6.0.2 + :when: 2022-12-08 23:37:56.206982078 Z + diff --git a/docs/changelog.md b/docs/changelog.md index ecefdc3d3..a6ac1ce42 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -17,13 +17,34 @@ # Changelog +## 0.3.6 + +[GitHub Milestone 0.3.6](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/12) + +- Adds support for basic auth with Monai.Deploy.Security 0.1.3. +- Updates APIs to store the username of the person who initiated the calls. +- Fixes database health checks not using the configured database. + +## 0.3.5 + +[GitHub Milestone 0.3.6](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/11) + +- Integrates Monai.Deploy.Security to enable OpenID Connect for API authentication. +- Records DICOM association information in the database. + +## 0.3.4 + +[GitHub Milestone 0.3.4](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/10) + +- Adds support for MongoDB in addition to SQLite. +- Improves validation for AE Title, IP address, and host/domain names. ## 0.3.3 [GitHub Milestone 0.3.3](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/9) - Ability to create storage buckets on startup -- Include logging scope values for LogStash +- Includes logging scope values for LogStash ## 0.3.2 @@ -47,7 +68,7 @@ - New [C-ECHO API](api/rest/config.md) to perform a DICOM C-ECHO to a configured DICOM destination. - The SCU AE Title is now uppercase MONAISCU. -- Update fo-dicom to 5.0.3 +- Updates fo-dicom to 5.0.3 - Defaults temporary storage to use disk with ability to switch to memory. ## 0.3.0 diff --git a/docs/compliance/third-party-licenses.md b/docs/compliance/third-party-licenses.md index ebe01bbef..4bab9e488 100644 --- a/docs/compliance/third-party-licenses.md +++ b/docs/compliance/third-party-licenses.md @@ -1260,13 +1260,13 @@ third-party archives. - Authors: Cucumber Ltd, Gaspar Nagy - Project URL: https://github.com/cucumber/common/tree/main/gherkin - Source: [NuGet](https://www.nuget.org/packages/Gherkin/19.0.3) -- License: [MIT](https://github.com/cucumber/common/raw/main/LICENSE) +- License: [MIT](https://github.com/cucumber/gherkin/raw/main/LICENSE) ``` The MIT License (MIT) -Copyright (c) Cucumber Ltd +Copyright (c) Cucumber Ltd, Gaspar Nagy, Björn Rasmusson, Peter Sergeant Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -1275,16 +1275,16 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. ``` @@ -3158,14 +3158,14 @@ SOFTWARE.
-Microsoft.Data.Sqlite.Core 6.0.11 +Microsoft.Data.Sqlite.Core 6.0.12 ## Microsoft.Data.Sqlite.Core -- Version: 6.0.11 +- Version: 6.0.12 - Authors: Microsoft - Project URL: https://docs.microsoft.com/dotnet/standard/data/sqlite/ -- Source: [NuGet](https://www.nuget.org/packages/Microsoft.Data.Sqlite.Core/6.0.11) +- Source: [NuGet](https://www.nuget.org/packages/Microsoft.Data.Sqlite.Core/6.0.12) - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) @@ -3199,14 +3199,14 @@ SOFTWARE.
-Microsoft.EntityFrameworkCore 6.0.11 +Microsoft.EntityFrameworkCore 6.0.12 ## Microsoft.EntityFrameworkCore -- Version: 6.0.11 +- Version: 6.0.12 - Authors: Microsoft - Project URL: https://docs.microsoft.com/ef/core/ -- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore/6.0.11) +- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore/6.0.12) - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) @@ -3240,14 +3240,14 @@ SOFTWARE.
-Microsoft.EntityFrameworkCore.Abstractions 6.0.11 +Microsoft.EntityFrameworkCore.Abstractions 6.0.12 ## Microsoft.EntityFrameworkCore.Abstractions -- Version: 6.0.11 +- Version: 6.0.12 - Authors: Microsoft - Project URL: https://docs.microsoft.com/ef/core/ -- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Abstractions/6.0.11) +- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Abstractions/6.0.12) - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) @@ -3281,14 +3281,14 @@ SOFTWARE.
-Microsoft.EntityFrameworkCore.Analyzers 6.0.11 +Microsoft.EntityFrameworkCore.Analyzers 6.0.12 ## Microsoft.EntityFrameworkCore.Analyzers -- Version: 6.0.11 +- Version: 6.0.12 - Authors: Microsoft - Project URL: https://docs.microsoft.com/ef/core/ -- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Analyzers/6.0.11) +- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Analyzers/6.0.12) - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) @@ -3322,14 +3322,14 @@ SOFTWARE.
-Microsoft.EntityFrameworkCore.Design 6.0.11 +Microsoft.EntityFrameworkCore.Design 6.0.12 ## Microsoft.EntityFrameworkCore.Design -- Version: 6.0.11 +- Version: 6.0.12 - Authors: Microsoft - Project URL: https://docs.microsoft.com/ef/core/ -- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Design/6.0.11) +- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Design/6.0.12) - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) @@ -3363,14 +3363,14 @@ SOFTWARE.
-Microsoft.EntityFrameworkCore.InMemory 6.0.11 +Microsoft.EntityFrameworkCore.InMemory 6.0.12 ## Microsoft.EntityFrameworkCore.InMemory -- Version: 6.0.11 +- Version: 6.0.12 - Authors: Microsoft - Project URL: https://docs.microsoft.com/ef/core/ -- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.InMemory/6.0.11) +- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.InMemory/6.0.12) - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) @@ -3404,14 +3404,14 @@ SOFTWARE.
-Microsoft.EntityFrameworkCore.Relational 6.0.11 +Microsoft.EntityFrameworkCore.Relational 6.0.12 ## Microsoft.EntityFrameworkCore.Relational -- Version: 6.0.11 +- Version: 6.0.12 - Authors: Microsoft - Project URL: https://docs.microsoft.com/ef/core/ -- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Relational/6.0.11) +- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Relational/6.0.12) - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) @@ -3445,14 +3445,14 @@ SOFTWARE.
-Microsoft.EntityFrameworkCore.Sqlite 6.0.11 +Microsoft.EntityFrameworkCore.Sqlite 6.0.12 ## Microsoft.EntityFrameworkCore.Sqlite -- Version: 6.0.11 +- Version: 6.0.12 - Authors: Microsoft - Project URL: https://docs.microsoft.com/ef/core/ -- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Sqlite/6.0.11) +- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Sqlite/6.0.12) - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) @@ -3486,14 +3486,14 @@ SOFTWARE.
-Microsoft.EntityFrameworkCore.Sqlite.Core 6.0.11 +Microsoft.EntityFrameworkCore.Sqlite.Core 6.0.12 ## Microsoft.EntityFrameworkCore.Sqlite.Core -- Version: 6.0.11 +- Version: 6.0.12 - Authors: Microsoft - Project URL: https://docs.microsoft.com/ef/core/ -- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Sqlite.Core/6.0.11) +- Source: [NuGet](https://www.nuget.org/packages/Microsoft.EntityFrameworkCore.Sqlite.Core/6.0.12) - License: [MIT](https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt) @@ -7044,14 +7044,14 @@ Apache License
-Monai.Deploy.Messaging 0.1.18 +Monai.Deploy.Messaging 0.1.19 ## Monai.Deploy.Messaging -- Version: 0.1.18 +- Version: 0.1.19 - Authors: MONAI Consortium - Project URL: https://github.com/Project-MONAI/monai-deploy-messaging -- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging/0.1.18) +- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging/0.1.19) - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) @@ -7272,14 +7272,14 @@ By downloading this software, you agree to the license terms & all licenses list
-Monai.Deploy.Messaging.RabbitMQ 0.1.18 +Monai.Deploy.Messaging.RabbitMQ 0.1.19 ## Monai.Deploy.Messaging.RabbitMQ -- Version: 0.1.18 +- Version: 0.1.19 - Authors: MONAI Consortium - Project URL: https://github.com/Project-MONAI/monai-deploy-messaging -- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging.RabbitMQ/0.1.18) +- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging.RabbitMQ/0.1.19) - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) @@ -7500,14 +7500,14 @@ By downloading this software, you agree to the license terms & all licenses list
-Monai.Deploy.Security 0.1.1 +Monai.Deploy.Security 0.1.3 ## Monai.Deploy.Security -- Version: 0.1.1 +- Version: 0.1.3 - Authors: MONAI Consortium -- Project URL: https://github.com/Project-MONAI/monai-deploy-storage -- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Security/0.1.1) +- Project URL: https://github.com/Project-MONAI/monai-deploy-security +- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Security/0.1.3) - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-security/raw/develop/LICENSE) @@ -7728,14 +7728,14 @@ By downloading this software, you agree to the license terms & all licenses list
-Monai.Deploy.Storage 0.2.11 +Monai.Deploy.Storage 0.2.13 ## Monai.Deploy.Storage -- Version: 0.2.11 +- Version: 0.2.13 - Authors: MONAI Consortium - Project URL: https://github.com/Project-MONAI/monai-deploy-storage -- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Storage/0.2.11) +- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Storage/0.2.13) - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-storage/raw/main/LICENSE) @@ -7956,14 +7956,14 @@ By downloading this software, you agree to the license terms & all licenses list
-Monai.Deploy.Storage.MinIO 0.2.11 +Monai.Deploy.Storage.MinIO 0.2.13 ## Monai.Deploy.Storage.MinIO -- Version: 0.2.11 +- Version: 0.2.13 - Authors: MONAI Consortium - Project URL: https://github.com/Project-MONAI/monai-deploy-storage -- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Storage.MinIO/0.2.11) +- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Storage.MinIO/0.2.13) - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-storage/raw/main/LICENSE) @@ -8184,14 +8184,14 @@ By downloading this software, you agree to the license terms & all licenses list
-Monai.Deploy.Storage.S3Policy 0.2.11 +Monai.Deploy.Storage.S3Policy 0.2.13 ## Monai.Deploy.Storage.S3Policy -- Version: 0.2.11 +- Version: 0.2.13 - Authors: MONAI Consortium - Project URL: https://github.com/Project-MONAI/monai-deploy-storage -- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Storage.S3Policy/0.2.11) +- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Storage.S3Policy/0.2.13) - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-storage/raw/main/LICENSE) @@ -8587,14 +8587,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Moq 4.18.2 +Moq 4.18.3 ## Moq -- Version: 4.18.2 +- Version: 4.18.3 - Authors: Daniel Cazzulino, kzu - Project URL: https://github.com/moq/moq4 -- Source: [NuGet](https://www.nuget.org/packages/Moq/4.18.2) +- Source: [NuGet](https://www.nuget.org/packages/Moq/4.18.3) - License: [BSD 3-Clause License]( https://raw.githubusercontent.com/moq/moq4/main/License.txt) @@ -9530,13 +9530,13 @@ Apache License
-SQLitePCLRaw.bundle_e_sqlite3 2.0.6 +SQLitePCLRaw.bundle_e_sqlite3 2.1.2 ## SQLitePCLRaw.bundle_e_sqlite3 -- Version: 2.0.6 +- Version: 2.1.2 - Authors: Eric Sink -- Source: [NuGet](https://www.nuget.org/packages/SQLitePCLRaw.bundle_e_sqlite3/2.0.6) +- Source: [NuGet](https://www.nuget.org/packages/SQLitePCLRaw.bundle_e_sqlite3/2.1.2) - License: [Apache-2.0](https://github.com/ericsink/SQLitePCL.raw/raw/master/LICENSE.TXT) @@ -9748,13 +9748,13 @@ Apache License
-SQLitePCLRaw.core 2.0.6 +SQLitePCLRaw.core 2.1.2 ## SQLitePCLRaw.core -- Version: 2.0.6 +- Version: 2.1.2 - Authors: Eric Sink -- Source: [NuGet](https://www.nuget.org/packages/SQLitePCLRaw.core/2.0.6) +- Source: [NuGet](https://www.nuget.org/packages/SQLitePCLRaw.core/2.1.2) - License: [Apache-2.0](https://github.com/ericsink/SQLitePCL.raw/raw/master/LICENSE.TXT) @@ -9966,13 +9966,13 @@ Apache License
-SQLitePCLRaw.lib.e_sqlite3 2.0.6 +SQLitePCLRaw.lib.e_sqlite3 2.1.2 ## SQLitePCLRaw.lib.e_sqlite3 -- Version: 2.0.6 +- Version: 2.1.2 - Authors: Eric Sink -- Source: [NuGet](https://www.nuget.org/packages/SQLitePCLRaw.lib.e_sqlite3/2.0.6) +- Source: [NuGet](https://www.nuget.org/packages/SQLitePCLRaw.lib.e_sqlite3/2.1.2) - License: [Apache-2.0](https://github.com/ericsink/SQLitePCL.raw/raw/master/LICENSE.TXT) @@ -10184,13 +10184,13 @@ Apache License
-SQLitePCLRaw.provider.e_sqlite3 2.0.6 +SQLitePCLRaw.provider.e_sqlite3 2.1.2 ## SQLitePCLRaw.provider.e_sqlite3 -- Version: 2.0.6 +- Version: 2.1.2 - Authors: Eric Sink -- Source: [NuGet](https://www.nuget.org/packages/SQLitePCLRaw.provider.e_sqlite3/2.0.6) +- Source: [NuGet](https://www.nuget.org/packages/SQLitePCLRaw.provider.e_sqlite3/2.1.2) - License: [Apache-2.0](https://github.com/ericsink/SQLitePCL.raw/raw/master/LICENSE.TXT) @@ -15511,6 +15511,88 @@ consequential or other damages.
+
+System.IO.Abstractions 17.2.3 + +## System.IO.Abstractions + +- Version: 17.2.3 +- Authors: Tatham Oddie & friends +- Project URL: https://github.com/TestableIO/System.IO.Abstractions +- Source: [NuGet](https://www.nuget.org/packages/System.IO.Abstractions/17.2.3) +- License: [MIT](https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) + + +``` +The MIT License (MIT) + +Copyright (c) Tatham Oddie and Contributors + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` + +
+ + +
+System.IO.Abstractions.TestingHelpers 17.2.3 + +## System.IO.Abstractions.TestingHelpers + +- Version: 17.2.3 +- Authors: Tatham Oddie & friends +- Project URL: https://github.com/TestableIO/System.IO.Abstractions +- Source: [NuGet](https://www.nuget.org/packages/System.IO.Abstractions.TestingHelpers/17.2.3) +- License: [MIT](https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) + + +``` +The MIT License (MIT) + +Copyright (c) Tatham Oddie and Contributors + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` + +
+ +
System.IO.Compression 4.3.0 @@ -27749,156 +27831,6 @@ consequential or other damages.
-
-TestableIO.System.IO.Abstractions 18.0.1 - -## TestableIO.System.IO.Abstractions - -- Version: 18.0.1 -- Authors: Tatham Oddie & friends -- Project URL: https://github.com/TestableIO/System.IO.Abstractions -- Source: [NuGet](https://www.nuget.org/packages/TestableIO.System.IO.Abstractions/18.0.1) -- License: [MIT](https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) - - -``` -The MIT License (MIT) - -Copyright (c) Tatham Oddie and Contributors - -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -``` - -
- - -
-TestableIO.System.IO.Abstractions.Extensions 1.0.34 - -## TestableIO.System.IO.Abstractions.Extensions - -- Version: 1.0.34 -- Authors: Tatham Oddie - Luigi Grilli & friends -- Project URL: https://github.com/System-IO-Abstractions/System.IO.Abstractions.Extensions -- Source: [NuGet](https://www.nuget.org/packages/TestableIO.System.IO.Abstractions.Extensions/1.0.34) -- License: [MIT](https://github.com/TestableIO/System.IO.Abstractions.Extensions/raw/main/LICENSE.md) - - -``` -MIT License - -Copyright (c) 2021 Tatham Oddie - Luigi Grilli & friends - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -``` - -
- - -
-TestableIO.System.IO.Abstractions.TestingHelpers 18.0.1 - -## TestableIO.System.IO.Abstractions.TestingHelpers - -- Version: 18.0.1 -- Authors: Tatham Oddie & friends -- Project URL: https://github.com/TestableIO/System.IO.Abstractions -- Source: [NuGet](https://www.nuget.org/packages/TestableIO.System.IO.Abstractions.TestingHelpers/18.0.1) -- License: [MIT](https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) - - -``` -The MIT License (MIT) - -Copyright (c) Tatham Oddie and Contributors - -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -``` - -
- - -
-TestableIO.System.IO.Abstractions.Wrappers 18.0.1 - -## TestableIO.System.IO.Abstractions.Wrappers - -- Version: 18.0.1 -- Authors: Tatham Oddie & friends -- Project URL: https://github.com/TestableIO/System.IO.Abstractions -- Source: [NuGet](https://www.nuget.org/packages/TestableIO.System.IO.Abstractions.Wrappers/18.0.1) -- License: [MIT](https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) - - -``` -The MIT License (MIT) - -Copyright (c) Tatham Oddie and Contributors - -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -``` - -
- -
Validation 2.4.18 @@ -28023,7 +27955,7 @@ SOFTWARE.
coverlet.collector 3.2.0 -## ZstdSharp.Port +## coverlet.collector - Version: 3.2.0 - Authors: tonerdo @@ -28032,45 +27964,6 @@ SOFTWARE. - License: [MIT](https://github.com/coverlet-coverage/coverlet/raw/master/LICENSE) -``` -MIT License - -Copyright (c) 2021 Oleg Stepanischev - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -``` - -
- - -
-fo-dicom 5.0.3 - -## coverlet.collector - -- Version: 5.0.3 -- Authors: fo-dicom contributors -- Project URL: https://github.com/fo-dicom/fo-dicom -- Source: [NuGet](https://www.nuget.org/packages/fo-dicom/5.0.3) -- License: [Microsoft Public License](https://github.com/fo-dicom/fo-dicom/raw/development/License.txt) - - ``` The MIT License (MIT) @@ -28099,14 +27992,14 @@ SOFTWARE.
-fo-dicom.NLog 5.0.3 +fo-dicom 5.0.3 -## fo-dicom.NLog +## fo-dicom - Version: 5.0.3 - Authors: fo-dicom contributors - Project URL: https://github.com/fo-dicom/fo-dicom -- Source: [NuGet](https://www.nuget.org/packages/fo-dicom.NLog/5.0.3) +- Source: [NuGet](https://www.nuget.org/packages/fo-dicom/5.0.3) - License: [Microsoft Public License](https://github.com/fo-dicom/fo-dicom/raw/development/License.txt) diff --git a/src/Api/BaseApplicationEntity.cs b/src/Api/BaseApplicationEntity.cs index 0ead8f071..ba0199ee6 100644 --- a/src/Api/BaseApplicationEntity.cs +++ b/src/Api/BaseApplicationEntity.cs @@ -15,6 +15,9 @@ * limitations under the License. */ +using System; +using System.Security.Claims; + namespace Monai.Deploy.InformaticsGateway.Api { /// @@ -29,17 +32,32 @@ public class BaseApplicationEntity : MongoDBEntityBase /// Gets or sets the unique name used to identify a DICOM application entity. /// This value must be unique. /// - public string Name { get; set; } + public string Name { get; set; } = default!; /// /// Gets or sets the AE Title (AET) used to identify itself in a DICOM association. /// - public string AeTitle { get; set; } + public string AeTitle { get; set; } = default!; /// /// Gets or set the host name or IP address of the AE Title. /// - public string HostIp { get; set; } + public string HostIp { get; set; } = default!; + + /// + /// Gets or set the user who created the DICOM entity. + /// + public string? CreatedBy { get; set; } + + /// + /// Gets or set the most recent user who updated the DICOM entity. + /// + public string? UpdatedBy { get; set; } + + /// + /// Gets or set the most recent date time the DICOM entity was updated. + /// + public DateTime? DateTimeUpdated { get; set; } public BaseApplicationEntity() { @@ -52,6 +70,23 @@ public void SetDefaultValues() Name = AeTitle; } + public void SetAuthor(ClaimsPrincipal user, EditMode editMode) + { + if (editMode == EditMode.Update) + { + DateTimeUpdated = DateTime.UtcNow; + } + + if (editMode == EditMode.Create) + { + CreatedBy = user.Identity?.Name; + } + else if (editMode == EditMode.Update) + { + UpdatedBy = user.Identity?.Name; + } + } + public override string ToString() { return $"Name: {Name}/AET: {AeTitle}/Host: {HostIp}"; diff --git a/src/Api/DicomAssociationInfo.cs b/src/Api/DicomAssociationInfo.cs index dbcb981d7..786ced01d 100644 --- a/src/Api/DicomAssociationInfo.cs +++ b/src/Api/DicomAssociationInfo.cs @@ -20,15 +20,15 @@ namespace Monai.Deploy.InformaticsGateway.Api { public class DicomAssociationInfo : MongoDBEntityBase { - public DateTime DateTimeDisconnected { get; set; } - public string CorrelationId { get; set; } + public DateTime DateTimeDisconnected { get; set; } = default!; + public string CorrelationId { get; set; } = default!; public int FileCount { get; private set; } - public string CallingAeTitle { get; set; } - public string CalledAeTitle { get; set; } - public string RemoteHost { get; set; } - public int RemotePort { get; set; } - public string Errors { get; set; } - public TimeSpan Duration { get; private set; } + public string CallingAeTitle { get; set; } = default!; + public string CalledAeTitle { get; set; } = default!; + public string RemoteHost { get; set; } = default!; + public int RemotePort { get; set; } = default!; + public string Errors { get; set; } = string.Empty; + public TimeSpan Duration { get; private set; } = default!; public DicomAssociationInfo() { diff --git a/src/Api/EditMode.cs b/src/Api/EditMode.cs new file mode 100644 index 000000000..62dc48217 --- /dev/null +++ b/src/Api/EditMode.cs @@ -0,0 +1,25 @@ +/* + * Copyright 2021-2022 MONAI Consortium + * Copyright 2019-2020 NVIDIA Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Monai.Deploy.InformaticsGateway.Api +{ + public enum EditMode + { + Create, + Update, + } +} diff --git a/src/Api/LoggingDataDictionary.cs b/src/Api/LoggingDataDictionary.cs index 1f1770cab..695b37e39 100644 --- a/src/Api/LoggingDataDictionary.cs +++ b/src/Api/LoggingDataDictionary.cs @@ -24,7 +24,7 @@ namespace Monai.Deploy.InformaticsGateway.Api { [Serializable] - public class LoggingDataDictionary : Dictionary + public class LoggingDataDictionary : Dictionary where TKey : notnull { public LoggingDataDictionary() { diff --git a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj index 5e3765fe8..7a14db599 100644 --- a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj +++ b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj @@ -1,4 +1,4 @@ - - + - + - @@ -53,15 +52,14 @@ limitations under the License. - - - - - - + + + + + + - @@ -78,13 +76,12 @@ limitations under the License. - + - + - diff --git a/src/InformaticsGateway/packages.lock.json b/src/InformaticsGateway/packages.lock.json index 981e6b17c..2d9ebe3d2 100644 --- a/src/InformaticsGateway/packages.lock.json +++ b/src/InformaticsGateway/packages.lock.json @@ -74,12 +74,12 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.11, )", - "resolved": "6.0.11", - "contentHash": "eUsIZ52uBJFCr/OUL1EHp0BAwdkfHFVGMyXYrkGUjkSWtPd751wgFzgWBstxOQYzUEyKtz1/wC72S8Db0vPvsg==", + "requested": "[6.0.12, )", + "resolved": "6.0.12", + "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.11", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.11", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -93,17 +93,6 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { - "type": "Direct", - "requested": "[6.0.11, )", - "resolved": "6.0.11", - "contentHash": "tMjF1erFhHE+SnsiIyRIatVeKBgB9OfGsOvQe/+foE0xl4+JUQGbCA7gF1wqOksi9AxmGWzqtqjsMKJpCo5wYQ==", - "dependencies": { - "Microsoft.EntityFrameworkCore.Relational": "6.0.11", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.11", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.11" - } - }, "Microsoft.Extensions.Hosting": { "type": "Direct", "requested": "[6.0.1, )", @@ -172,11 +161,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.18, )", - "resolved": "0.1.18", - "contentHash": "XcX6Trrvx1ofieF9mAGfgtQ5Zm1NFrlZGDldlQTrMoWKmY/+Aj/vzQj8hKUCuaia+KxiMzERF3sGhVo8QoZnbA==", + "requested": "[0.1.19, )", + "resolved": "0.1.19", + "contentHash": "o4eq4yHUQ/vZnYbT2aWlhIvtAtTdPTHqo5jR0wpl6xmebKidB3RGIq6lqX6fbzBjByUYzzA2AzNoCPykL56NkA==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.18", + "Monai.Deploy.Messaging": "0.1.19", "Polly": "7.2.3", "RabbitMQ.Client": "6.4.0", "System.Collections.Concurrent": "4.3.0" @@ -184,9 +173,9 @@ }, "Monai.Deploy.Security": { "type": "Direct", - "requested": "[0.1.1, )", - "resolved": "0.1.1", - "contentHash": "kVIXocVcG3LNs2vbqg/wRq/noxqu/hOyuZ8+XKT4eUc9pudMcGyGIGhRAjKf+veDwza2nbEwhCJeBnChw04igQ==", + "requested": "[0.1.3, )", + "resolved": "0.1.3", + "contentHash": "9/E/UEK9Foo1cUHRRgNIR8uk+oTLiBbzR2vqBsxIo1EwbduDVuBGFcIh2lpAJZmFFwBNv0KtmTASdD3w5UWd+g==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.11", @@ -199,33 +188,32 @@ }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.11, )", - "resolved": "0.2.11", - "contentHash": "49ZDyrmnDqkV8YZQAABZzrqa4ynvVeNOCFL3xptGoalERsgOpRRHIDDeoeMuXe2lCtJ5sQcRzh2GDacD2REkBA==", + "requested": "[0.2.13, )", + "resolved": "0.2.13", + "contentHash": "n8GpFPA/MNaTywz/xRRb1KpJONs+dy7QAjKsk6fQrviMrU9jtXJsv6BuodX9kqzLL6npA63gweHRUDljQJLUEw==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.25", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.10", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.11", - "TestableIO.System.IO.Abstractions": "18.0.1", - "TestableIO.System.IO.Abstractions.Wrappers": "18.0.1" + "Monai.Deploy.Storage.S3Policy": "0.2.13", + "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.MinIO": { "type": "Direct", - "requested": "[0.2.11, )", - "resolved": "0.2.11", - "contentHash": "zMtDUYxqhAsKzm0b4zIP4bw2y7oOM4Ua4yucTxjBXl4OZh3nxYK6oSjy4Y7izKKAjnHBNLsKGvFUAdyZHRRZcg==", + "requested": "[0.2.13, )", + "resolved": "0.2.13", + "contentHash": "v6SChjnSOMcUDXN5jPmsWFSfv/fDlql48/rKONAQ0DQSoYMzKjFLt98M0uazvfiIzXEK2q63x1IqZxTZdPDqhQ==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.25", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Minio": "4.0.6", - "Monai.Deploy.Storage": "0.2.11", - "Monai.Deploy.Storage.S3Policy": "0.2.11" + "Monai.Deploy.Storage": "0.2.13", + "Monai.Deploy.Storage.S3Policy": "0.2.13" } }, "NLog": { @@ -261,6 +249,15 @@ "Swashbuckle.AspNetCore.SwaggerUI": "6.4.0" } }, + "AspNetCore.HealthChecks.MongoDb": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "0R3NVbsjMhS5fd2hGijzQNKJ0zQBv/qMC7nkpmnbtgribCj7vfNdAhSqv4lwbibffRWPW5A/7VNJMX4aPej0WQ==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.2", + "MongoDB.Driver": "2.14.1" + } + }, "AWSSDK.Core": { "type": "Transitive", "resolved": "3.7.100.25", @@ -337,47 +334,47 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "xCcaePISVs3Fdy+ji1yGDp1gCjUwDJpfIKrBWXWDgyzc3R2MmNxTW5YgNmnB7dvdHoJwf0jPZ50M5TBj7noV3w==", + "resolved": "6.0.12", + "contentHash": "bui5wPPqq9OwTL5A+YJPcVStTPrOFcLwg/kAVWyqdjrTief4kTK/3bNv0MqUDVNgAUG8pcFbtdc674CIh1F3gw==", "dependencies": { - "SQLitePCLRaw.core": "2.0.6" + "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "KJCJjFMZFGYy0G8a8ZUwAe9n/l6P+dP3i4fQJmR4jR0/EFnlfeNeWh8n6nRhP+9YmNz290twaIZSbRoiGU6S2A==" + "resolved": "6.0.12", + "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "xke0hphu+BSBwt6Kfv/XERe3s1G7BZjNUByyNj0oIZVD1KPaIhMQJBKHtblkCI04cMnO1Ac2NMEgO67rM+cP/w==" + "resolved": "6.0.12", + "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "cB1n/Hj8HLYuyIE6fEZyaAKn5qdU9QpDtFZ3KNLWyiZfftmY2T7Bz1Aea1DIUM/KQF22URRLkj7bs4S6CIEp+w==", + "resolved": "6.0.12", + "contentHash": "HBtRGHtF0Vf+BIQTkRGiopmE5rLYhj59xPpd17S1tLgYpiHDVbepCuHwh5H63fzjO99Z4tW5wmmEGF7KnD91WQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.11", + "Microsoft.EntityFrameworkCore": "6.0.12", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "F5db018VdecebRNbRdk6sB2P9nCRmcVncp53IFivJhzVGWB6ogCXdRgkEak2KGSM6J8zPFiGpSUQYd3EIS4F0g==", + "resolved": "6.0.12", + "contentHash": "2Hutlqt07bnWZFtYqT1lj0otX8ygMyBikysGnfQNF2TK3i5GqSTeJ8tqNi/URiI9II7Cyl15A0rflXmFoySuIw==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.11", - "SQLitePCLRaw.bundle_e_sqlite3": "2.0.6" + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.12", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "hV7yq12omAd1ccKCfMJS9xsz7+FxQeSGqRdWIIyWaUXmwmK9Df644mBpj0SDMORjmhsNz9L7EqwbZW+iyQi0VQ==", + "resolved": "6.0.12", + "contentHash": "07vKE7+t9Z2BfGmHuJwNZNv8m1GWt7ZpYYHFh1tQg1oC6FJ78bSaFzLawsf2NK6CLhbB8DBsjE0rRhxMJ4rXsA==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.11", - "Microsoft.EntityFrameworkCore.Relational": "6.0.11", + "Microsoft.Data.Sqlite.Core": "6.0.12", + "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -521,6 +518,16 @@ "resolved": "6.0.11", "contentHash": "MQS7GE1ux7Lo1yOr59M7ZTEoFY3GJ9hHkxXQnQc8EPxkt5S7cX4qe6djSWH+mk9qQan+AjFZzdC1x5Af5IaseA==" }, + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": { + "type": "Transitive", + "resolved": "6.0.11", + "contentHash": "tMjF1erFhHE+SnsiIyRIatVeKBgB9OfGsOvQe/+foE0xl4+JUQGbCA7gF1wqOksi9AxmGWzqtqjsMKJpCo5wYQ==", + "dependencies": { + "Microsoft.EntityFrameworkCore.Relational": "6.0.11", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.11", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.11" + } + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -736,8 +743,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.18", - "contentHash": "g32wrHpF4hP+HatewxWAdX4LLk2jW1dTVMGooXgA5qIVpm1lhsPtCvodmKqIxI2UHtSatXrH5uy19WAR7yFAEA==", + "resolved": "0.1.19", + "contentHash": "XP9AFsjbYsv8xGc5yTSE1SL6zuBoNZJQx/GGEd/NLwl+YiaCZA7MfHrnGp7wz9Me03+nlyGpLEiKlSVljpCXtg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -745,14 +752,13 @@ "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.2", "System.ComponentModel.Annotations": "5.0.0", - "TestableIO.System.IO.Abstractions": "18.0.1", - "TestableIO.System.IO.Abstractions.Wrappers": "18.0.1" + "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.11", - "contentHash": "MSvHf//0j5IamEhMbQZgcBqMNXt4NghUS2/ui07BntcraSh2Xrig6GgM45vKdMTz515WUoEjhihY0Lz6sxUKmA==", + "resolved": "0.2.13", + "contentHash": "Cvquf6VH8IHwq9rAmWZse3XZpM9HUsF5/f9wfuKfrNyCM/xRnbVTc8GrOOVGe+SUNg+GAcc0vWiX1efGyOmFyw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.2" @@ -948,33 +954,32 @@ }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", - "resolved": "2.0.6", - "contentHash": "zssYqiaucyGArZfg74rJuzK0ewgZiidsRVrZTmP7JLNvK806gXg6PGA46XzoJGpNPPA5uRcumwvVp6YTYxtQ5w==", + "resolved": "2.1.2", + "contentHash": "ilkvNhrTersLmIVAcDwwPqfhUFCg19Z1GVMvCSi3xk6Akq94f4qadLORQCq/T8+9JgMiPs+F/NECw5uauviaNw==", "dependencies": { - "SQLitePCLRaw.core": "2.0.6", - "SQLitePCLRaw.lib.e_sqlite3": "2.0.6", - "SQLitePCLRaw.provider.e_sqlite3": "2.0.6" + "SQLitePCLRaw.lib.e_sqlite3": "2.1.2", + "SQLitePCLRaw.provider.e_sqlite3": "2.1.2" } }, "SQLitePCLRaw.core": { "type": "Transitive", - "resolved": "2.0.6", - "contentHash": "Vh8n0dTvwXkCGur2WqQTITvk4BUO8i8h9ucSx3wwuaej3s2S6ZC0R7vqCTf9TfS/I4QkXO6g3W2YQIRFkOcijA==", + "resolved": "2.1.2", + "contentHash": "A8EBepVqY2lnAp3a8jnhbgzF2tlj2S3HcJQGANTYg/TbYbKa8Z5cM1h74An/vy0svhfzT7tVY0sFmUglLgv+2g==", "dependencies": { "System.Memory": "4.5.3" } }, "SQLitePCLRaw.lib.e_sqlite3": { "type": "Transitive", - "resolved": "2.0.6", - "contentHash": "xlstskMKalKQl0H2uLNe0viBM6fvAGLWqKZUQ3twX5y1tSOZKe0+EbXopQKYdbjJytNGI6y5WSKjpI+kVr2Ckg==" + "resolved": "2.1.2", + "contentHash": "zibGtku8M4Eea1R3ZCAxc86QbNvyEN17mAcQkvWKBuHvRpMiK2g5anG4R5Be7cWKSd1i6baYz8y4dMMAKcXKPg==" }, "SQLitePCLRaw.provider.e_sqlite3": { "type": "Transitive", - "resolved": "2.0.6", - "contentHash": "peXLJbhU+0clVBIPirihM1NoTBqw8ouBpcUsVMlcZ4k6fcL2hwgkctVB2Nt5VsbnOJcPspQL5xQK7QvLpxkMgg==", + "resolved": "2.1.2", + "contentHash": "lxCZarZdvAsMl2zw9bXHrXK6RxVhB4b23iTFhCOdHFhxfbsxLxWf+ocvswJwR/9Wh/E//ddMi+wJGqUKV7VwoA==", "dependencies": { - "SQLitePCLRaw.core": "2.0.6" + "SQLitePCLRaw.core": "2.1.2" } }, "Swashbuckle.AspNetCore.Swagger": { @@ -1131,6 +1136,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.IO.Abstractions": { + "type": "Transitive", + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + }, "System.IO.FileSystem": { "type": "Transitive", "resolved": "4.3.0", @@ -1548,19 +1558,6 @@ "resolved": "4.4.0", "contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ==" }, - "TestableIO.System.IO.Abstractions": { - "type": "Transitive", - "resolved": "18.0.1", - "contentHash": "nacJfL4mGObg8Ttn3ZCJZ2u9z8ivG43xgUJvQQLKCmDnle4m49NYNOLk8cqB4iPdSqVhnUSy+qcIryWgDHCqeg==" - }, - "TestableIO.System.IO.Abstractions.Wrappers": { - "type": "Transitive", - "resolved": "18.0.1", - "contentHash": "3vGUMEHgL7l1Jyvv0WdDzCrwV6xKRhI2xVgWHQDbfVsye/ZBflhWFyVrCanPHzm0r0WSl0ug8DuaKwmelHlLCw==", - "dependencies": { - "TestableIO.System.IO.Abstractions": "18.0.1" - } - }, "ZstdSharp.Port": { "type": "Transitive", "resolved": "0.6.2", @@ -1569,98 +1566,100 @@ "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.11, )", - "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.18, )", - "Monai.Deploy.Storage": "[0.2.11, )" + "Macross.Json.Extensions": "3.0.0", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", + "Monai.Deploy.InformaticsGateway.Common": "1.0.0", + "Monai.Deploy.Messaging": "0.1.19", + "Monai.Deploy.Storage": "0.2.13" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "4.0.1", + "System.Text.Json": "6.0.7" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "TestableIO.System.IO.Abstractions": "[18.0.1, )", - "fo-dicom": "[5.0.3, )" + "Ardalis.GuardClauses": "4.0.1", + "System.IO.Abstractions": "17.2.3", + "System.Threading.Tasks.Dataflow": "6.0.0", + "fo-dicom": "5.0.3" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.18, )", - "Monai.Deploy.Storage": "[0.2.11, )", - "TestableIO.System.IO.Abstractions": "[18.0.1, )" + "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.InformaticsGateway.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Common": "1.0.0", + "Monai.Deploy.Messaging": "0.1.19", + "Monai.Deploy.Storage": "0.2.13", + "System.IO.Abstractions": "17.2.3" } }, "monai.deploy.informaticsgateway.database": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.11, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", - "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", - "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Database.MongoDB": "[1.0.0, )" + "AspNetCore.HealthChecks.MongoDb": "6.0.2", + "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", + "Microsoft.Extensions.Configuration.Json": "6.0.0", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "6.0.11", + "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0", + "Monai.Deploy.InformaticsGateway.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", + "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "1.0.0", + "Monai.Deploy.InformaticsGateway.Database.MongoDB": "1.0.0" } }, "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.11, )", - "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Microsoft.EntityFrameworkCore": "6.0.12", + "Monai.Deploy.InformaticsGateway.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", + "Polly": "7.2.3" } }, "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.11, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.11, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", - "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )" + "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", + "Microsoft.Extensions.Configuration.Json": "6.0.0", + "Monai.Deploy.InformaticsGateway.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", + "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0" } }, "monai.deploy.informaticsgateway.database.mongodb": { "type": "Project", "dependencies": { - "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "MongoDB.Driver": "[2.18.0, )", - "MongoDB.Driver.Core": "[2.18.0, )" + "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0", + "MongoDB.Driver": "2.18.0", + "MongoDB.Driver.Core": "2.18.0" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", - "Microsoft.Extensions.Http": "[6.0.0, )", - "Microsoft.Net.Http.Headers": "[2.2.8, )", - "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", - "System.Linq.Async": "[6.0.1, )", - "fo-dicom": "[5.0.3, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.AspNet.WebApi.Client": "5.2.9", + "Microsoft.Extensions.Http": "6.0.0", + "Microsoft.Net.Http.Headers": "2.2.8", + "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0", + "System.Linq.Async": "6.0.1", + "fo-dicom": "5.0.3" } } } } -} +} \ No newline at end of file diff --git a/tests/Integration.Test/Common/Assertions.cs b/tests/Integration.Test/Common/Assertions.cs index 24119f0b0..0aef382db 100644 --- a/tests/Integration.Test/Common/Assertions.cs +++ b/tests/Integration.Test/Common/Assertions.cs @@ -19,7 +19,6 @@ using System.Text.Json; using System.Text.Json.Nodes; using System.Xml; -using Amazon.Runtime; using Ardalis.GuardClauses; using FellowOakDicom; using FellowOakDicom.Serialization; diff --git a/tests/Integration.Test/Common/DicomCEchoDataClient.cs b/tests/Integration.Test/Common/DicomCEchoDataClient.cs index 0a699f9cc..b91a67725 100644 --- a/tests/Integration.Test/Common/DicomCEchoDataClient.cs +++ b/tests/Integration.Test/Common/DicomCEchoDataClient.cs @@ -36,7 +36,6 @@ public DicomCEchoDataClient(Configurations configurations, InformaticsGatewayCon _outputHelper = outputHelper ?? throw new ArgumentNullException(nameof(outputHelper)); } - public async Task SendAsync(DataProvider dataProvider, params object[] args) { Guard.Against.NullOrEmpty(args); diff --git a/tests/Integration.Test/Common/DicomCStoreDataClient.cs b/tests/Integration.Test/Common/DicomCStoreDataClient.cs index e98566c88..da8c357b0 100644 --- a/tests/Integration.Test/Common/DicomCStoreDataClient.cs +++ b/tests/Integration.Test/Common/DicomCStoreDataClient.cs @@ -16,7 +16,6 @@ using System.Diagnostics; using Ardalis.GuardClauses; -using FellowOakDicom; using FellowOakDicom.Network; using FellowOakDicom.Network.Client; using Monai.Deploy.InformaticsGateway.Configuration; @@ -41,7 +40,6 @@ public DicomCStoreDataClient(Configurations configurations, InformaticsGatewayCo _outputHelper = outputHelper ?? throw new ArgumentNullException(nameof(outputHelper)); } - public async Task SendAsync(DataProvider dataProvider, params object[] args) { Guard.Against.NullOrEmpty(args); diff --git a/tests/Integration.Test/Common/IDataClient.cs b/tests/Integration.Test/Common/IDataClient.cs index 6f8f5a580..254572b93 100644 --- a/tests/Integration.Test/Common/IDataClient.cs +++ b/tests/Integration.Test/Common/IDataClient.cs @@ -14,7 +14,6 @@ * limitations under the License. */ - namespace Monai.Deploy.InformaticsGateway.Integration.Test.Common { internal interface IDataClient diff --git a/tests/Integration.Test/Drivers/IDatabaseDataProvider.cs b/tests/Integration.Test/Drivers/IDatabaseDataProvider.cs index 47c1a0618..e0944c960 100644 --- a/tests/Integration.Test/Drivers/IDatabaseDataProvider.cs +++ b/tests/Integration.Test/Drivers/IDatabaseDataProvider.cs @@ -19,6 +19,7 @@ namespace Monai.Deploy.InformaticsGateway.Integration.Test.Hooks public interface IDatabaseDataProvider { void ClearAllData(); + Task InjectAcrRequest(); } } diff --git a/tests/Integration.Test/Drivers/RabbitMqConsumer.cs b/tests/Integration.Test/Drivers/RabbitMqConsumer.cs index c3955d2ce..06f17f66a 100644 --- a/tests/Integration.Test/Drivers/RabbitMqConsumer.cs +++ b/tests/Integration.Test/Drivers/RabbitMqConsumer.cs @@ -30,7 +30,8 @@ internal class RabbitMqConsumer : IDisposable private readonly ConcurrentBag _messages; private bool _disposedValue; - public IReadOnlyList Messages { get { return _messages.ToList(); } } + public IReadOnlyList Messages + { get { return _messages.ToList(); } } public CountdownEvent MessageWaitHandle { get; private set; } public RabbitMqConsumer(RabbitMQMessageSubscriberService subscriberService, string queueName, ISpecFlowOutputHelper outputHelper) @@ -77,7 +78,6 @@ protected virtual void Dispose(bool disposing) } } - public void Dispose() { // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method diff --git a/tests/Integration.Test/Hooks/TestHooks.cs b/tests/Integration.Test/Hooks/TestHooks.cs index 050424914..313ab7719 100644 --- a/tests/Integration.Test/Hooks/TestHooks.cs +++ b/tests/Integration.Test/Hooks/TestHooks.cs @@ -185,7 +185,6 @@ public static void Shtudown() s_rabbitMqConnectionFactory.Dispose(); } - [AfterTestRun(Order = 0)] [AfterScenario] public static void ClearTestData(ISpecFlowOutputHelper outputHelper) diff --git a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj index d644f36d1..bac224f0b 100644 --- a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj +++ b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj @@ -26,17 +26,17 @@ - - + + - - - + + + diff --git a/tests/Integration.Test/nlog.config b/tests/Integration.Test/nlog.config index b987aba2f..ed0056cd5 100644 --- a/tests/Integration.Test/nlog.config +++ b/tests/Integration.Test/nlog.config @@ -23,8 +23,8 @@ limitations under the License. internalLogFile="${basedir}/logs/internal-nlog.txt"> - - + + @@ -35,7 +35,6 @@ limitations under the License. - @@ -45,15 +44,14 @@ limitations under the License. - - - - - - + + + + + + - @@ -71,11 +69,10 @@ limitations under the License. - + - diff --git a/tests/Integration.Test/packages.lock.json b/tests/Integration.Test/packages.lock.json index d8be0d3ae..c0d15c964 100644 --- a/tests/Integration.Test/packages.lock.json +++ b/tests/Integration.Test/packages.lock.json @@ -36,12 +36,12 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.11, )", - "resolved": "6.0.11", - "contentHash": "eUsIZ52uBJFCr/OUL1EHp0BAwdkfHFVGMyXYrkGUjkSWtPd751wgFzgWBstxOQYzUEyKtz1/wC72S8Db0vPvsg==", + "requested": "[6.0.12, )", + "resolved": "6.0.12", + "contentHash": "xb10XFoPf/gWu8ik5v7xnVyUY7W21LBOLtT7PidzwYVdnE3aKuQ/bIZLcQuY7rdDNT89/wse2q5FRjm207cIMQ==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.11", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.11", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.12", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -51,12 +51,12 @@ }, "Microsoft.EntityFrameworkCore.Sqlite": { "type": "Direct", - "requested": "[6.0.11, )", - "resolved": "6.0.11", - "contentHash": "F5db018VdecebRNbRdk6sB2P9nCRmcVncp53IFivJhzVGWB6ogCXdRgkEak2KGSM6J8zPFiGpSUQYd3EIS4F0g==", + "requested": "[6.0.12, )", + "resolved": "6.0.12", + "contentHash": "2Hutlqt07bnWZFtYqT1lj0otX8ygMyBikysGnfQNF2TK3i5GqSTeJ8tqNi/URiI9II7Cyl15A0rflXmFoySuIw==", "dependencies": { - "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.11", - "SQLitePCLRaw.bundle_e_sqlite3": "2.0.6" + "Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.12", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.2" } }, "Microsoft.Extensions.Configuration": { @@ -128,11 +128,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.18, )", - "resolved": "0.1.18", - "contentHash": "XcX6Trrvx1ofieF9mAGfgtQ5Zm1NFrlZGDldlQTrMoWKmY/+Aj/vzQj8hKUCuaia+KxiMzERF3sGhVo8QoZnbA==", + "requested": "[0.1.19, )", + "resolved": "0.1.19", + "contentHash": "o4eq4yHUQ/vZnYbT2aWlhIvtAtTdPTHqo5jR0wpl6xmebKidB3RGIq6lqX6fbzBjByUYzzA2AzNoCPykL56NkA==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.18", + "Monai.Deploy.Messaging": "0.1.19", "Polly": "7.2.3", "RabbitMQ.Client": "6.4.0", "System.Collections.Concurrent": "4.3.0" @@ -140,24 +140,24 @@ }, "Monai.Deploy.Storage.MinIO": { "type": "Direct", - "requested": "[0.2.11, )", - "resolved": "0.2.11", - "contentHash": "zMtDUYxqhAsKzm0b4zIP4bw2y7oOM4Ua4yucTxjBXl4OZh3nxYK6oSjy4Y7izKKAjnHBNLsKGvFUAdyZHRRZcg==", + "requested": "[0.2.13, )", + "resolved": "0.2.13", + "contentHash": "v6SChjnSOMcUDXN5jPmsWFSfv/fDlql48/rKONAQ0DQSoYMzKjFLt98M0uazvfiIzXEK2q63x1IqZxTZdPDqhQ==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.25", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Minio": "4.0.6", - "Monai.Deploy.Storage": "0.2.11", - "Monai.Deploy.Storage.S3Policy": "0.2.11" + "Monai.Deploy.Storage": "0.2.13", + "Monai.Deploy.Storage.S3Policy": "0.2.13" } }, "Moq": { "type": "Direct", - "requested": "[4.18.2, )", - "resolved": "4.18.2", - "contentHash": "SjxKYS5nX6prcaT8ZjbkONh3vnh0Rxru09+gQ1a07v4TM530Oe/jq3Q4dOZPfo1wq0LYmTgLOZKrqRfEx4auPw==", + "requested": "[4.18.3, )", + "resolved": "4.18.3", + "contentHash": "nmV2lludVOFmVi+Vtq9twX1/SDiEVyYDURzxW39gUBqjyoXmdyNwJSeOfSCJoJTXDXBVfFNfEljB5UWGj/cKnQ==", "dependencies": { "Castle.Core": "5.1.0" } @@ -235,6 +235,15 @@ "JetBrains.Annotations": "2021.3.0" } }, + "AspNetCore.HealthChecks.MongoDb": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "0R3NVbsjMhS5fd2hGijzQNKJ0zQBv/qMC7nkpmnbtgribCj7vfNdAhSqv4lwbibffRWPW5A/7VNJMX4aPej0WQ==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.2", + "MongoDB.Driver": "2.14.1" + } + }, "AWSSDK.Core": { "type": "Transitive", "resolved": "3.7.100.25", @@ -363,38 +372,38 @@ }, "Microsoft.Data.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "xCcaePISVs3Fdy+ji1yGDp1gCjUwDJpfIKrBWXWDgyzc3R2MmNxTW5YgNmnB7dvdHoJwf0jPZ50M5TBj7noV3w==", + "resolved": "6.0.12", + "contentHash": "bui5wPPqq9OwTL5A+YJPcVStTPrOFcLwg/kAVWyqdjrTief4kTK/3bNv0MqUDVNgAUG8pcFbtdc674CIh1F3gw==", "dependencies": { - "SQLitePCLRaw.core": "2.0.6" + "SQLitePCLRaw.core": "2.1.2" } }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "KJCJjFMZFGYy0G8a8ZUwAe9n/l6P+dP3i4fQJmR4jR0/EFnlfeNeWh8n6nRhP+9YmNz290twaIZSbRoiGU6S2A==" + "resolved": "6.0.12", + "contentHash": "hvRytAcLhrb35HmtMjYWsNZZLt39ryuN7j04lDchRa9VToreyqgo5gMniTdQ6MfCflxtGnDes65V/Y2pjbEyWg==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "xke0hphu+BSBwt6Kfv/XERe3s1G7BZjNUByyNj0oIZVD1KPaIhMQJBKHtblkCI04cMnO1Ac2NMEgO67rM+cP/w==" + "resolved": "6.0.12", + "contentHash": "ZDUY+KlsIyKdfvIJeNdqRiPExFQ5GRZVdx/Cp52vhpCJRImYv34O0Xfmw2eiLu4qe1jmM2pTzAAFKELaKwtj/w==" }, "Microsoft.EntityFrameworkCore.Relational": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "cB1n/Hj8HLYuyIE6fEZyaAKn5qdU9QpDtFZ3KNLWyiZfftmY2T7Bz1Aea1DIUM/KQF22URRLkj7bs4S6CIEp+w==", + "resolved": "6.0.12", + "contentHash": "HBtRGHtF0Vf+BIQTkRGiopmE5rLYhj59xPpd17S1tLgYpiHDVbepCuHwh5H63fzjO99Z4tW5wmmEGF7KnD91WQ==", "dependencies": { - "Microsoft.EntityFrameworkCore": "6.0.11", + "Microsoft.EntityFrameworkCore": "6.0.12", "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, "Microsoft.EntityFrameworkCore.Sqlite.Core": { "type": "Transitive", - "resolved": "6.0.11", - "contentHash": "hV7yq12omAd1ccKCfMJS9xsz7+FxQeSGqRdWIIyWaUXmwmK9Df644mBpj0SDMORjmhsNz9L7EqwbZW+iyQi0VQ==", + "resolved": "6.0.12", + "contentHash": "07vKE7+t9Z2BfGmHuJwNZNv8m1GWt7ZpYYHFh1tQg1oC6FJ78bSaFzLawsf2NK6CLhbB8DBsjE0rRhxMJ4rXsA==", "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.11", - "Microsoft.EntityFrameworkCore.Relational": "6.0.11", + "Microsoft.Data.Sqlite.Core": "6.0.12", + "Microsoft.EntityFrameworkCore.Relational": "6.0.12", "Microsoft.Extensions.DependencyModel": "6.0.0" } }, @@ -796,8 +805,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.18", - "contentHash": "g32wrHpF4hP+HatewxWAdX4LLk2jW1dTVMGooXgA5qIVpm1lhsPtCvodmKqIxI2UHtSatXrH5uy19WAR7yFAEA==", + "resolved": "0.1.19", + "contentHash": "XP9AFsjbYsv8xGc5yTSE1SL6zuBoNZJQx/GGEd/NLwl+YiaCZA7MfHrnGp7wz9Me03+nlyGpLEiKlSVljpCXtg==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -805,14 +814,13 @@ "Microsoft.Extensions.Logging": "6.0.0", "Newtonsoft.Json": "13.0.2", "System.ComponentModel.Annotations": "5.0.0", - "TestableIO.System.IO.Abstractions": "18.0.1", - "TestableIO.System.IO.Abstractions.Wrappers": "18.0.1" + "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Security": { "type": "Transitive", - "resolved": "0.1.1", - "contentHash": "kVIXocVcG3LNs2vbqg/wRq/noxqu/hOyuZ8+XKT4eUc9pudMcGyGIGhRAjKf+veDwza2nbEwhCJeBnChw04igQ==", + "resolved": "0.1.3", + "contentHash": "9/E/UEK9Foo1cUHRRgNIR8uk+oTLiBbzR2vqBsxIo1EwbduDVuBGFcIh2lpAJZmFFwBNv0KtmTASdD3w5UWd+g==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.11", @@ -825,23 +833,22 @@ }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.11", - "contentHash": "49ZDyrmnDqkV8YZQAABZzrqa4ynvVeNOCFL3xptGoalERsgOpRRHIDDeoeMuXe2lCtJ5sQcRzh2GDacD2REkBA==", + "resolved": "0.2.13", + "contentHash": "n8GpFPA/MNaTywz/xRRb1KpJONs+dy7QAjKsk6fQrviMrU9jtXJsv6BuodX9kqzLL6npA63gweHRUDljQJLUEw==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.25", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.10", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.11", - "TestableIO.System.IO.Abstractions": "18.0.1", - "TestableIO.System.IO.Abstractions.Wrappers": "18.0.1" + "Monai.Deploy.Storage.S3Policy": "0.2.13", + "System.IO.Abstractions": "17.2.3" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.11", - "contentHash": "MSvHf//0j5IamEhMbQZgcBqMNXt4NghUS2/ui07BntcraSh2Xrig6GgM45vKdMTz515WUoEjhihY0Lz6sxUKmA==", + "resolved": "0.2.13", + "contentHash": "Cvquf6VH8IHwq9rAmWZse3XZpM9HUsF5/f9wfuKfrNyCM/xRnbVTc8GrOOVGe+SUNg+GAcc0vWiX1efGyOmFyw==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.2" @@ -1073,33 +1080,32 @@ }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", - "resolved": "2.0.6", - "contentHash": "zssYqiaucyGArZfg74rJuzK0ewgZiidsRVrZTmP7JLNvK806gXg6PGA46XzoJGpNPPA5uRcumwvVp6YTYxtQ5w==", + "resolved": "2.1.2", + "contentHash": "ilkvNhrTersLmIVAcDwwPqfhUFCg19Z1GVMvCSi3xk6Akq94f4qadLORQCq/T8+9JgMiPs+F/NECw5uauviaNw==", "dependencies": { - "SQLitePCLRaw.core": "2.0.6", - "SQLitePCLRaw.lib.e_sqlite3": "2.0.6", - "SQLitePCLRaw.provider.e_sqlite3": "2.0.6" + "SQLitePCLRaw.lib.e_sqlite3": "2.1.2", + "SQLitePCLRaw.provider.e_sqlite3": "2.1.2" } }, "SQLitePCLRaw.core": { "type": "Transitive", - "resolved": "2.0.6", - "contentHash": "Vh8n0dTvwXkCGur2WqQTITvk4BUO8i8h9ucSx3wwuaej3s2S6ZC0R7vqCTf9TfS/I4QkXO6g3W2YQIRFkOcijA==", + "resolved": "2.1.2", + "contentHash": "A8EBepVqY2lnAp3a8jnhbgzF2tlj2S3HcJQGANTYg/TbYbKa8Z5cM1h74An/vy0svhfzT7tVY0sFmUglLgv+2g==", "dependencies": { "System.Memory": "4.5.3" } }, "SQLitePCLRaw.lib.e_sqlite3": { "type": "Transitive", - "resolved": "2.0.6", - "contentHash": "xlstskMKalKQl0H2uLNe0viBM6fvAGLWqKZUQ3twX5y1tSOZKe0+EbXopQKYdbjJytNGI6y5WSKjpI+kVr2Ckg==" + "resolved": "2.1.2", + "contentHash": "zibGtku8M4Eea1R3ZCAxc86QbNvyEN17mAcQkvWKBuHvRpMiK2g5anG4R5Be7cWKSd1i6baYz8y4dMMAKcXKPg==" }, "SQLitePCLRaw.provider.e_sqlite3": { "type": "Transitive", - "resolved": "2.0.6", - "contentHash": "peXLJbhU+0clVBIPirihM1NoTBqw8ouBpcUsVMlcZ4k6fcL2hwgkctVB2Nt5VsbnOJcPspQL5xQK7QvLpxkMgg==", + "resolved": "2.1.2", + "contentHash": "lxCZarZdvAsMl2zw9bXHrXK6RxVhB4b23iTFhCOdHFhxfbsxLxWf+ocvswJwR/9Wh/E//ddMi+wJGqUKV7VwoA==", "dependencies": { - "SQLitePCLRaw.core": "2.0.6" + "SQLitePCLRaw.core": "2.1.2" } }, "Swashbuckle.AspNetCore": { @@ -1276,6 +1282,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.IO.Abstractions": { + "type": "Transitive", + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" + }, "System.IO.FileSystem": { "type": "Transitive", "resolved": "4.3.0", @@ -1713,19 +1724,6 @@ "resolved": "4.4.0", "contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ==" }, - "TestableIO.System.IO.Abstractions": { - "type": "Transitive", - "resolved": "18.0.1", - "contentHash": "nacJfL4mGObg8Ttn3ZCJZ2u9z8ivG43xgUJvQQLKCmDnle4m49NYNOLk8cqB4iPdSqVhnUSy+qcIryWgDHCqeg==" - }, - "TestableIO.System.IO.Abstractions.Wrappers": { - "type": "Transitive", - "resolved": "18.0.1", - "contentHash": "3vGUMEHgL7l1Jyvv0WdDzCrwV6xKRhI2xVgWHQDbfVsye/ZBflhWFyVrCanPHzm0r0WSl0ug8DuaKwmelHlLCw==", - "dependencies": { - "TestableIO.System.IO.Abstractions": "18.0.1" - } - }, "Validation": { "type": "Transitive", "resolved": "2.4.18", @@ -1793,139 +1791,140 @@ "monai.deploy.informaticsgateway": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "DotNext.Threading": "[4.7.4, )", - "HL7-dotnetcore": "[2.29.0, )", - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.EntityFrameworkCore": "[6.0.11, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.11, )", - "Microsoft.Extensions.Hosting": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Logging.Console": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Database": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.DicomWeb.Client": "[1.0.0, )", - "Monai.Deploy.Messaging.RabbitMQ": "[0.1.18, )", - "Monai.Deploy.Security": "[0.1.1, )", - "Monai.Deploy.Storage": "[0.2.11, )", - "Monai.Deploy.Storage.MinIO": "[0.2.11, )", - "NLog": "[5.1.0, )", - "NLog.Web.AspNetCore": "[5.2.0, )", - "Polly": "[7.2.3, )", - "Swashbuckle.AspNetCore": "[6.4.0, )", - "fo-dicom": "[5.0.3, )", - "fo-dicom.NLog": "[5.0.3, )" + "Ardalis.GuardClauses": "4.0.1", + "DotNext.Threading": "4.7.4", + "HL7-dotnetcore": "2.29.0", + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Hosting": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Console": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.InformaticsGateway.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Common": "1.0.0", + "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", + "Monai.Deploy.InformaticsGateway.Database": "1.0.0", + "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "1.0.0", + "Monai.Deploy.InformaticsGateway.DicomWeb.Client": "1.0.0", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.19", + "Monai.Deploy.Security": "0.1.3", + "Monai.Deploy.Storage": "0.2.13", + "Monai.Deploy.Storage.MinIO": "0.2.13", + "NLog": "5.1.0", + "NLog.Web.AspNetCore": "5.2.0", + "Polly": "7.2.3", + "Swashbuckle.AspNetCore": "6.4.0", + "fo-dicom": "5.0.3", + "fo-dicom.NLog": "5.0.3" } }, "monai.deploy.informaticsgateway.api": { "type": "Project", "dependencies": { - "Macross.Json.Extensions": "[3.0.0, )", - "Microsoft.EntityFrameworkCore.Abstractions": "[6.0.11, )", - "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.18, )", - "Monai.Deploy.Storage": "[0.2.11, )" + "Macross.Json.Extensions": "3.0.0", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.12", + "Monai.Deploy.InformaticsGateway.Common": "1.0.0", + "Monai.Deploy.Messaging": "0.1.19", + "Monai.Deploy.Storage": "0.2.13" } }, "monai.deploy.informaticsgateway.client": { "type": "Project", "dependencies": { - "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", - "Microsoft.Extensions.Http": "[6.0.0, )", - "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )" + "Microsoft.AspNet.WebApi.Client": "5.2.9", + "Microsoft.Extensions.Http": "6.0.0", + "Monai.Deploy.InformaticsGateway.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0" } }, "monai.deploy.informaticsgateway.client.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Text.Json": "[6.0.7, )" + "Ardalis.GuardClauses": "4.0.1", + "System.Text.Json": "6.0.7" } }, "monai.deploy.informaticsgateway.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "System.Threading.Tasks.Dataflow": "[6.0.0, )", - "TestableIO.System.IO.Abstractions": "[18.0.1, )", - "fo-dicom": "[5.0.3, )" + "Ardalis.GuardClauses": "4.0.1", + "System.IO.Abstractions": "17.2.3", + "System.Threading.Tasks.Dataflow": "6.0.0", + "fo-dicom": "5.0.3" } }, "monai.deploy.informaticsgateway.configuration": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[6.0.3, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )", - "Monai.Deploy.Messaging": "[0.1.18, )", - "Monai.Deploy.Storage": "[0.2.11, )", - "TestableIO.System.IO.Abstractions": "[18.0.1, )" + "Microsoft.Extensions.Logging.Abstractions": "6.0.3", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.InformaticsGateway.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Common": "1.0.0", + "Monai.Deploy.Messaging": "0.1.19", + "Monai.Deploy.Storage": "0.2.13", + "System.IO.Abstractions": "17.2.3" } }, "monai.deploy.informaticsgateway.database": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.11, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", - "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )", - "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Database.MongoDB": "[1.0.0, )" + "AspNetCore.HealthChecks.MongoDb": "6.0.2", + "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", + "Microsoft.Extensions.Configuration.Json": "6.0.0", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "6.0.11", + "Microsoft.Extensions.Options.ConfigurationExtensions": "6.0.0", + "Monai.Deploy.InformaticsGateway.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", + "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "1.0.0", + "Monai.Deploy.InformaticsGateway.Database.MongoDB": "1.0.0" } }, "monai.deploy.informaticsgateway.database.api": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.11, )", - "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Polly": "[7.2.3, )" + "Microsoft.EntityFrameworkCore": "6.0.12", + "Monai.Deploy.InformaticsGateway.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", + "Polly": "7.2.3" } }, "monai.deploy.informaticsgateway.database.entityframework": { "type": "Project", "dependencies": { - "Microsoft.EntityFrameworkCore": "[6.0.11, )", - "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.11, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )", - "Microsoft.Extensions.Configuration.Json": "[6.0.0, )", - "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )", - "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )" + "Microsoft.EntityFrameworkCore": "6.0.12", + "Microsoft.EntityFrameworkCore.Sqlite": "6.0.12", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", + "Microsoft.Extensions.Configuration.Json": "6.0.0", + "Monai.Deploy.InformaticsGateway.Api": "1.0.0", + "Monai.Deploy.InformaticsGateway.Configuration": "1.0.0", + "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0" } }, "monai.deploy.informaticsgateway.database.mongodb": { "type": "Project", "dependencies": { - "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )", - "MongoDB.Driver": "[2.18.0, )", - "MongoDB.Driver.Core": "[2.18.0, )" + "Monai.Deploy.InformaticsGateway.Database.Api": "1.0.0", + "MongoDB.Driver": "2.18.0", + "MongoDB.Driver.Core": "2.18.0" } }, "monai.deploy.informaticsgateway.dicomweb.client": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.AspNet.WebApi.Client": "[5.2.9, )", - "Microsoft.Extensions.Http": "[6.0.0, )", - "Microsoft.Net.Http.Headers": "[2.2.8, )", - "Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )", - "System.Linq.Async": "[6.0.1, )", - "fo-dicom": "[5.0.3, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.AspNet.WebApi.Client": "5.2.9", + "Microsoft.Extensions.Http": "6.0.0", + "Microsoft.Net.Http.Headers": "2.2.8", + "Monai.Deploy.InformaticsGateway.Client.Common": "1.0.0", + "System.Linq.Async": "6.0.1", + "fo-dicom": "5.0.3" } } } } -} +} \ No newline at end of file diff --git a/tests/Integration.Test/study.json b/tests/Integration.Test/study.json index c60b21406..4e08cc3e0 100644 --- a/tests/Integration.Test/study.json +++ b/tests/Integration.Test/study.json @@ -55,4 +55,4 @@ "SizeMin": 1, "SizeMax": 2 } -} +} \ No newline at end of file