Merge branch 'main' into patch/0.3.11

Signed-off-by: Victor Chang <vicchang@nvidia.com>
Project-MONAI · Mar 8, 2023 · 6d45521 · 6d45521
2 parents 7c97f1e + 01abefd
commit 6d45521
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 22 deletions.
diff --git a/.github/.gitversion.yml b/.github/.gitversion.yml
@@ -29,4 +29,4 @@ branches:
 ignore:
   sha: []
 merge-message-formats: {}
-next-version: 0.3.7
+next-version: 0.3.9
diff --git a/src/Api/Test/packages.lock.json b/src/Api/Test/packages.lock.json
@@ -1285,4 +1285,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json
@@ -287,4 +287,4 @@
       }
     }
   }
-}
+}
diff --git a/src/CLI/Test/packages.lock.json b/src/CLI/Test/packages.lock.json
@@ -1604,4 +1604,4 @@
       }
     }
   }
-}
+}
diff --git a/src/CLI/packages.lock.json b/src/CLI/packages.lock.json
@@ -1455,4 +1455,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Client/Test/packages.lock.json b/src/Client/Test/packages.lock.json
@@ -1616,6 +1616,11 @@
         "resolved": "4.4.0",
         "contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ=="
       },
+      "TestableIO.System.IO.Abstractions": {
+        "type": "Transitive",
+        "resolved": "18.0.1",
+        "contentHash": "nacJfL4mGObg8Ttn3ZCJZ2u9z8ivG43xgUJvQQLKCmDnle4m49NYNOLk8cqB4iPdSqVhnUSy+qcIryWgDHCqeg=="
+      },
       "xunit.abstractions": {
         "type": "Transitive",
         "resolved": "2.0.3",
@@ -1807,4 +1812,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Client/packages.lock.json b/src/Client/packages.lock.json
@@ -1207,4 +1207,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Configuration/Test/packages.lock.json b/src/Configuration/Test/packages.lock.json
@@ -1310,4 +1310,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json
@@ -298,4 +298,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Database/Api/Test/packages.lock.json b/src/Database/Api/Test/packages.lock.json
@@ -1340,4 +1340,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Database/Api/packages.lock.json b/src/Database/Api/packages.lock.json
@@ -353,4 +353,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Database/EntityFramework/Test/packages.lock.json b/src/Database/EntityFramework/Test/packages.lock.json
@@ -1513,4 +1513,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Database/EntityFramework/packages.lock.json b/src/Database/EntityFramework/packages.lock.json
@@ -509,4 +509,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj
@@ -32,7 +32,7 @@
     <ProjectReference Include="EntityFramework\Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj" />
     <ProjectReference Include="MongoDB\Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Compile Remove="EntityFramework\**" />
     <EmbeddedResource Remove="EntityFramework\**" />

diff --git a/src/Database/MongoDB/Integration.Test/packages.lock.json b/src/Database/MongoDB/Integration.Test/packages.lock.json
@@ -1478,4 +1478,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Database/MongoDB/packages.lock.json b/src/Database/MongoDB/packages.lock.json
@@ -448,4 +448,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json
@@ -648,4 +648,4 @@
       }
     }
   }
-}
+}
diff --git a/src/InformaticsGateway/Test/packages.lock.json b/src/InformaticsGateway/Test/packages.lock.json
@@ -2026,4 +2026,4 @@
       }
     }
   }
-}
+}
diff --git a/src/InformaticsGateway/packages.lock.json b/src/InformaticsGateway/packages.lock.json
@@ -1561,6 +1561,11 @@
         "resolved": "4.4.0",
         "contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ=="
       },
+      "TestableIO.System.IO.Abstractions": {
+        "type": "Transitive",
+        "resolved": "18.0.1",
+        "contentHash": "nacJfL4mGObg8Ttn3ZCJZ2u9z8ivG43xgUJvQQLKCmDnle4m49NYNOLk8cqB4iPdSqVhnUSy+qcIryWgDHCqeg=="
+      },
       "ZstdSharp.Port": {
         "type": "Transitive",
         "resolved": "0.6.2",
@@ -1587,8 +1592,8 @@
         "type": "Project",
         "dependencies": {
           "Ardalis.GuardClauses": "[4.0.1, )",
-          "System.IO.Abstractions": "[17.2.3, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )",
+          "TestableIO.System.IO.Abstractions": "[18.0.1, )",
           "fo-dicom": "[5.0.3, )"
         }
       },
@@ -1665,4 +1670,4 @@
       }
     }
   }
-}
+}
diff --git a/tests/Integration.Test/packages.lock.json b/tests/Integration.Test/packages.lock.json
@@ -1725,6 +1725,11 @@
         "resolved": "4.4.0",
         "contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ=="
       },
+      "TestableIO.System.IO.Abstractions": {
+        "type": "Transitive",
+        "resolved": "18.0.1",
+        "contentHash": "nacJfL4mGObg8Ttn3ZCJZ2u9z8ivG43xgUJvQQLKCmDnle4m49NYNOLk8cqB4iPdSqVhnUSy+qcIryWgDHCqeg=="
+      },
       "Validation": {
         "type": "Transitive",
         "resolved": "2.4.18",
@@ -1852,8 +1857,8 @@
         "type": "Project",
         "dependencies": {
           "Ardalis.GuardClauses": "[4.0.1, )",
-          "System.IO.Abstractions": "[17.2.3, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )",
+          "TestableIO.System.IO.Abstractions": "[18.0.1, )",
           "fo-dicom": "[5.0.3, )"
         }
       },
@@ -1930,4 +1935,4 @@
       }
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1285,4 +1285,4 @@ @@
           }
         }
       }
-    }
+    }