Merge remote-tracking branch 'origin/main' into develop

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

.github/.gitversion.yml

@@ -29,3 +29,4 @@ branches:
 ignore:
   sha: []
 merge-message-formats: {}
+next-version: 0.3.3

docs/compliance/third-party-licenses.md

@@ -1296,4 +1296,4 @@
       }
     }
   }
-}
+}

src/Api/Test/packages.lock.json

@@ -297,4 +297,4 @@
       }
     }
   }
-}
+}

src/Api/packages.lock.json

@@ -1615,4 +1615,4 @@
       }
     }
   }
-}
+}

src/CLI/Test/packages.lock.json

@@ -1465,4 +1465,4 @@
       }
     }
   }
-}
+}

src/CLI/packages.lock.json

@@ -1805,4 +1805,4 @@
       }
     }
   }
-}
+}

src/Client/Test/packages.lock.json

@@ -1217,4 +1217,4 @@
       }
     }
   }
-}
+}

src/Client/packages.lock.json

@@ -1190,4 +1190,4 @@
       }
     }
   }
-}
+}

src/Common/Test/packages.lock.json

@@ -143,4 +143,4 @@
       }
     }
   }
-}
+}

src/Common/packages.lock.json

@@ -1,4 +1,4 @@
-<!--
+<!--
   ~ Copyright 2021-2022 MONAI Consortium
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");

src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj

@@ -1321,4 +1321,4 @@
       }
     }
   }
-}
+}

src/Configuration/Test/packages.lock.json

@@ -308,4 +308,4 @@
       }
     }
   }
-}
+}

src/Configuration/packages.lock.json

@@ -1350,4 +1350,4 @@
       }
     }
   }
-}
+}

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

@@ -363,4 +363,4 @@
       }
     }
   }
-}
+}

src/Database/Api/packages.lock.json

@@ -1524,4 +1524,4 @@
       }
     }
   }
-}
+}

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

@@ -520,4 +520,4 @@
       }
     }
   }
-}
+}

src/Database/EntityFramework/packages.lock.json

@@ -1487,4 +1487,4 @@
       }
     }
   }
-}
+}

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

@@ -457,4 +457,4 @@
       }
     }
   }
-}
+}

src/Database/MongoDB/packages.lock.json

@@ -637,4 +637,4 @@
       }
     }
   }
-}
+}

src/Database/packages.lock.json

@@ -1492,4 +1492,4 @@
       }
     }
   }
-}
+}

src/DicomWebClient/CLI/packages.lock.json

@@ -1260,4 +1260,4 @@
       }
     }
   }
-}
+}

src/DicomWebClient/packages.lock.json

@@ -29,6 +29,8 @@
 using Monai.Deploy.InformaticsGateway.Common;
 using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database;
+using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
+using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Repositories;
 using Monai.Deploy.InformaticsGateway.Repositories;
 using Monai.Deploy.InformaticsGateway.Services.Common;
 using Monai.Deploy.InformaticsGateway.Services.Connectors;

src/InformaticsGateway/Program.cs

@@ -16,6 +16,7 @@
 
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;

src/InformaticsGateway/Services/Storage/ObjectUploadQueue.cs

@@ -2025,4 +2025,4 @@
       }
     }
   }
-}
+}

src/InformaticsGateway/Test/packages.lock.json

@@ -1663,4 +1663,4 @@
       }
     }
   }
-}
+}

src/InformaticsGateway/packages.lock.json

@@ -83,4 +83,4 @@
     "InformaticsGatewayServerEndpoint": "http://127.0.0.1:5000",
     "DockerImagePrefix": "ghcr.io/project-monai/monai-deploy-informatics-gateway"
   }
-}
+}

tests/Integration.Test/appsettings.json

@@ -1928,4 +1928,4 @@
       }
     }
   }
-}
+}