Skip to content

Commit 9473c1b

Browse files
mocsharpmocsharp
committed
Fix merge errors
Signed-off-by: Victor Chang <[email protected]>
1 parent 64c5adf commit 9473c1b

File tree

5 files changed

+27
-19
lines changed

5 files changed

+27
-19
lines changed

‎src/Api/Storage/Payload.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Diagnostics;
77
using System.Linq;
88
using Ardalis.GuardClauses;
9-
9+
using Monai.Deploy.InformaticsGateway.Common;
1010
namespace Monai.Deploy.InformaticsGateway.Api.Storage
1111
{
1212
public class Payload : IDisposable

‎src/Common/Test/FileSystemExtensionsTest.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,18 @@ public void TryGenerateDirectory_ExceededRetries()
7070
[Fact]
7171
public void TryGenerateDirectory_GeneratesADirectory()
7272
{
73-
var fileSystem = new MockFileSystem();
73+
var retry = 0;
74+
var fileSystem = new Mock<IFileSystem>();
75+
fileSystem.Setup(p => p.Directory.CreateDirectory(It.IsAny<string>()))
76+
.Callback(() =>
77+
{
78+
if (++retry < 5) throw new System.IO.IOException();
79+
});
7480

75-
Assert.True(fileSystem.Directory.TryGenerateDirectory("/some/path", out string generatedPath));
81+
Assert.True(fileSystem.Object.Directory.TryGenerateDirectory("/some/path", out string generatedPath));
7682
Assert.StartsWith("/some/path-", generatedPath);
83+
84+
fileSystem.Verify(p => p.Directory.CreateDirectory(It.IsAny<string>()), Times.Exactly(5));
7785
}
7886
}
7987
}

‎src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Ardalis.GuardClauses" Version="3.3.0" />
21-
<PackageReference Include="DotNext.Threading" Version="4.1.3" />
20+
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.0" />
21+
<PackageReference Include="DotNext.Threading" Version="4.3.0" />
2222
<PackageReference Include="fo-dicom" Version="5.0.2" />
2323
<PackageReference Include="Karambolo.Extensions.Logging.File" Version="3.2.1" />
24-
<PackageReference Include="GitVersion.MsBuild" Version="5.8.2">
24+
<PackageReference Include="GitVersion.MsBuild" Version="5.9.0">
2525
<PrivateAssets>All</PrivateAssets>
2626
</PackageReference>
27-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
27+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.3" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
2929
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
3030
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
3131
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
3232
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
3333
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
34-
<PackageReference Include="Polly" Version="7.2.2" />
35-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
34+
<PackageReference Include="Polly" Version="7.2.3" />
35+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

‎src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.3" />
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
22-
<PackageReference Include="Moq" Version="4.16.1" />
23-
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="13.2.47" />
24-
<PackageReference Include="xRetry" Version="1.7.0" />
22+
<PackageReference Include="Moq" Version="4.17.2" />
23+
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="16.1.20" />
24+
<PackageReference Include="xRetry" Version="1.8.0" />
2525
<PackageReference Include="xunit" Version="2.4.1" />
2626
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -31,7 +31,7 @@
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
<PrivateAssets>all</PrivateAssets>
3333
</PackageReference>
34-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
34+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
<ItemGroup>
99
<PackageReference Include="fo-dicom" Version="5.0.2" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.2" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.3" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
1313
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
1515
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
1717
<PackageReference Include="Minio" Version="3.1.13" />
18-
<PackageReference Include="Moq" Version="4.16.1" />
18+
<PackageReference Include="Moq" Version="4.17.2" />
1919
<PackageReference Include="Polly" Version="7.2.3" />
2020
<PackageReference Include="RabbitMQ.Client" Version="6.2.4" />
2121
<PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />

0 commit comments

Comments
 (0)