Skip to content

Commit 4380342

Browse files
KSemenenkoKSemenenko
committed
update libraries and readme
1 parent da162b4 commit 4380342

File tree

16 files changed

+142
-131
lines changed

16 files changed

+142
-131
lines changed

‎Directory.Build.props‎

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,37 @@
11
<Project>
2-
<!--NuGet-->
3-
<PropertyGroup>
4-
<Authors>ManagedCode</Authors>
5-
<Copyright>Copyright © 2021-$([System.DateTime]::Now.ToString(`yyyy`)) ManagedCode SAS</Copyright>
6-
<RepositoryUrl>https://github.com/managedcode/Storage</RepositoryUrl>
7-
<PackageProjectUrl>https://github.com/managedcode/Storage</PackageProjectUrl>
8-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
9-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
10-
<IncludeSymbols>true</IncludeSymbols>
11-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
12-
<RepositoryType>Github</RepositoryType>
13-
<PackageIcon>logo.png</PackageIcon>
14-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15-
<PackageReadmeFile>README.md</PackageReadmeFile>
16-
<Product>Managed Code - Storage</Product>
17-
<Version>2.1.11</Version>
18-
<PackageVersion>2.1.11</PackageVersion>
19-
</PropertyGroup>
20-
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
21-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
22-
</PropertyGroup>
23-
<ItemGroup>
24-
<None Include="$(SolutionDir)\logo.png" Pack="true" Visible="false" PackagePath="\"/>
25-
<None Include="$(SolutionDir)\README.md" Pack="true" Visible="false" PackagePath="\"/>
26-
</ItemGroup>
27-
<ItemGroup>
28-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
29-
</ItemGroup>
30-
</Project>
2+
<!--NuGet-->
3+
<PropertyGroup>
4+
<Authors>ManagedCode</Authors>
5+
<Copyright>Copyright © 2021-$([System.DateTime]::Now.ToString(`yyyy`)) ManagedCode SAS</Copyright>
6+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
7+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
8+
<IncludeSymbols>true</IncludeSymbols>
9+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
10+
<RepositoryType>Github</RepositoryType>
11+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
12+
<PackageIcon>logo.png</PackageIcon>
13+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
14+
<EnablePackageValidation>true</EnablePackageValidation>
15+
<PackageReadmeFile>README.md</PackageReadmeFile>
16+
17+
<RepositoryUrl>https://github.com/managedcode/Storage</RepositoryUrl>
18+
<PackageProjectUrl>https://github.com/managedcode/Storage</PackageProjectUrl>
19+
<Product>Managed Code - Storage</Product>
20+
<Version>2.1.12</Version>
21+
<PackageVersion>2.1.12</PackageVersion>
22+
23+
</PropertyGroup>
24+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
25+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
26+
</PropertyGroup>
27+
<ItemGroup>
28+
<None Include="$(SolutionDir)\logo.png" Pack="true" Visible="false" PackagePath="\"/>
29+
<None Include="$(SolutionDir)\README.md" Pack="true" Visible="false" PackagePath="\"/>
30+
</ItemGroup>
31+
<ItemGroup>
32+
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
33+
<PrivateAssets>all</PrivateAssets>
34+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
35+
</PackageReference>
36+
</ItemGroup>
37+
</Project>

‎ManagedCode.Storage.AspNetExtensions/ManagedCode.Storage.AspNetExtensions.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<LangVersion>11</LangVersion>
56
<EnableNETAnalyzers>true</EnableNETAnalyzers>
6-
<LangVersion>10</LangVersion>
77
<DebugType>embedded</DebugType>
88
<Nullable>enable</Nullable>
99
<IsPackable>true</IsPackable>
@@ -19,11 +19,11 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<ProjectReference Include="..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj"/>
22+
<ProjectReference Include="..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj" />
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="ManagedCode.MimeTypes" Version="1.0.0"/>
26+
<PackageReference Include="ManagedCode.MimeTypes" Version="1.0.0" />
2727
</ItemGroup>
2828

2929
</Project>

