Skip to content

Commit 9195ae9

Browse files
mocsharpmocsharp
committed
Fix merge issues
Signed-off-by: Victor Chang <[email protected]>
1 parent e4a099a commit 9195ae9

File tree

21 files changed

+21
-80
lines changed

21 files changed

+21
-80
lines changed

‎src/Api/Test/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
"Monai.Deploy.Messaging": {
251251
"type": "Transitive",
252252
"resolved": "1.0.0",
253-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
253+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
254254
"dependencies": {
255255
"Ardalis.GuardClauses": "4.1.1",
256256
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Api/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"type": "Direct",
3838
"requested": "[1.0.0, )",
3939
"resolved": "1.0.0",
40-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
40+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
4141
"dependencies": {
4242
"Ardalis.GuardClauses": "4.1.1",
4343
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/CLI/Test/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@
498498
"Monai.Deploy.Messaging": {
499499
"type": "Transitive",
500500
"resolved": "1.0.0",
501-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
501+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
502502
"dependencies": {
503503
"Ardalis.GuardClauses": "4.1.1",
504504
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/CLI/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@
400400
"Monai.Deploy.Messaging": {
401401
"type": "Transitive",
402402
"resolved": "1.0.0",
403-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
403+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
404404
"dependencies": {
405405
"Ardalis.GuardClauses": "4.1.1",
406406
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Client/Test/packages.lock.json

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@
571571
"Monai.Deploy.Messaging": {
572572
"type": "Transitive",
573573
"resolved": "1.0.0",
574-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
574+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
575575
"dependencies": {
576576
"Ardalis.GuardClauses": "4.1.1",
577577
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
@@ -1659,17 +1659,6 @@
16591659
"System.Text.Encoding": "4.3.0"
16601660
}
16611661
},
1662-
"System.Text.Encoding.Extensions": {
1663-
"type": "Transitive",
1664-
"resolved": "4.3.0",
1665-
"contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==",
1666-
"dependencies": {
1667-
"Microsoft.NETCore.Platforms": "1.1.0",
1668-
"Microsoft.NETCore.Targets": "1.1.0",
1669-
"System.Runtime": "4.3.0",
1670-
"System.Text.Encoding": "4.3.0"
1671-
}
1672-
},
16731662
"System.Text.Encodings.Web": {
16741663
"type": "Transitive",
16751664
"resolved": "6.0.0",
@@ -1775,47 +1764,6 @@
17751764
"System.Xml.ReaderWriter": "4.3.0"
17761765
}
17771766
},
1778-
"System.Xml.ReaderWriter": {
1779-
"type": "Transitive",
1780-
"resolved": "4.3.0",
1781-
"contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==",
1782-
"dependencies": {
1783-
"System.Collections": "4.3.0",
1784-
"System.Diagnostics.Debug": "4.3.0",
1785-
"System.Globalization": "4.3.0",
1786-
"System.IO": "4.3.0",
1787-
"System.IO.FileSystem": "4.3.0",
1788-
"System.IO.FileSystem.Primitives": "4.3.0",
1789-
"System.Resources.ResourceManager": "4.3.0",
1790-
"System.Runtime": "4.3.0",
1791-
"System.Runtime.Extensions": "4.3.0",
1792-
"System.Runtime.InteropServices": "4.3.0",
1793-
"System.Text.Encoding": "4.3.0",
1794-
"System.Text.Encoding.Extensions": "4.3.0",
1795-
"System.Text.RegularExpressions": "4.3.0",
1796-
"System.Threading.Tasks": "4.3.0",
1797-
"System.Threading.Tasks.Extensions": "4.3.0"
1798-
}
1799-
},
1800-
"System.Xml.XDocument": {
1801-
"type": "Transitive",
1802-
"resolved": "4.3.0",
1803-
"contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==",
1804-
"dependencies": {
1805-
"System.Collections": "4.3.0",
1806-
"System.Diagnostics.Debug": "4.3.0",
1807-
"System.Diagnostics.Tools": "4.3.0",
1808-
"System.Globalization": "4.3.0",
1809-
"System.IO": "4.3.0",
1810-
"System.Reflection": "4.3.0",
1811-
"System.Resources.ResourceManager": "4.3.0",
1812-
"System.Runtime": "4.3.0",
1813-
"System.Runtime.Extensions": "4.3.0",
1814-
"System.Text.Encoding": "4.3.0",
1815-
"System.Threading": "4.3.0",
1816-
"System.Xml.ReaderWriter": "4.3.0"
1817-
}
1818-
},
18191767
"xunit.abstractions": {
18201768
"type": "Transitive",
18211769
"resolved": "2.0.3",

‎src/Client/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
"Monai.Deploy.Messaging": {
157157
"type": "Transitive",
158158
"resolved": "1.0.0",
159-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
159+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
160160
"dependencies": {
161161
"Ardalis.GuardClauses": "4.1.1",
162162
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Configuration/Test/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
"Monai.Deploy.Messaging": {
259259
"type": "Transitive",
260260
"resolved": "1.0.0",
261-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
261+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
262262
"dependencies": {
263263
"Ardalis.GuardClauses": "4.1.1",
264264
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Configuration/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
"Monai.Deploy.Messaging": {
157157
"type": "Transitive",
158158
"resolved": "1.0.0",
159-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
159+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
160160
"dependencies": {
161161
"Ardalis.GuardClauses": "4.1.1",
162162
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Database/Api/Test/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
"Monai.Deploy.Messaging": {
233233
"type": "Transitive",
234234
"resolved": "1.0.0",
235-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
235+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
236236
"dependencies": {
237237
"Ardalis.GuardClauses": "4.1.1",
238238
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Database/Api/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
"Monai.Deploy.Messaging": {
163163
"type": "Transitive",
164164
"resolved": "1.0.0",
165-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
165+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
166166
"dependencies": {
167167
"Ardalis.GuardClauses": "4.1.1",
168168
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Database/EntityFramework/Test/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@
393393
"Monai.Deploy.Messaging": {
394394
"type": "Transitive",
395395
"resolved": "1.0.0",
396-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
396+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
397397
"dependencies": {
398398
"Ardalis.GuardClauses": "4.1.1",
399399
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Database/EntityFramework/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@
316316
"Monai.Deploy.Messaging": {
317317
"type": "Transitive",
318318
"resolved": "1.0.0",
319-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
319+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
320320
"dependencies": {
321321
"Ardalis.GuardClauses": "4.1.1",
322322
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Database/MongoDB/Integration.Test/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@
275275
"Monai.Deploy.Messaging": {
276276
"type": "Transitive",
277277
"resolved": "1.0.0",
278-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
278+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
279279
"dependencies": {
280280
"Ardalis.GuardClauses": "4.1.1",
281281
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Database/MongoDB/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
"Monai.Deploy.Messaging": {
197197
"type": "Transitive",
198198
"resolved": "1.0.0",
199-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
199+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
200200
"dependencies": {
201201
"Ardalis.GuardClauses": "4.1.1",
202202
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Database/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
"Monai.Deploy.Messaging": {
356356
"type": "Transitive",
357357
"resolved": "1.0.0",
358-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
358+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
359359
"dependencies": {
360360
"Ardalis.GuardClauses": "4.1.1",
361361
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/InformaticsGateway/Services/DicomWeb/IStreamsWriter.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,6 @@ public StreamsWriter(
7777
_failureCount = 0;
7878
}
7979

80-
public async Task<StowResult> Save(IList<Stream> streams, string studyInstanceUid, VirtualApplicationEntity? virtualApplicationEntity, string workflowName, string correlationId, string dataSource, CancellationToken cancellationToken = default)
81-
{
82-
if (streams.IsNullOrEmpty())
83-
{
84-
return new StowResult { StatusCode = StatusCodes.Status204NoContent };
85-
}
86-
8780
public async Task<StowResult> Save(IList<Stream> streams, string? studyInstanceUid, VirtualApplicationEntity? virtualApplicationEntity, string? workflowName, string correlationId, string dataSource, CancellationToken cancellationToken = default)
8881
{
8982
if (streams.IsNullOrEmpty())
@@ -267,4 +260,4 @@ private void AddFailure(DicomStatus dicomStatus, StudySerieSopUids? uids = defau
267260
}
268261
}
269262
}
270-
}
263+
}

‎src/InformaticsGateway/Test/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@
819819
"Monai.Deploy.Messaging": {
820820
"type": "Transitive",
821821
"resolved": "1.0.0",
822-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
822+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
823823
"dependencies": {
824824
"Ardalis.GuardClauses": "4.1.1",
825825
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/InformaticsGateway/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@
559559
"Monai.Deploy.Messaging": {
560560
"type": "Transitive",
561561
"resolved": "1.0.0",
562-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
562+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
563563
"dependencies": {
564564
"Ardalis.GuardClauses": "4.1.1",
565565
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Plug-ins/RemoteAppExecution/Test/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@
430430
"Monai.Deploy.Messaging": {
431431
"type": "Transitive",
432432
"resolved": "1.0.0",
433-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
433+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
434434
"dependencies": {
435435
"Ardalis.GuardClauses": "4.1.1",
436436
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Plug-ins/RemoteAppExecution/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
"Monai.Deploy.Messaging": {
359359
"type": "Transitive",
360360
"resolved": "1.0.0",
361-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
361+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
362362
"dependencies": {
363363
"Ardalis.GuardClauses": "4.1.1",
364364
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎tests/Integration.Test/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@
678678
"Monai.Deploy.Messaging": {
679679
"type": "Transitive",
680680
"resolved": "1.0.0",
681-
"contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==",
681+
"contentHash": "cjYzSsO4/4sRl6cZQH2lcwrFgF0/SQQUJjRjnkw3OsTC18GvlF7oEwz9YVedinv5jwaIUoX1tA7ujnr4YnsSdQ==",
682682
"dependencies": {
683683
"Ardalis.GuardClauses": "4.1.1",
684684
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

0 commit comments

Comments
 (0)