Skip to content

Include project references in the nuget package #478

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.

Sign up for GitHub

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 3 commits into from
Sep 19, 2023
Merged

Include project references in the nuget package #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
700fc72
Include project references in the nuget package
mocsharp Sep 19, 2023
fc27d2d
Improve error messages in SCP
mocsharp Sep 19, 2023
7a455e8
Remove --no-build flag
mocsharp Sep 19, 2023
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/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ jobs:
if: ${{ (matrix.os == 'ubuntu-latest') }}
run: |
mkdir ~/nupkg
dotnet pack --no-build -c ${{ env.BUILD_CONFIG }} -o ~/nupkg -p:PackageVersion=${{ env.NUGETVER }}
dotnet pack -c ${{ env.BUILD_CONFIG }} -o ~/nupkg -p:PackageVersion=${{ env.NUGETVER }}
ls -lR ~/nupkg
working-directory: ./src/Api

Expand Down
11 changes: 10 additions & 1 deletion src/Api/Monai.Deploy.InformaticsGateway.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,16 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>


<PropertyGroup>
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
</PropertyGroup>
<Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">
<ItemGroup>
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
</ItemGroup>
</Target>

<PropertyGroup>
<PackageId>Monai.Deploy.InformaticsGateway.Api</PackageId>
<Version>0.4.1</Version>
Expand Down
16 changes: 8 additions & 8 deletions src/Client/Test/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,7 +1808,7 @@
"dependencies": {
"DotNext.Threading": "[4.7.4, )",
"HL7-dotnetcore": "[2.36.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Database": "[1.0.0, )",
Expand Down Expand Up @@ -1837,7 +1837,7 @@
"monai.deploy.informaticsgateway.client": {
"type": "Project",
"dependencies": {
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Client.Common": "[1.0.0, )"
}
},
Expand All @@ -1857,7 +1857,7 @@
"monai.deploy.informaticsgateway.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )"
}
},
Expand All @@ -1867,7 +1867,7 @@
"AspNetCore.HealthChecks.MongoDb": "[6.0.2, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.22, )",
"Microsoft.Extensions.Options.ConfigurationExtensions": "[6.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )",
Expand All @@ -1877,7 +1877,7 @@
"monai.deploy.informaticsgateway.database.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
"NLog": "[5.2.4, )"
}
Expand All @@ -1886,10 +1886,10 @@
"type": "Project",
"dependencies": {
"Microsoft.EntityFrameworkCore": "[6.0.22, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[6.0.21, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )",
"Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )",
"Microsoft.Extensions.Configuration.Json": "[6.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
"Polly": "[7.2.4, )"
Expand Down Expand Up @@ -1921,7 +1921,7 @@
"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.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
"MongoDB.Driver": "[2.21.0, )",
Expand Down
32 changes: 16 additions & 16 deletions src/Database/EntityFramework/Test/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@
},
"Microsoft.Data.Sqlite.Core": {
"type": "Transitive",
"resolved": "6.0.21",
"contentHash": "9S+kvYcPyGBqH5KX7sL0d7xYADTUrUVaBz+GZsSx4N4jKh/0mka6IFdeuFYzs3T6wdtHTvzdltcRwucwuTFpdw==",
"resolved": "6.0.22",
"contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==",
"dependencies": {
"SQLitePCLRaw.core": "2.1.2"
}
Expand Down Expand Up @@ -156,29 +156,29 @@
},
"Microsoft.EntityFrameworkCore.Relational": {
"type": "Transitive",
"resolved": "6.0.21",
"contentHash": "Ev5FM2KpXJu7+Dm9qvLf1FhSJMytrhSXho92Vompmgeiz3p4InldluidmKKmv8nZQAjs9dTCUUyvk1pxQjysaQ==",
"resolved": "6.0.22",
"contentHash": "W7yfdEbEuS1OPPxU0EOA6haqI4uvzs7OwHKh81DiJFn3NFNP2ztSovkOzBDhTwHX0j+OySsAj3BEJhuzTVYIVw==",
"dependencies": {
"Microsoft.EntityFrameworkCore": "6.0.21",
"Microsoft.EntityFrameworkCore": "6.0.22",
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0"
}
},
"Microsoft.EntityFrameworkCore.Sqlite": {
"type": "Transitive",
"resolved": "6.0.21",
"contentHash": "iAs1F5gxEQRRGNHDKJ6ZtoSbOAWcjdk+mABEIy2vRLeACp7xBPdQRQdJnENmxykkBgOVef73RpU3xVdDcn8Omg==",
"resolved": "6.0.22",
"contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==",
"dependencies": {
"Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.21",
"Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22",
"SQLitePCLRaw.bundle_e_sqlite3": "2.1.2"
}
},
"Microsoft.EntityFrameworkCore.Sqlite.Core": {
"type": "Transitive",
"resolved": "6.0.21",
"contentHash": "2If1Lt04gD+KrKPFbMUeUzB8Av/EGJJFxNLGfC/CKLgy8+jAYsamyQ/Hux+93XCajJxFLnJimqSg+bBBvXX+2g==",
"resolved": "6.0.22",
"contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==",
"dependencies": {
"Microsoft.Data.Sqlite.Core": "6.0.21",
"Microsoft.EntityFrameworkCore.Relational": "6.0.21",
"Microsoft.Data.Sqlite.Core": "6.0.22",
"Microsoft.EntityFrameworkCore.Relational": "6.0.22",
"Microsoft.Extensions.DependencyModel": "6.0.0"
}
},
Expand Down Expand Up @@ -1467,14 +1467,14 @@
"monai.deploy.informaticsgateway.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )"
}
},
"monai.deploy.informaticsgateway.database.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
"NLog": "[5.2.4, )"
}
Expand All @@ -1483,10 +1483,10 @@
"type": "Project",
"dependencies": {
"Microsoft.EntityFrameworkCore": "[6.0.22, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[6.0.21, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )",
"Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )",
"Microsoft.Extensions.Configuration.Json": "[6.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
"Polly": "[7.2.4, )"
Expand Down
24 changes: 12 additions & 12 deletions src/Database/EntityFramework/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
},
"Microsoft.EntityFrameworkCore.Sqlite": {
"type": "Direct",
"requested": "[6.0.21, )",
"resolved": "6.0.21",
"contentHash": "iAs1F5gxEQRRGNHDKJ6ZtoSbOAWcjdk+mABEIy2vRLeACp7xBPdQRQdJnENmxykkBgOVef73RpU3xVdDcn8Omg==",
"requested": "[6.0.22, )",
"resolved": "6.0.22",
"contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==",
"dependencies": {
"Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.21",
"Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22",
"SQLitePCLRaw.bundle_e_sqlite3": "2.1.2"
}
},
Expand Down Expand Up @@ -132,8 +132,8 @@
},
"Microsoft.Data.Sqlite.Core": {
"type": "Transitive",
"resolved": "6.0.21",
"contentHash": "9S+kvYcPyGBqH5KX7sL0d7xYADTUrUVaBz+GZsSx4N4jKh/0mka6IFdeuFYzs3T6wdtHTvzdltcRwucwuTFpdw==",
"resolved": "6.0.22",
"contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==",
"dependencies": {
"SQLitePCLRaw.core": "2.1.2"
}
Expand All @@ -159,11 +159,11 @@
},
"Microsoft.EntityFrameworkCore.Sqlite.Core": {
"type": "Transitive",
"resolved": "6.0.21",
"contentHash": "2If1Lt04gD+KrKPFbMUeUzB8Av/EGJJFxNLGfC/CKLgy8+jAYsamyQ/Hux+93XCajJxFLnJimqSg+bBBvXX+2g==",
"resolved": "6.0.22",
"contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==",
"dependencies": {
"Microsoft.Data.Sqlite.Core": "6.0.21",
"Microsoft.EntityFrameworkCore.Relational": "6.0.21",
"Microsoft.Data.Sqlite.Core": "6.0.22",
"Microsoft.EntityFrameworkCore.Relational": "6.0.22",
"Microsoft.Extensions.DependencyModel": "6.0.0"
}
},
Expand Down Expand Up @@ -471,14 +471,14 @@
"monai.deploy.informaticsgateway.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )"
}
},
"monai.deploy.informaticsgateway.database.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
"NLog": "[5.2.4, )"
}
Expand Down
26 changes: 13 additions & 13 deletions src/Database/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@
},
"Microsoft.Data.Sqlite.Core": {
"type": "Transitive",
"resolved": "6.0.21",
"contentHash": "9S+kvYcPyGBqH5KX7sL0d7xYADTUrUVaBz+GZsSx4N4jKh/0mka6IFdeuFYzs3T6wdtHTvzdltcRwucwuTFpdw==",
"resolved": "6.0.22",
"contentHash": "gtIGHbGnRq/h4mFSJYr9BdMObvJV/a67nBubs50VjPDusQARtWJzeVTirDWsbL1qTvGzbbZCD7VE7+s2ixZfow==",
"dependencies": {
"SQLitePCLRaw.core": "2.1.2"
}
Expand Down Expand Up @@ -143,20 +143,20 @@
},
"Microsoft.EntityFrameworkCore.Sqlite": {
"type": "Transitive",
"resolved": "6.0.21",
"contentHash": "iAs1F5gxEQRRGNHDKJ6ZtoSbOAWcjdk+mABEIy2vRLeACp7xBPdQRQdJnENmxykkBgOVef73RpU3xVdDcn8Omg==",
"resolved": "6.0.22",
"contentHash": "EDKnYZtxq7P131xxLsEokda86WnFRiVAveLVAYR8kzyWl/UwTpf/RS2m2FrbH/U8vX3A+IQNpabtxcjtCUrY0g==",
"dependencies": {
"Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.21",
"Microsoft.EntityFrameworkCore.Sqlite.Core": "6.0.22",
"SQLitePCLRaw.bundle_e_sqlite3": "2.1.2"
}
},
"Microsoft.EntityFrameworkCore.Sqlite.Core": {
"type": "Transitive",
"resolved": "6.0.21",
"contentHash": "2If1Lt04gD+KrKPFbMUeUzB8Av/EGJJFxNLGfC/CKLgy8+jAYsamyQ/Hux+93XCajJxFLnJimqSg+bBBvXX+2g==",
"resolved": "6.0.22",
"contentHash": "xSU77ORQgwlD+s5Cmlk9DzoSCu5oxlHLuQl+v5zAZ0Uv5yH17hp02TBfz3x9nBA+CrIsqaLjGEuyZmLDf/5ATw==",
"dependencies": {
"Microsoft.Data.Sqlite.Core": "6.0.21",
"Microsoft.EntityFrameworkCore.Relational": "6.0.21",
"Microsoft.Data.Sqlite.Core": "6.0.22",
"Microsoft.EntityFrameworkCore.Relational": "6.0.22",
"Microsoft.Extensions.DependencyModel": "6.0.0"
}
},
Expand Down Expand Up @@ -585,14 +585,14 @@
"monai.deploy.informaticsgateway.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )"
}
},
"monai.deploy.informaticsgateway.database.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
"NLog": "[5.2.4, )"
}
Expand All @@ -601,10 +601,10 @@
"type": "Project",
"dependencies": {
"Microsoft.EntityFrameworkCore": "[6.0.22, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[6.0.21, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[6.0.22, )",
"Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )",
"Microsoft.Extensions.Configuration.Json": "[6.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Api": "[0.4.1, )",
"Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
"Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
"Polly": "[7.2.4, )"
Expand Down
7 changes: 5 additions & 2 deletions src/InformaticsGateway/Services/Scp/ScpServiceInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ public async Task OnReceiveAssociationRequestAsync(DicomAssociation association)

if (_associationDataProvider is null)
{
_associationInfo.Errors = $"Internal error: association data provider not found.";
throw new ServiceException($"{nameof(UserState)} must be an instance of IAssociationDataProvider");
}

Expand All @@ -165,7 +166,7 @@ public async Task OnReceiveAssociationRequestAsync(DicomAssociation association)

if (!await IsValidSourceAeAsync(association.CallingAE, association.RemoteHost).ConfigureAwait(false))
{
_associationInfo.Errors = "Invalid source";
_associationInfo.Errors = $"Invalid source. Called AE: {association.CalledAE}. Calling AE: {association.CallingAE}. IP: {association.RemoteHost}.";

await SendAssociationRejectAsync(
DicomRejectResult.Permanent,
Expand All @@ -175,7 +176,7 @@ await SendAssociationRejectAsync(

if (!await IsValidCalledAeAsync(association.CalledAE).ConfigureAwait(false))
{
_associationInfo.Errors = "Invalid MONAI AE Title";
_associationInfo.Errors = "Invalid MONAI AE Title. Called AE: {association.CalledAE}. Calling AE: {association.CallingAE}. IP: {association.RemoteHost}.";

await SendAssociationRejectAsync(
DicomRejectResult.Permanent,
Expand All @@ -189,6 +190,7 @@ await SendAssociationRejectAsync(
{
if (!_associationDataProvider.Configuration.Value.Dicom.Scp.EnableVerification)
{
_associationInfo.Errors = "Verification service disabled. Called AE: {association.CalledAE}. Calling AE: {association.CallingAE}. IP: {association.RemoteHost}.";
_logger?.VerificationServiceDisabled();
await SendAssociationRejectAsync(
DicomRejectResult.Permanent,
Expand All @@ -202,6 +204,7 @@ await SendAssociationRejectAsync(
{
if (!_associationDataProvider.CanStore)
{
_associationInfo.Errors = "Disk pressure. Called AE: {association.CalledAE}. Calling AE: {association.CallingAE}. IP: {association.RemoteHost}.";
await SendAssociationRejectAsync(
DicomRejectResult.Permanent,
DicomRejectSource.ServiceUser,
Expand Down
Loading