Skip to content

Commit 497fc9b

Browse files
KSemenenkoKSemenenko
committed
Merge branch 'main' into upload-chunk-using-merge
# Conflicts: # Directory.Build.props # ManagedCode.Storage.Aws/ManagedCode.Storage.Aws.csproj # ManagedCode.Storage.Azure.DataLake/ManagedCode.Storage.Azure.DataLake.csproj # ManagedCode.Storage.Azure/ManagedCode.Storage.Azure.csproj # ManagedCode.Storage.Google/ManagedCode.Storage.Google.csproj
2 parents 80b9ae1 + f84430e commit 497fc9b

File tree

8 files changed

+60
-49
lines changed

8 files changed

+60
-49
lines changed

‎Directory.Build.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
<RepositoryUrl>https://github.com/managedcode/Storage</RepositoryUrl>
2727
<PackageProjectUrl>https://github.com/managedcode/Storage</PackageProjectUrl>
2828
<Product>Managed Code - Storage</Product>
29-
<Version>2.1.15-alpha</Version>
30-
<PackageVersion>2.1.15-alpha</PackageVersion>
29+
<Version>2.1.16</Version>
30+
<PackageVersion>2.1.16</PackageVersion>
31+
3132
</PropertyGroup>
3233

3334
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

‎ManagedCode.Storage.Aws/AWSStorage.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public override async IAsyncEnumerable<BlobMetadata> GetBlobMetadataListAsync(st
6868
yield return new BlobMetadata
6969
{
7070
Name = entry.Key,
71-
FullName = entry.Key,
71+
FullName = $"{StorageOptions.Bucket}/{entry.Key}",
7272
Container = StorageOptions.Bucket,
7373
Uri = new Uri($"https://s3.amazonaws.com/{StorageOptions.Bucket}/{entry.Key}"),
7474
LastModified = objectMetaResponse.LastModified,
@@ -99,7 +99,11 @@ protected override async Task<Result> CreateContainerInternalAsync(CancellationT
9999
{
100100
try
101101
{
102-
await StorageClient.EnsureBucketExistsAsync(StorageOptions.Bucket);
102+
if (StorageOptions.CreateContainerIfNotExists)
103+
{
104+
await StorageClient.EnsureBucketExistsAsync(StorageOptions.Bucket);
105+
}
106+
103107
return Result.Succeed();
104108
}
105109
catch (Exception ex)

‎ManagedCode.Storage.Aws/ManagedCode.Storage.Aws.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<LangVersion>12</LangVersion>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<LangVersion>11</LangVersion>
66
<EnableNETAnalyzers>true</EnableNETAnalyzers>
77
<DebugType>embedded</DebugType>
88
<Nullable>enable</Nullable>
@@ -22,10 +22,10 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="ManagedCode.Communication" Version="8.0.0" />
26-
<PackageReference Include="AWSSDK.S3" Version="3.7.305.22" />
25+
<PackageReference Include="ManagedCode.Communication" Version="2.0.26" />
26+
<PackageReference Include="AWSSDK.S3" Version="3.7.308.7" />
2727
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
2929
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
3030
</ItemGroup>
3131

‎ManagedCode.Storage.Azure.DataLake/ManagedCode.Storage.Azure.DataLake.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<LangVersion>12</LangVersion>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<LangVersion>11</LangVersion>
66
<EnableNETAnalyzers>true</EnableNETAnalyzers>
77
<DebugType>embedded</DebugType>
88
<Nullable>enable</Nullable>
@@ -22,11 +22,11 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Azure.Storage.Files.DataLake" Version="12.17.1" />
26-
<PackageReference Include="ManagedCode.Communication" Version="8.0.0" />
27-
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
25+
<PackageReference Include="Azure.Storage.Files.DataLake" Version="12.18.0" />
26+
<PackageReference Include="ManagedCode.Communication" Version="2.0.26" />
27+
<PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />
2828
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
29-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
3030
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
3131
</ItemGroup>
3232

‎ManagedCode.Storage.Azure/AzureStorage.cs‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,18 @@ protected override async Task<Result> CreateContainerInternalAsync(CancellationT
138138
{
139139
try
140140
{
141-
_ = await StorageClient.CreateIfNotExistsAsync(PublicAccessType.BlobContainer,
142-
cancellationToken: cancellationToken);
143-
var policy = await StorageClient.GetAccessPolicyAsync(cancellationToken: cancellationToken);
144-
if (policy.Value.BlobPublicAccess != StorageOptions.PublicAccessType)
141+
if (StorageOptions.CreateContainerIfNotExists)
145142
{
146-
await StorageClient.SetAccessPolicyAsync(StorageOptions.PublicAccessType,
147-
cancellationToken: cancellationToken);
143+
_ = await StorageClient.CreateIfNotExistsAsync(cancellationToken: cancellationToken);
144+
var policy = await StorageClient.GetAccessPolicyAsync(cancellationToken: cancellationToken);
145+
if (policy.Value.BlobPublicAccess != StorageOptions.PublicAccessType)
146+
{
147+
await StorageClient.SetAccessPolicyAsync(StorageOptions.PublicAccessType,
148+
cancellationToken: cancellationToken);
149+
}
148150
}
149-
150-
IsContainerCreated = true;
151+
152+
IsContainerCreated = await StorageClient.ExistsAsync(cancellationToken);;
151153

152154
return Result.Succeed();
153155
}

‎ManagedCode.Storage.Azure/ManagedCode.Storage.Azure.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<LangVersion>12</LangVersion>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<LangVersion>11</LangVersion>
66
<EnableNETAnalyzers>true</EnableNETAnalyzers>
77
<DebugType>embedded</DebugType>
88
<Nullable>enable</Nullable>
@@ -22,12 +22,12 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Azure.Identity" Version="1.10.4" />
26-
<PackageReference Include="Azure.Storage.Files.DataLake" Version="12.17.1" />
27-
<PackageReference Include="ManagedCode.Communication" Version="8.0.0" />
28-
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
25+
<PackageReference Include="Azure.Identity" Version="1.11.3" />
26+
<PackageReference Include="Azure.Storage.Files.DataLake" Version="12.18.0" />
27+
<PackageReference Include="ManagedCode.Communication" Version="2.0.26" />
28+
<PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />
2929
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
30-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
3131
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
3232
</ItemGroup>
3333

‎ManagedCode.Storage.Google/GCPStorage.cs‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public override IAsyncEnumerable<BlobMetadata> GetBlobMetadataListAsync(string?
4545
{
4646
return StorageClient.ListObjectsAsync(StorageOptions.BucketOptions.Bucket, directory,
4747
new ListObjectsOptions { Projection = Projection.Full })
48-
.Select(
49-
x => new BlobMetadata
48+
.Select(x => new BlobMetadata
5049
{
5150
Name = x.Name,
51+
FullName = $"{x.Bucket}/{x.Name}",
5252
Uri = string.IsNullOrEmpty(x.MediaLink) ? null : new Uri(x.MediaLink),
5353
Container = x.Bucket,
5454
CreatedOn = x.TimeCreated!.Value,
@@ -85,17 +85,21 @@ protected override async Task<Result> CreateContainerInternalAsync(CancellationT
8585
return Result.Succeed();
8686
}
8787

88-
if (StorageOptions.OriginalOptions != null)
88+
if (StorageOptions.CreateContainerIfNotExists)
8989
{
90-
await StorageClient.CreateBucketAsync(StorageOptions.BucketOptions.ProjectId, StorageOptions.BucketOptions.Bucket,
91-
StorageOptions.OriginalOptions,
92-
cancellationToken);
93-
}
94-
else
95-
{
96-
await StorageClient.CreateBucketAsync(StorageOptions.BucketOptions.ProjectId, StorageOptions.BucketOptions.Bucket,
97-
cancellationToken: cancellationToken);
90+
if (StorageOptions.OriginalOptions != null)
91+
{
92+
await StorageClient.CreateBucketAsync(StorageOptions.BucketOptions.ProjectId, StorageOptions.BucketOptions.Bucket,
93+
StorageOptions.OriginalOptions,
94+
cancellationToken);
95+
}
96+
else
97+
{
98+
await StorageClient.CreateBucketAsync(StorageOptions.BucketOptions.ProjectId, StorageOptions.BucketOptions.Bucket,
99+
cancellationToken: cancellationToken);
100+
}
98101
}
102+
99103

100104
return Result.Succeed();
101105
}

‎ManagedCode.Storage.Google/ManagedCode.Storage.Google.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<LangVersion>12</LangVersion>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<LangVersion>11</LangVersion>
66
<EnableNETAnalyzers>true</EnableNETAnalyzers>
77
<DebugType>embedded</DebugType>
88
<Nullable>enable</Nullable>
@@ -22,13 +22,13 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Google.Api.Gax" Version="4.5.0" />
26-
<PackageReference Include="Google.Api.Gax.Rest" Version="4.5.0" />
27-
<PackageReference Include="Google.Apis.Storage.v1" Version="1.66.0.3291" />
28-
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.7.0" />
29-
<PackageReference Include="ManagedCode.Communication" Version="8.0.0" />
25+
<PackageReference Include="Google.Api.Gax" Version="4.8.0" />
26+
<PackageReference Include="Google.Api.Gax.Rest" Version="4.8.0" />
27+
<PackageReference Include="Google.Apis.Storage.v1" Version="1.68.0.3431" />
28+
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.10.0" />
29+
<PackageReference Include="ManagedCode.Communication" Version="2.0.26" />
3030
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
31-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
3232
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
3333
</ItemGroup>
3434
</Project>

0 commit comments

Comments
 (0)