Skip to content

Commit

Permalink
Merge branch 'main' into patch/0.3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
mocsharp committed Mar 8, 2023
2 parents 7c97f1e + 01abefd commit 3e9f460
Show file tree
Hide file tree
Showing 20 changed files with 37 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/.gitversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ branches:
ignore:
sha: []
merge-message-formats: {}
next-version: 0.3.7
next-version: 0.3.9
2 changes: 1 addition & 1 deletion src/Api/Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1285,4 +1285,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Api/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -287,4 +287,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/CLI/Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1604,4 +1604,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/CLI/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1455,4 +1455,4 @@
}
}
}
}
}
7 changes: 6 additions & 1 deletion src/Client/Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -1807,4 +1812,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Client/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1207,4 +1207,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Configuration/Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1310,4 +1310,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Configuration/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,4 +298,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Database/Api/Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1340,4 +1340,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Database/Api/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -353,4 +353,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Database/EntityFramework/Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1513,4 +1513,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Database/EntityFramework/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -509,4 +509,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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\**" />
Expand Down
2 changes: 1 addition & 1 deletion src/Database/MongoDB/Integration.Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1478,4 +1478,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Database/MongoDB/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -448,4 +448,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Database/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -648,4 +648,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/InformaticsGateway/Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2026,4 +2026,4 @@
}
}
}
}
}
9 changes: 7 additions & 2 deletions src/InformaticsGateway/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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, )"
}
},
Expand Down Expand Up @@ -1665,4 +1670,4 @@
}
}
}
}
}
9 changes: 7 additions & 2 deletions tests/Integration.Test/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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, )"
}
},
Expand Down Expand Up @@ -1930,4 +1935,4 @@
}
}
}
}
}

0 comments on commit 3e9f460

Please sign in to comment.