‎ManagedCode.Storage.AspNetExtensions/StorageExtensions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public static async Task<Result<FileResult>> DownloadAsFileResult(this IStorage
1414
{
1515
var result = await storage.DownloadAsync(blobName, cancellationToken);
1616

17-
if (result.IsFail)
17+
if (result.IsFailed)
1818
{
19-
return Result<FileResult>.Fail(result.Error!);
19+
return Result<FileResult>.Fail(result.Errors);
2020
}
2121

2222
var fileStream = new FileStreamResult(result.Value!.FileStream, MimeHelper.GetMimeType(result.Value.FileInfo.Extension))
@@ -33,9 +33,9 @@ public static async Task<Result<FileResult>> DownloadAsFileResult(this IStorage
3333
{
3434
var result = await storage.DownloadAsync(blobMetadata.Name, cancellationToken);
3535

36-
if (result.IsFail)
36+
if (result.IsFailed)
3737
{
38-
return result.Error!;
38+
return Result<FileResult>.Fail(result.Errors);
3939
}
4040

4141
var fileStream = new FileStreamResult(result.Value!.FileStream, MimeHelper.GetMimeType(result.Value.FileInfo.Extension))

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

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<LangVersion>11</LangVersion>
56
<EnableNETAnalyzers>true</EnableNETAnalyzers>
6-
<LangVersion>10</LangVersion>
77
<DebugType>embedded</DebugType>
88
<Nullable>enable</Nullable>
99
<IsPackable>true</IsPackable>
@@ -18,15 +18,15 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<ProjectReference Include="..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj"/>
21+
<ProjectReference Include="..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj" />
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="ManagedCode.Communication" Version="1.0.0"/>
26-
<PackageReference Include="AWSSDK.S3" Version="3.7.9.69"/>
27-
<PackageReference Include="Humanizer.Core" Version="2.14.1"/>
28-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2"/>
29-
<PackageReference Include="System.Linq.Async" Version="6.0.1"/>
25+
<PackageReference Include="ManagedCode.Communication" Version="2.0.10" />
26+
<PackageReference Include="AWSSDK.S3" Version="3.7.101.32" />
27+
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
29+
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
3030
</ItemGroup>
3131

3232

‎ManagedCode.Storage.Azure/AzureStorage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ protected override async Task<Result<BlobMetadata>> GetBlobMetadataInternalAsync
275275

276276
if (properties is null)
277277
{
278-
return new Error<ErrorCode>("Properties for file not found");
278+
return Result<BlobMetadata>.Fail("Properties for file not found");
279279
}
280280

281281
return Result<BlobMetadata>.Succeed(new BlobMetadata

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

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<LangVersion>11</LangVersion>
56
<EnableNETAnalyzers>true</EnableNETAnalyzers>
6-
<LangVersion>10</LangVersion>
77
<DebugType>embedded</DebugType>
88
<Nullable>enable</Nullable>
99
<IsPackable>true</IsPackable>
@@ -18,16 +18,16 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<ProjectReference Include="..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj"/>
21+
<ProjectReference Include="..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj" />
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Azure.Storage.Files.DataLake" Version="12.12.1"/>
26-
<PackageReference Include="ManagedCode.Communication" Version="1.0.0"/>
27-
<PackageReference Include="Azure.Storage.Blobs" Version="12.14.0"/>
28-
<PackageReference Include="Humanizer.Core" Version="2.14.1"/>
29-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2"/>
30-
<PackageReference Include="System.Linq.Async" Version="6.0.1"/>
25+
<PackageReference Include="Azure.Storage.Files.DataLake" Version="12.12.1" />
26+
<PackageReference Include="ManagedCode.Communication" Version="2.0.10" />
27+
<PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
28+
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
29+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
30+
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
3131
</ItemGroup>
3232

3333

‎ManagedCode.Storage.AzureDataLake/AzureDataLakeStorage.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public async Task<Result<Stream>> OpenReadStreamAsync(OpenReadStreamOptions opti
5050
{
5151
var fileClient = GetFileClient(options);
5252
var stream = await fileClient.OpenReadAsync(options.Position, options.BufferSize, cancellationToken: cancellationToken);
53-
return stream;
53+
return Result.Succeed(stream);
5454
}
5555
catch (Exception ex)
5656
{
@@ -66,7 +66,7 @@ public async Task<Result<Stream>> OpenWriteStreamAsync(OpenWriteStreamOptions op
6666
{
6767
var fileClient = GetFileClient(options);
6868
var stream = await fileClient.OpenWriteAsync(options.Overwrite, cancellationToken: cancellationToken);
69-
return stream;
69+
return Result.Succeed(stream);
7070
}
7171
catch (Exception ex)
7272
{
@@ -198,7 +198,7 @@ protected override async Task<Result<bool>> DeleteInternalAsync(DeleteOptions op
198198
{
199199
var fileClient = GetFileClient(options);
200200
await fileClient.DeleteAsync(cancellationToken: cancellationToken);
201-
return true;
201+
return Result.Succeed(true);
202202
}
203203
catch (Exception ex)
204204
{
@@ -213,7 +213,7 @@ protected override async Task<Result<bool>> ExistsInternalAsync(ExistOptions opt
213213
{
214214
var fileClient = GetFileClient(options);
215215
var result = await fileClient.ExistsAsync(cancellationToken);
216-
return result.Value;
216+
return Result.Succeed(result.Value);
217217
}
218218
catch (Exception ex)
219219
{

‎ManagedCode.Storage.AzureDataLake/ManagedCode.Storage.AzureDataLake.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<LangVersion>11</LangVersion>
56
<EnableNETAnalyzers>true</EnableNETAnalyzers>
6-
<LangVersion>10</LangVersion>
77
<DebugType>embedded</DebugType>
88
<Nullable>enable</Nullable>
99
<IsPackable>true</IsPackable>
@@ -18,16 +18,16 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<ProjectReference Include="..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj"/>
21+
<ProjectReference Include="..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj" />
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Azure.Storage.Files.DataLake" Version="12.12.1"/>
26-
<PackageReference Include="ManagedCode.Communication" Version="1.0.0"/>
27-
<PackageReference Include="Azure.Storage.Blobs" Version="12.14.0"/>
28-
<PackageReference Include="Humanizer.Core" Version="2.14.1"/>
29-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2"/>
30-
<PackageReference Include="System.Linq.Async" Version="6.0.1"/>
25+
<PackageReference Include="Azure.Storage.Files.DataLake" Version="12.12.1" />
26+
<PackageReference Include="ManagedCode.Communication" Version="2.0.10" />
27+
<PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
28+
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
29+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
30+
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
3131
</ItemGroup>
3232

3333

‎ManagedCode.Storage.Core/ManagedCode.Storage.Core.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5+
<LangVersion>11</LangVersion>
56
<EnableNETAnalyzers>true</EnableNETAnalyzers>
6-
<LangVersion>10</LangVersion>
77
<DebugType>embedded</DebugType>
88
<Nullable>enable</Nullable>
99
<IsPackable>true</IsPackable>
@@ -18,10 +18,10 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="ManagedCode.Communication" Version="1.0.0"/>
22-
<PackageReference Include="ManagedCode.MimeTypes" Version="1.0.0"/>
23-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0"/>
24-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2"/>
21+
<PackageReference Include="ManagedCode.Communication" Version="2.0.10" />
22+
<PackageReference Include="ManagedCode.MimeTypes" Version="1.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
2525
</ItemGroup>
2626

2727
</Project>

‎ManagedCode.Storage.FileSystem/FileSystemStorage.cs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ protected override async Task<Result<LocalFile>> DownloadInternalAsync(LocalFile
129129
var filePath = GetPathFromOptions(options);
130130

131131
return File.Exists(filePath)
132-
? new LocalFile(filePath)
133-
: new Error<ErrorCode>("File not found");
132+
? Result<LocalFile>.Succeed(new LocalFile(filePath))
133+
: Result<LocalFile>.Fail("File not found");
134134
}
135135

136136
protected override async Task<Result<bool>> DeleteInternalAsync(DeleteOptions options, CancellationToken cancellationToken = default)
@@ -164,7 +164,7 @@ protected override async Task<Result<BlobMetadata>> GetBlobMetadataInternalAsync
164164

165165
if (!fileInfo.Exists)
166166
{
167-
return new Error<ErrorCode>("File not found");
167+
return Result<BlobMetadata>.Fail("File not found");
168168
}
169169

170170
var result = new BlobMetadata
@@ -191,14 +191,17 @@ protected override async Task<Result> SetLegalHoldInternalAsync(bool hasLegalHol
191191
{
192192
var file = await DownloadAsync(filePath, cancellationToken);
193193

194-
if (file.IsFail)
194+
if (file.IsFailed)
195195
{
196-
return file.Error!;
196+
return Result.Fail(file.Errors);
197197
}
198198

199199
var fileStream = File.OpenRead(file.Value!.FilePath); // Opening with FileAccess.Read only
200-
fileStream.Lock(0, fileStream.Length); // Attempting to lock a region of the read-only file
201-
200+
if (Environment.OSVersion.Platform != PlatformID.MacOSX)
201+
{
202+
fileStream.Lock(0, fileStream.Length); // Attempting to lock a region of the read-only file
203+
}
204+
202205
_lockedFiles.Add(filePath, fileStream);
203206

204207
return Result.Succeed();

0 commit comments

Comments
 (0)