Skip to content

Commit 5d8c03a

Browse files
Dim145Dim145
committed
fix by updates
1 parent 6412e65 commit 5d8c03a

5 files changed

Lines changed: 34 additions & 32 deletions

File tree

‎Agent/Agent.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.14" />
11+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.20" />
1212
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
13-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
13+
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎Core/Core.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.14" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.20" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
1414
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
15-
<PackageReference Include="MySql.EntityFrameworkCore" Version="7.0.14" />
16-
<PackageReference Include="MySqlConnector" Version="2.3.5" />
17-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
15+
<PackageReference Include="MySql.EntityFrameworkCore" Version="7.0.16" />
16+
<PackageReference Include="MySqlConnector" Version="2.4.0" />
17+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.18" />
1818
</ItemGroup>
1919

2020
</Project>

‎DatabaseBackupManager/DatabaseBackupManager.csproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,32 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="AWSSDK.S3" Version="3.7.305.30" />
14-
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
15-
<PackageReference Include="Cronos" Version="0.8.4" />
13+
<PackageReference Include="AWSSDK.S3" Version="4.0.0.3" />
14+
<PackageReference Include="Azure.Storage.Blobs" Version="12.24.0" />
15+
<PackageReference Include="Cronos" Version="0.10.0" />
1616
<PackageReference Include="EasyCaching.InMemory" Version="1.9.2" />
1717
<PackageReference Include="EasyCaching.Redis" Version="1.9.2" />
1818
<PackageReference Include="EasyCaching.Serialization.Json" Version="1.9.2" />
19-
<PackageReference Include="EFCoreSecondLevelCacheInterceptor" Version="4.4.1" />
19+
<PackageReference Include="EFCoreSecondLevelCacheInterceptor" Version="5.2.4" />
2020
<PackageReference Include="FluentEmail.Razor" Version="3.0.2" />
2121
<PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
22-
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.11" />
23-
<PackageReference Include="Hangfire.PostgreSql" Version="1.20.8" />
24-
<PackageReference Include="Hangfire.Storage.SQLite" Version="0.4.1" />
25-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="7.0.14" />
26-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.14" />
27-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.14" />
28-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.14" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.14">
22+
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.18" />
23+
<PackageReference Include="Hangfire.PostgreSql" Version="1.20.12" />
24+
<PackageReference Include="Hangfire.Storage.SQLite" Version="0.4.2" />
25+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="7.0.20" />
26+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.20" />
27+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.20" />
28+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.20" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.20">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>
33-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
33+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.20">
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
37-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
38-
<PackageReference Include="Minio" Version="6.0.2" />
37+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.12" />
38+
<PackageReference Include="Minio" Version="6.0.4" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

‎DatabaseBackupManager/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ void getOptions(IServiceProvider sp, DbContextOptionsBuilder options)
8787
{
8888
builder.Services.AddEFSecondLevelCache(options =>
8989
{
90-
options.ConfigureLogging(Seeds.RedisSettings.LogsEnabled, tuple => Console.WriteLine(tuple.Item2));
91-
options.UseEasyCachingCoreProvider(Constants.RedisCachingName);
90+
options.ConfigureLogging(Seeds.RedisSettings.LogsEnabled, tuple => Console.WriteLine(tuple.Message));
91+
options.UseCacheKeyPrefix(Constants.RedisCachingName);
9292
options.CacheAllQueries(CacheExpirationMode.Sliding, TimeSpan.FromMinutes(Seeds.RedisSettings.CacheExpiration));
9393
options.UseDbCallsIfCachingProviderIsDown(TimeSpan.FromSeconds(Seeds.RedisSettings.Timeout));
9494
});

‎DatabaseBackupManager/Services/StorageService/S3StorageService.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,16 @@ public async Task<string[]> GetFiles(string path)
7474
.WithBucket(StorageSettings.S3Bucket)
7575
.WithPrefix(path);
7676

77-
var sObservable = MinioClient.ListObjectsAsync(listObjectsArgs);
77+
var asyncEnumerable = MinioClient.ListObjectsEnumAsync(listObjectsArgs);
7878

79-
var list = await sObservable.ToList();
80-
81-
return list
82-
.Where(i => !i.IsDir)
83-
.Select(i => $"{path}/{i.Key}")
84-
.ToArray();
79+
// transform the async enumerable to a list of strings
80+
var files = new List<string>();
81+
await foreach (var item in asyncEnumerable)
82+
{
83+
files.Add(item.Key);
84+
}
85+
86+
return files.ToArray();
8587
}
8688

8789
public async Task<FileInfo> Get(string path)

0 commit comments

Comments
 (0)