Skip to content

Commit a3815d0

Browse files
neildsouthneildsouth
committed
Merge remote-tracking branch 'origin/develop' into refactoring
2 parents f143ecd + 99bcbeb commit a3815d0

32 files changed

+945
-743
lines changed

‎doc/dependency_decisions.yml

100755100644
Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- 3.7.100.14
99
- 3.7.100.25
1010
- 3.7.105.20
11+
- 3.7.200.13
1112
:when: 2022-10-14 23:36:39.233755632 Z
1213
- - :approve
1314
- AWSSDK.SecurityToken
@@ -18,6 +19,7 @@
1819
- 3.7.100.14
1920
- 3.7.100.25
2021
- 3.7.101.26
22+
- 3.7.201.9
2123
:when: 2022-10-14 23:36:39.628260680 Z
2224
- - :approve
2325
- Ardalis.GuardClauses
@@ -400,6 +402,8 @@
400402
:versions:
401403
- 6.0.1
402404
- 7.0.0
405+
- 2.2.0
406+
- 3.1.0
403407
:when: 2022-10-14 23:37:00.596541774 Z
404408
- - :approve
405409
- Microsoft.Extensions.Configuration.Abstractions
@@ -415,6 +419,7 @@
415419
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
416420
:versions:
417421
- 3.0.0
422+
- 3.1.0
418423
- 2.2.0
419424
- 7.0.3
420425
:when: 2022-10-14 23:37:01.366955631 Z
@@ -470,6 +475,7 @@
470475
- :who: mocsharp
471476
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
472477
:versions:
478+
- 3.1.0
473479
- 6.0.0
474480
- 6.0.1
475481
- 2.2.0
@@ -507,7 +513,7 @@
507513
- 6.0.12
508514
- 6.0.14
509515
- 6.0.15
510-
- 6.0.20
516+
- 6.0.21
511517
:when: 2022-10-14 23:37:05.589288760 Z
512518
- - :approve
513519
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions
@@ -517,7 +523,7 @@
517523
- 6.0.12
518524
- 6.0.14
519525
- 6.0.15
520-
- 6.0.20
526+
- 6.0.21
521527
:when: 2022-10-14 23:37:05.963687838 Z
522528
- - :approve
523529
- Microsoft.Extensions.FileProviders.Abstractions
@@ -588,6 +594,8 @@
588594
:versions:
589595
- 6.0.0
590596
- 7.0.0
597+
- 2.2.0
598+
- 3.1.0
591599
:when: 2022-10-14 23:37:09.454044811 Z
592600
- - :approve
593601
- Microsoft.Extensions.Logging.Abstractions
@@ -596,6 +604,7 @@
596604
:versions:
597605
- 6.0.2
598606
- 2.0.0
607+
- 6.0.4
599608
- 7.0.0
600609
- 6.0.4
601610
:when: 2022-10-14 23:37:09.821156462 Z
@@ -855,6 +864,7 @@
855864
:versions:
856865
- 4.0.6
857866
- 4.0.7
867+
- 5.0.0
858868
:when: 2022-10-14 23:37:22.726827733 Z
859869
- - :approve
860870
- Moq
@@ -1201,7 +1211,15 @@
12011211
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
12021212
:versions:
12031213
- 5.0.0
1214+
- 4.3.0
12041215
:when: 2022-10-14 23:37:45.155805918 Z
1216+
- - :approve
1217+
- System.ComponentModel
1218+
- :who: nsouth
1219+
:why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770)
1220+
:versions:
1221+
- 4.3.0
1222+
:when: 2023-8-18 08:53:45.155805918 Z
12051223
- - :approve
12061224
- System.Configuration.ConfigurationManager
12071225
- :who: mocsharp
@@ -1387,6 +1405,13 @@
13871405
:versions:
13881406
- 4.3.0
13891407
:when: 2022-10-14 23:37:55.295846123 Z
1408+
- - :approve
1409+
- System.IO.Hashing
1410+
- :who: nsouth
1411+
:why: MIT
1412+
:versions:
1413+
- 7.0.0
1414+
:when: 2023-8-18 08:53:55.295846123 Z
13901415
- - :approve
13911416
- System.IdentityModel.Tokens.Jwt
13921417
- :who: mocsharp
@@ -2344,17 +2369,17 @@
23442369
:versions:
23452370
- 0.1.21
23462371
- 0.1.23
2347-
- 0.1.24
2348-
:when: 2023-07-27 21:43:10.781625468 Z
2372+
- 0.1.25
2373+
:when: 2022-12-15 21:43:10.781625468 Z
23492374
- - :approve
23502375
- Monai.Deploy.Messaging.RabbitMQ
23512376
- :who: samrooke
23522377
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
23532378
:versions:
23542379
- 0.1.21
23552380
- 0.1.23
2356-
- 0.1.24
2357-
:when: 2023-07-27 21:43:20.975488411 Z
2381+
- 0.1.25
2382+
:when: 2022-12-15 21:43:20.975488411 Z
23582383
- - :approve
23592384
- Monai.Deploy.Storage
23602385
- :who: neildsouth
@@ -2363,6 +2388,7 @@
23632388
- 0.2.10
23642389
- 0.2.13
23652390
- 0.2.15
2391+
- 0.2.18
23662392
:when: 2022-11-02 21:43:46.964761113 Z
23672393
- - :approve
23682394
- Monai.Deploy.Storage.MinIO
@@ -2372,6 +2398,7 @@
23722398
- 0.2.10
23732399
- 0.2.13
23742400
- 0.2.15
2401+
- 0.2.18
23752402
:when: 2022-11-02 21:43:57.620687413 Z
23762403
- - :approve
23772404
- Monai.Deploy.Storage.S3Policy
@@ -2381,6 +2408,7 @@
23812408
- 0.2.10
23822409
- 0.2.13
23832410
- 0.2.15
2411+
- 0.2.18
23842412
:when: 2022-11-02 21:44:06.994266372 Z
23852413
- - :approve
23862414
- MongoDB.Bson
@@ -2563,6 +2591,7 @@
25632591
:why: MIT (https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/License.md)
25642592
:versions:
25652593
- 7.1.2
2594+
- 8.1.0
25662595
:when: 2023-05-17 14:44:00.000000000 Z
25672596
- - :approve
25682597
- fo-dicom
@@ -2571,5 +2600,11 @@
25712600
:versions:
25722601
- 5.0.3
25732602
:when: 2023-05-17 14:44:00.000000000 Z
2574-
2603+
- - :approve
2604+
- CommunityToolkit.HighPerformance
2605+
- :who: nsouth
2606+
:why: MIT
2607+
:versions:
2608+
- 8.1.0
2609+
:when: 2023-08-18 09:09:00.000000000 Z
25752610

‎src/Common/Configuration/Monai.Deploy.Common.Configuration.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.24" />
35-
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.15" />
34+
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.25" />
35+
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.18" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

‎src/Common/Miscellaneous/Monai.Deploy.Common.Miscellaneous.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<ItemGroup>
5050
<PackageReference Include="Ardalis.GuardClauses" Version="4.1.1" />
5151
<PackageReference Include="fo-dicom" Version="5.0.3" />
52-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.20" />
52+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.21" />
5353
</ItemGroup>
5454

5555
<ItemGroup>

‎src/Shared/Common/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)