Skip to content

Commit a835b4e

Browse files
neildsouthneildsouth
committed
merge in develop
Signed-off-by: Neil South <[email protected]>
2 parents 8058751 + fcd0247 commit a835b4e

File tree

259 files changed

+39582
-7288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

259 files changed

+39582
-7288
lines changed

‎.github/workflows/ci.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,14 @@ jobs:
160160

161161
unit-test:
162162
runs-on: ubuntu-latest
163+
services:
164+
mongo:
165+
image: mongo
166+
env:
167+
MONGO_INITDB_ROOT_USERNAME: root
168+
MONGO_INITDB_ROOT_PASSWORD: rootpassword
169+
ports:
170+
- 27017:27017
163171
steps:
164172
- name: Set up JDK 11
165173
uses: actions/setup-java@v3
@@ -230,14 +238,16 @@ jobs:
230238
verbose: true
231239

232240
integration-test:
233-
runs-on: ubuntu-22.04
241+
runs-on: ubuntu-latest
234242
timeout-minutes: 30
235243
strategy:
236244
matrix:
237245
feature: [AcrApi, DicomDimseScp, DicomDimseScu, DicomWebExport, DicomWebStow, HealthLevel7, Fhir]
246+
database: [ef, mongodb]
238247
fail-fast: false
239248
env:
240249
TAG: ${{ needs.build.outputs.TAG }}
250+
DOTNET_TEST: ${{ matrix.database }}
241251
steps:
242252
- name: Checkout repository
243253
uses: actions/checkout@v3

‎doc/dependency_decisions.yml

