Skip to content

Commit 1512ab7

Browse files
neildsouthneildsouth
committed
fix up merge
Signed-off-by: Neil South <[email protected]>
1 parent a3815d0 commit 1512ab7

File tree

26 files changed

+831
-1288
lines changed

26 files changed

+831
-1288
lines changed

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

Lines changed: 23 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,25 @@
44
"net6.0": {
55
"Monai.Deploy.Messaging": {
66
"type": "Direct",
7-
"requested": "[0.1.24, )",
8-
"resolved": "0.1.24",
9-
"contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==",
7+
"requested": "[0.1.25, )",
8+
"resolved": "0.1.25",
9+
"contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
1010
"dependencies": {
1111
"Ardalis.GuardClauses": "4.1.1",
12-
"Microsoft.Extensions.Configuration": "6.0.1",
13-
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20",
14-
"Microsoft.Extensions.Logging": "6.0.0",
12+
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
1513
"Newtonsoft.Json": "13.0.3",
16-
"System.ComponentModel.Annotations": "5.0.0",
1714
"System.IO.Abstractions": "17.2.3"
1815
}
1916
},
2017
"Monai.Deploy.Storage": {
2118
"type": "Direct",
22-
"requested": "[0.2.15, )",
23-
"resolved": "0.2.15",
24-
"contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
19+
"requested": "[0.2.18, )",
20+
"resolved": "0.2.18",
21+
"contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
2522
"dependencies": {
26-
"AWSSDK.SecurityToken": "3.7.101.26",
27-
"Ardalis.GuardClauses": "4.0.1",
28-
"Microsoft.Extensions.Configuration": "6.0.1",
29-
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
30-
"Microsoft.Extensions.Logging": "6.0.0",
31-
"Monai.Deploy.Storage.S3Policy": "0.2.15",
23+
"AWSSDK.SecurityToken": "3.7.201.9",
24+
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
25+
"Monai.Deploy.Storage.S3Policy": "0.2.18",
3226
"System.IO.Abstractions": "17.2.3"
3327
}
3428
},
@@ -39,24 +33,15 @@
3933
},
4034
"AWSSDK.Core": {
4135
"type": "Transitive",
42-
"resolved": "3.7.105.20",
43-
"contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
36+
"resolved": "3.7.200.13",
37+
"contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
4438
},
4539
"AWSSDK.SecurityToken": {
4640
"type": "Transitive",
47-
"resolved": "3.7.101.26",
48-
"contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
41+
"resolved": "3.7.201.9",
42+
"contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
4943
"dependencies": {
50-
"AWSSDK.Core": "[3.7.105.20, 4.0.0)"
51-
}
52-
},
53-
"Microsoft.Extensions.Configuration": {
54-
"type": "Transitive",
55-
"resolved": "6.0.1",
56-
"contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
57-
"dependencies": {
58-
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
59-
"Microsoft.Extensions.Primitives": "6.0.0"
44+
"AWSSDK.Core": "[3.7.200.13, 4.0.0)"
6045
}
6146
},
6247
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -67,35 +52,26 @@
6752
"Microsoft.Extensions.Primitives": "6.0.0"
6853
}
6954
},
70-
"Microsoft.Extensions.DependencyInjection": {
71-
"type": "Transitive",
72-
"resolved": "6.0.0",
73-
"contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
74-
"dependencies": {
75-
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
76-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
77-
}
78-
},
7955
"Microsoft.Extensions.DependencyInjection.Abstractions": {
8056
"type": "Transitive",
8157
"resolved": "6.0.0",
8258
"contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
8359
},
8460
"Microsoft.Extensions.Diagnostics.HealthChecks": {
8561
"type": "Transitive",
86-
"resolved": "6.0.20",
87-
"contentHash": "/uw/4EXx+tOWiqTVNbO0ooaFrrp06h68hI7XhOKyHRp7rdUi7SNmIsj0CCNE6PyZanfnQDwhNyaxG25u2HWpjg==",
62+
"resolved": "6.0.21",
63+
"contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
8864
"dependencies": {
89-
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20",
65+
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
9066
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
9167
"Microsoft.Extensions.Logging.Abstractions": "6.0.4",
9268
"Microsoft.Extensions.Options": "6.0.0"
9369
}
9470
},
9571
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
9672
"type": "Transitive",
97-
"resolved": "6.0.20",
98-
"contentHash": "qWT4ldcOylWZa+GXFePyAJSQ9d/gWzKIL2KdFCkudZpzMjeTUPpqMhIwZdJNvCupi/ercnUT3Ru1RI/rWwX8aA=="
73+
"resolved": "6.0.21",
74+
"contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
9975
},
10076
"Microsoft.Extensions.FileProviders.Abstractions": {
10177
"type": "Transitive",
@@ -115,18 +91,6 @@
11591
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
11692
}
11793
},
118-
"Microsoft.Extensions.Logging": {
119-
"type": "Transitive",
120-
"resolved": "6.0.0",
121-
"contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
122-
"dependencies": {
123-
"Microsoft.Extensions.DependencyInjection": "6.0.0",
124-
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
125-
"Microsoft.Extensions.Logging.Abstractions": "6.0.0",
126-
"Microsoft.Extensions.Options": "6.0.0",
127-
"System.Diagnostics.DiagnosticSource": "6.0.0"
128-
}
129-
},
13094
"Microsoft.Extensions.Logging.Abstractions": {
13195
"type": "Transitive",
13296
"resolved": "6.0.4",
@@ -151,10 +115,10 @@
151115
},
152116
"Monai.Deploy.Storage.S3Policy": {
153117
"type": "Transitive",
154-
"resolved": "0.2.15",
155-
"contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
118+
"resolved": "0.2.18",
119+
"contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
156120
"dependencies": {
157-
"Ardalis.GuardClauses": "4.0.1",
121+
"Ardalis.GuardClauses": "4.1.1",
158122
"Newtonsoft.Json": "13.0.3"
159123
}
160124
},
@@ -163,19 +127,6 @@
163127
"resolved": "13.0.3",
164128
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
165129
},
166-
"System.ComponentModel.Annotations": {
167-
"type": "Transitive",
168-
"resolved": "5.0.0",
169-
"contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
170-
},
171-
"System.Diagnostics.DiagnosticSource": {
172-
"type": "Transitive",
173-
"resolved": "6.0.0",
174-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
175-
"dependencies": {
176-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
177-
}
178-
},
179130
"System.IO.Abstractions": {
180131
"type": "Transitive",
181132
"resolved": "17.2.3",

‎src/Common/Miscellaneous/IMonaiService.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
using Monai.Deploy.Common.Miscellaneous;
18-
1917
namespace Monai.Deploy.Common.Miscellaneous
2018
{
2119
public interface IMonaiService

‎src/Common/Miscellaneous/packages.lock.json

Lines changed: 27 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -27,37 +27,28 @@
2727
},
2828
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
2929
"type": "Direct",
30-
"requested": "[6.0.20, )",
31-
"resolved": "6.0.20",
32-
"contentHash": "qWT4ldcOylWZa+GXFePyAJSQ9d/gWzKIL2KdFCkudZpzMjeTUPpqMhIwZdJNvCupi/ercnUT3Ru1RI/rWwX8aA=="
30+
"requested": "[6.0.21, )",
31+
"resolved": "6.0.21",
32+
"contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
3333
},
3434
"AWSSDK.Core": {
3535
"type": "Transitive",
36-
"resolved": "3.7.105.20",
37-
"contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
36+
"resolved": "3.7.200.13",
37+
"contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
3838
},
3939
"AWSSDK.SecurityToken": {
4040
"type": "Transitive",
41-
"resolved": "3.7.101.26",
42-
"contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
41+
"resolved": "3.7.201.9",
42+
"contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
4343
"dependencies": {
44-
"AWSSDK.Core": "[3.7.105.20, 4.0.0)"
44+
"AWSSDK.Core": "[3.7.200.13, 4.0.0)"
4545
}
4646
},
4747
"Microsoft.Bcl.AsyncInterfaces": {
4848
"type": "Transitive",
4949
"resolved": "1.1.1",
5050
"contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w=="
5151
},
52-
"Microsoft.Extensions.Configuration": {
53-
"type": "Transitive",
54-
"resolved": "6.0.1",
55-
"contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
56-
"dependencies": {
57-
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
58-
"Microsoft.Extensions.Primitives": "6.0.0"
59-
}
60-
},
6152
"Microsoft.Extensions.Configuration.Abstractions": {
6253
"type": "Transitive",
6354
"resolved": "6.0.0",
@@ -68,11 +59,10 @@
6859
},
6960
"Microsoft.Extensions.DependencyInjection": {
7061
"type": "Transitive",
71-
"resolved": "6.0.0",
72-
"contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
62+
"resolved": "2.2.0",
63+
"contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
7364
"dependencies": {
74-
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
75-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
65+
"Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
7666
}
7767
},
7868
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -82,10 +72,10 @@
8272
},
8373
"Microsoft.Extensions.Diagnostics.HealthChecks": {
8474
"type": "Transitive",
85-
"resolved": "6.0.20",
86-
"contentHash": "/uw/4EXx+tOWiqTVNbO0ooaFrrp06h68hI7XhOKyHRp7rdUi7SNmIsj0CCNE6PyZanfnQDwhNyaxG25u2HWpjg==",
75+
"resolved": "6.0.21",
76+
"contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
8777
"dependencies": {
88-
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.20",
78+
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
8979
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
9080
"Microsoft.Extensions.Logging.Abstractions": "6.0.4",
9181
"Microsoft.Extensions.Options": "6.0.0"
@@ -109,18 +99,6 @@
10999
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
110100
}
111101
},
112-
"Microsoft.Extensions.Logging": {
113-
"type": "Transitive",
114-
"resolved": "6.0.0",
115-
"contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
116-
"dependencies": {
117-
"Microsoft.Extensions.DependencyInjection": "6.0.0",
118-
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
119-
"Microsoft.Extensions.Logging.Abstractions": "6.0.0",
120-
"Microsoft.Extensions.Options": "6.0.0",
121-
"System.Diagnostics.DiagnosticSource": "6.0.0"
122-
}
123-
},
124102
"Microsoft.Extensions.Logging.Abstractions": {
125103
"type": "Transitive",
126104
"resolved": "6.0.4",
@@ -155,38 +133,32 @@
155133
},
156134
"Monai.Deploy.Messaging": {
157135
"type": "Transitive",
158-
"resolved": "0.1.24",
159-
"contentHash": "UMo/v9XBEvtiB6AvmW7QXS0DimlACajDyqX04QjIDOEs2B/NirRaXQ1ny+Ru/baw/G//lK4N8uGLUkYb4MF05Q==",
136+
"resolved": "0.1.25",
137+
"contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
160138
"dependencies": {
161139
"Ardalis.GuardClauses": "4.1.1",
162-
"Microsoft.Extensions.Configuration": "6.0.1",
163-
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.20",
164-
"Microsoft.Extensions.Logging": "6.0.0",
140+
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
165141
"Newtonsoft.Json": "13.0.3",
166-
"System.ComponentModel.Annotations": "5.0.0",
167142
"System.IO.Abstractions": "17.2.3"
168143
}
169144
},
170145
"Monai.Deploy.Storage": {
171146
"type": "Transitive",
172-
"resolved": "0.2.15",
173-
"contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
147+
"resolved": "0.2.18",
148+
"contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
174149
"dependencies": {
175-
"AWSSDK.SecurityToken": "3.7.101.26",
176-
"Ardalis.GuardClauses": "4.0.1",
177-
"Microsoft.Extensions.Configuration": "6.0.1",
178-
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
179-
"Microsoft.Extensions.Logging": "6.0.0",
180-
"Monai.Deploy.Storage.S3Policy": "0.2.15",
150+
"AWSSDK.SecurityToken": "3.7.201.9",
151+
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
152+
"Monai.Deploy.Storage.S3Policy": "0.2.18",
181153
"System.IO.Abstractions": "17.2.3"
182154
}
183155
},
184156
"Monai.Deploy.Storage.S3Policy": {
185157
"type": "Transitive",
186-
"resolved": "0.2.15",
187-
"contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
158+
"resolved": "0.2.18",
159+
"contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
188160
"dependencies": {
189-
"Ardalis.GuardClauses": "4.0.1",
161+
"Ardalis.GuardClauses": "4.1.1",
190162
"Newtonsoft.Json": "13.0.3"
191163
}
192164
},
@@ -200,19 +172,6 @@
200172
"resolved": "4.5.1",
201173
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
202174
},
203-
"System.ComponentModel.Annotations": {
204-
"type": "Transitive",
205-
"resolved": "5.0.0",
206-
"contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
207-
},
208-
"System.Diagnostics.DiagnosticSource": {
209-
"type": "Transitive",
210-
"resolved": "6.0.0",
211-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
212-
"dependencies": {
213-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
214-
}
215-
},
216175
"System.IO.Abstractions": {
217176
"type": "Transitive",
218177
"resolved": "17.2.3",
@@ -249,8 +208,8 @@
249208
"monai.deploy.common.configuration": {
250209
"type": "Project",
251210
"dependencies": {
252-
"Monai.Deploy.Messaging": "[0.1.24, )",
253-
"Monai.Deploy.Storage": "[0.2.15, )"
211+
"Monai.Deploy.Messaging": "[0.1.25, )",
212+
"Monai.Deploy.Storage": "[0.2.18, )"
254213
}
255214
}
256215
}

0 commit comments

Comments
 (0)