Skip to content

Fix build dependencies #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/.gitversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ branches:
ignore:
sha: []
merge-message-formats: {}
next-version: 0.3.5
next-version: 0.3.7
126 changes: 64 additions & 62 deletions src/Client/Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1668,42 +1668,44 @@
"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.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"
"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.Diagnostics.HealthChecks.Abstractions": "[6.0.12, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.12, )",
"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.12",
"Monai.Deploy.InformaticsGateway.Common": "1.0.0",
"Monai.Deploy.Messaging": "0.1.19",
"Monai.Deploy.Storage": "0.2.13"
"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": {
Expand Down Expand Up @@ -1734,52 +1736,52 @@
"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.19",
"Monai.Deploy.Storage": "0.2.13",
"System.IO.Abstractions": "17.2.3"
"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": {
"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.12",
"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.12, )",
"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.12",
"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.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"
"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": {
Expand Down
2 changes: 2 additions & 0 deletions src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.12" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.12" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.12" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
Expand Down
158 changes: 80 additions & 78 deletions src/InformaticsGateway/Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1896,129 +1896,131 @@
"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.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"
"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.Diagnostics.HealthChecks.Abstractions": "[6.0.12, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.12, )",
"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.12",
"Monai.Deploy.InformaticsGateway.Common": "1.0.0",
"Monai.Deploy.Messaging": "0.1.19",
"Monai.Deploy.Storage": "0.2.13"
"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.IO.Abstractions": "17.2.3",
"System.Threading.Tasks.Dataflow": "6.0.0",
"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.19",
"Monai.Deploy.Storage": "0.2.13",
"System.IO.Abstractions": "17.2.3"
"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": {
"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.12",
"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.12, )",
"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.12",
"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.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"
"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, )"
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/InformaticsGateway/appsettings.Development.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"MonaiDeployAuthentication": {
"bypassAuthentication": false
"BypassAuthentication": true
},
"ConnectionStrings": {
"InformaticsGatewayDatabase": "Data Source=migdev.db"
"Type": "mongodb",
"InformaticsGatewayDatabase": "mongodb://root:rootpassword@localhost:27017",
"DatabaseName": "InformaticsGateway"
},
"InformaticsGateway": {
"dicom": {
Expand Down
Loading