Lines changed: 96 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
- :who: mocsharp
103103
:why: MIT (https://github.com/GitTools/GitVersion/raw/main/LICENSE)
104104
:versions:
105-
- 5.10.3
105+
- 5.11.1
106106
:when: 2022-08-16 23:05:34.633372053 Z
107107
- - :approve
108108
- HL7-dotnetcore
@@ -319,72 +319,70 @@
319319
- :who: mocsharp
320320
:why: MIT (https://github.com/microsoft/vstest/raw/main/LICENSE)
321321
:versions:
322-
- 17.1.0
323-
- 17.2.0
324322
- 17.4.0
325323
:when: 2022-08-16 23:05:48.342748414 Z
326324
- - :approve
327325
- Microsoft.Data.Sqlite.Core
328326
- :who: mocsharp
329327
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
330328
:versions:
331-
- 6.0.10
329+
- 6.0.11
332330
:when: 2022-08-16 23:05:49.698463427 Z
333331
- - :approve
334332
- Microsoft.EntityFrameworkCore
335333
- :who: mocsharp
336334
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
337335
:versions:
338-
- 6.0.10
336+
- 6.0.11
339337
:when: 2022-08-16 23:05:50.137694970 Z
340338
- - :approve
341339
- Microsoft.EntityFrameworkCore.Abstractions
342340
- :who: mocsharp
343341
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
344342
:versions:
345-
- 6.0.10
343+
- 6.0.11
346344
:when: 2022-08-16 23:05:51.008105271 Z
347345
- - :approve
348346
- Microsoft.EntityFrameworkCore.Analyzers
349347
- :who: mocsharp
350348
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
351349
:versions:
352-
- 6.0.10
350+
- 6.0.11
353351
:when: 2022-08-16 23:05:51.445711308 Z
354352
- - :approve
355353
- Microsoft.EntityFrameworkCore.Design
356354
- :who: mocsharp
357355
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
358356
:versions:
359-
- 6.0.10
357+
- 6.0.11
360358
:when: 2022-08-16 23:05:51.922790944 Z
361359
- - :approve
362360
- Microsoft.EntityFrameworkCore.InMemory
363361
- :who: mocsharp
364362
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
365363
:versions:
366-
- 6.0.10
364+
- 6.0.11
367365
:when: 2022-08-16 23:05:52.375150938 Z
368366
- - :approve
369367
- Microsoft.EntityFrameworkCore.Relational
370368
- :who: mocsharp
371369
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
372370
:versions:
373-
- 6.0.10
371+
- 6.0.11
374372
:when: 2022-08-16 23:05:52.828879230 Z
375373
- - :approve
376374
- Microsoft.EntityFrameworkCore.Sqlite
377375
- :who: mocsharp
378376
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
379377
:versions:
380-
- 6.0.10
378+
- 6.0.11
381379
:when: 2022-08-16 23:05:53.270526921 Z
382380
- - :approve
383381
- Microsoft.EntityFrameworkCore.Sqlite.Core
384382
- :who: mocsharp
385383
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
386384
:versions:
387-
- 6.0.10
385+
- 6.0.11
388386
:when: 2022-08-16 23:05:53.706997823 Z
389387
- - :approve
390388
- Microsoft.Extensions.ApiDescription.Server
@@ -526,20 +524,22 @@
526524
:why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
527525
:versions:
528526
- 6.0.10
527+
- 6.0.11
529528
:when: 2022-08-29 18:11:22.090772006 Z
530529
- - :approve
531530
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions
532531
- :who: mocsharp
533532
:why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
534533
:versions:
535534
- 6.0.10
535+
- 6.0.11
536536
:when: 2022-08-29 18:11:22.090772006 Z
537537
- - :approve
538538
- Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore
539539
- :who: mocsharp
540540
:why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
541541
:versions:
542-
- 6.0.10
542+
- 6.0.11
543543
:when: 2022-08-29 18:11:22.090772006 Z
544544
- - :approve
545545
- Microsoft.Extensions.FileProviders.Abstractions
@@ -603,8 +603,8 @@
603603
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
604604
:versions:
605605
- 6.0.0
606-
- 6.0.1
607606
- 6.0.2
607+
- 6.0.3
608608
:when: 2022-08-16 23:06:06.728283354 Z
609609
- - :approve
610610
- Microsoft.Extensions.Logging.Configuration
@@ -703,6 +703,7 @@
703703
:why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT)
704704
:versions:
705705
- 3.0.0
706+
- 5.0.0
706707
:when: 2022-08-16 23:06:13.902743611 Z
707708
- - :approve
708709
- Microsoft.NETCore.Targets
@@ -735,19 +736,15 @@
735736
- - :approve
736737
- Microsoft.TestPlatform.ObjectModel
737738
- :who: mocsharp
738-
:why: MIT (https://github.com/microsoft/vstest/raw/v17.1.0/LICENSE)
739+
:why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE)
739740
:versions:
740-
- 17.1.0
741-
- 17.2.0
742741
- 17.4.0
743742
:when: 2022-08-16 23:06:16.175705981 Z
744743
- - :approve
745744
- Microsoft.TestPlatform.TestHost
746745
- :who: mocsharp
747-
:why: MIT (https://github.com/microsoft/vstest/raw/v17.1.0/LICENSE)
746+
:why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE)
748747
:versions:
749-
- 17.1.0
750-
- 17.2.0
751748
- 17.4.0
752749
:when: 2022-08-16 23:06:17.671459450 Z
753750
- - :approve
@@ -783,22 +780,21 @@
783780
- :who: mocsharp
784781
:why: Apache-2.0 (https://github.com/minio/minio-dotnet/raw/master/LICENSE)
785782
:versions:
786-
- 4.0.5
787783
- 4.0.6
788784
:when: 2022-08-16 23:06:20.598551507 Z
789785
- - :approve
790786
- Monai.Deploy.Messaging
791-
- :who: mocsharp
787+
- :who: neilsouth
792788
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
793789
:versions:
794-
- 0.1.11
790+
- 0.1.16
795791
:when: 2022-08-16 23:06:21.051573547 Z
796792
- - :approve
797793
- Monai.Deploy.Messaging.RabbitMQ
798-
- :who: mocsharp
794+
- :who: neilsouth
799795
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
800796
:versions:
801-
- 0.1.11
797+
- 0.1.16
802798
:when: 2022-08-16 23:06:21.511789690 Z
803799
- - :approve
804800
- Monai.Deploy.Storage
@@ -849,13 +845,6 @@
849845
:versions:
850846
- 2.0.0
851847
:when: 2022-08-16 23:06:24.756106826 Z
852-
- - :approve
853-
- NPOI
854-
- :who: mocsharp
855-
:why: Apache-2.0 (https://github.com/nissl-lab/npoi/raw/master/LICENSE)
856-
:versions:
857-
- 2.5.6
858-
:when: 2022-08-16 23:06:25.198846196 Z
859848
- - :approve
860849
- Newtonsoft.Json
861850
- :who: mocsharp
@@ -1134,6 +1123,7 @@
11341123
- :who: mocsharp
11351124
:why: MIT ( https://github.com/dotnet/corefx/raw/master/LICENSE.TXT)
11361125
:versions:
1126+
- 4.4.0
11371127
- 4.5.0
11381128
:when: 2022-08-16 23:06:43.335979768 Z
11391129
- - :approve
@@ -1239,15 +1229,13 @@
12391229
- :who: mocsharp
12401230
:why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE)
12411231
:versions:
1242-
- 17.2.1
12431232
- 17.2.3
12441233
:when: 2022-08-16 23:06:50.602318269 Z
12451234
- - :approve
12461235
- System.IO.Abstractions.TestingHelpers
12471236
- :who: mocsharp
12481237
:why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE)
12491238
:versions:
1250-
- 17.2.1
12511239
- 17.2.3
12521240
:when: 2022-08-16 23:06:51.524564913 Z
12531241
- - :approve
@@ -1542,7 +1530,7 @@
15421530
- :who: mocsharp
15431531
:why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT)
15441532
:versions:
1545-
- 4.5.0
1533+
- 5.0.0
15461534
:when: 2022-08-16 23:07:11.063425328 Z
15471535
- - :approve
15481536
- System.Security.Claims
@@ -1598,6 +1586,7 @@
15981586
- :who: mocsharp
15991587
:why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT)
16001588
:versions:
1589+
- 4.4.0
16011590
- 4.5.0
16021591
:when: 2022-08-16 23:07:14.759818552 Z
16031592
- - :approve
@@ -1633,7 +1622,7 @@
16331622
- :who: mocsharp
16341623
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
16351624
:versions:
1636-
- 4.5.0
1625+
- 5.0.0
16371626
:when: 2022-08-16 23:07:17.059464936 Z
16381627
- - :approve
16391628
- System.Text.Encoding
@@ -1683,8 +1672,7 @@
16831672
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
16841673
:versions:
16851674
- 6.0.0
1686-
- 6.0.5
1687-
- 6.0.6
1675+
- 6.0.7
16881676
:when: 2022-08-16 23:07:20.787263056 Z
16891677
- - :approve
16901678
- System.Text.RegularExpressions
@@ -1817,7 +1805,6 @@
18171805
- :who: mocsharp
18181806
:why: Microsoft Public License (https://github.com/fo-dicom/fo-dicom/raw/development/License.txt)
18191807
:versions:
1820-
- 5.0.2
18211808
- 5.0.3
18221809
:when: 2022-08-16 23:07:29.574869349 Z
18231810
- - :approve
@@ -2380,3 +2367,73 @@
23802367
:versions:
23812368
- 5.0.3
23822369
:when: 2022-10-12 03:14:08.789273776 Z
2370+
- - :approve
2371+
- DnsClient
2372+
- :who: mocsharp
2373+
:why: Apache-2.0 (https://github.com/MichaCo/DnsClient.NET/raw/dev/LICENSE)
2374+
:versions:
2375+
- 1.6.1
2376+
:when: 2022-11-16 23:33:33.315560769 Z
2377+
- - :approve
2378+
- Snappier
2379+
- :who: mocsharp
2380+
:why: BSD-3-Clause (https://github.com/brantburnett/Snappier/raw/main/COPYING.txt)
2381+
:versions:
2382+
- 1.0.0
2383+
:when: 2022-10-14 23:37:36.642306800 Z
2384+
- - :approve
2385+
- ZstdSharp.Port
2386+
- :who: mocsharp
2387+
:why: MIT (https://github.com/oleg-st/ZstdSharp/raw/master/LICENSE)
2388+
:versions:
2389+
- 0.6.2
2390+
:when: 2022-10-14 23:38:32.685243680 Z
2391+
- - :approve
2392+
- Microsoft.Win32.Registry
2393+
- :who: mocsharp
2394+
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
2395+
:versions:
2396+
- 5.0.0
2397+
:when: 2022-11-16 23:38:53.540718932 Z
2398+
- - :approve
2399+
- MongoDB.Bson
2400+
- :who: mocsharp
2401+
:why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
2402+
:versions:
2403+
- 2.18.0
2404+
:when: 2022-11-16 23:38:53.891380809 Z
2405+
- - :approve
2406+
- MongoDB.Driver
2407+
- :who: mocsharp
2408+
:why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
2409+
:versions:
2410+
- 2.18.0
2411+
:when: 2022-11-16 23:38:54.213853364 Z
2412+
- - :approve
2413+
- MongoDB.Driver.Core
2414+
- :who: mocsharp
2415+
:why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
2416+
:versions:
2417+
- 2.18.0
2418+
:when: 2022-11-16 23:38:54.553730219 Z
2419+
- - :approve
2420+
- MongoDB.Libmongocrypt
2421+
- :who: mocsharp
2422+
:why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
2423+
:versions:
2424+
- 1.6.0
2425+
:when: 2022-11-16 23:38:54.863359236 Z
2426+
- - :approve
2427+
- SharpCompress
2428+
- :who: mocsharp
2429+
:why: MIT (https://github.com/adamhathcock/sharpcompress/raw/master/LICENSE.txt)
2430+
:versions:
2431+
- 0.30.1
2432+
:when: 2022-11-16 23:38:55.192078193 Z
2433+
- - :approve
2434+
- SharpCompress
2435+
- :who: mocsharp
2436+
:why: MIT (https://github.com/adamhathcock/sharpcompress/raw/master/LICENSE.txt)
2437+
:versions:
2438+
- 0.30.1
2439+
:when: 2022-11-16 23:38:55.532789254 Z

‎docker-compose/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ services:
6868
networks:
6969
- monaideploy
7070
healthcheck:
71-
test: echo 'db.runCommand("ping").ok' | mongo localhost:27017/productiondb --quiet
71+
test: echo 'db.runCommand("ping").ok' | mongosh localhost:27017/productiondb --quiet
7272
interval: 10s
7373
timeout: 10s
7474
retries: 5

0 commit comments

Comments
 (0)