Skip to content

Commit 69a23dd

Browse files
mvdgunmvdgun
authored
Merge pull request #41 from SharpGrip/release/1.2
Release/1.2
2 parents b71260a + 64324e5 commit 69a23dd

File tree

52 files changed

+1138
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1138
-248
lines changed

‎.github/workflows/Build.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ jobs:
2828

2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
with:
3333
fetch-depth: 0
3434

3535
- name: Set up Java
36-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3737
with:
3838
java-version: ${{ env.JAVA_VERSION }}
3939
distribution: ${{ env.JAVA_DISTRIBUTION }}
4040

4141
- name: Set up .NET
42-
uses: actions/setup-dotnet@v3
42+
uses: actions/setup-dotnet@v4
4343
with:
4444
dotnet-version: ${{ env.DOTNET_VERSION }}
4545

‎.github/workflows/Release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222
with:
2323
fetch-depth: 0
2424

2525
- name: Set up .NET
26-
uses: actions/setup-dotnet@v3
26+
uses: actions/setup-dotnet@v4
2727
with:
2828
dotnet-version: ${{ env.DOTNET_VERSION }}
2929

‎FileSystem.Adapters.AmazonS3/FileSystem.Adapters.AmazonS3.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<None Include="..\README.md" Pack="true" PackagePath="\" />
16+
<None Include="README.md" Pack="true" PackagePath="\" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="AWSSDK.S3" Version="3.7.305.3" />
20+
<PackageReference Include="AWSSDK.S3" Version="3.7.308.3" />
2121
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎FileSystem.Adapters.AmazonS3/README.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# SharpGrip FileSystem AmazonS3 adapter [![NuGet](https://img.shields.io/nuget/v/SharpGrip.FileSystem.Adapters.AmazonS3)](https://www.nuget.org/packages/SharpGrip.FileSystem.Adapters.AmazonS3)
2+
3+
## Installation
4+
5+
Reference NuGet package `SharpGrip.FileSystem.Adapters.AmazonS3` (https://www.nuget.org/packages/SharpGrip.FileSystem.Adapters.AmazonS3).
6+
7+
## Usage
8+
9+
```
10+
// Amazon connection.
11+
var amazonClient = new AmazonS3Client("awsAccessKeyId", "awsSecretAccessKey", RegionEndpoint.USEast2);
12+
13+
var adapters = new List<IAdapter>
14+
{
15+
new AmazonS3Adapter("amazon1", "/Files", amazonClient, "bucketName1")
16+
new AmazonS3Adapter("amazon2", "/Files", amazonClient, "bucketName2")
17+
};
18+
19+
var fileSystem = new FileSystem(adapters);
20+
```

‎FileSystem.Adapters.AmazonS3/src/AmazonS3Adapter.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ public override void Dispose()
3131
client.Dispose();
3232
}
3333

34-
public override void Connect()
34+
public override async Task ConnectAsync(CancellationToken cancellationToken = default)
3535
{
3636
Logger.LogStartConnectingAdapter(this);
37+
await Task.CompletedTask;
3738
Logger.LogFinishedConnectingAdapter(this);
3839
}
3940

‎FileSystem.Adapters.AzureBlobStorage/FileSystem.Adapters.AzureBlobStorage.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<None Include="..\README.md" Pack="true" PackagePath="\" />
16+
<None Include="README.md" Pack="true" PackagePath="\" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
20+
<PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />
2121
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎FileSystem.Adapters.AzureBlobStorage/README.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# SharpGrip FileSystem AzureBlobStorage adapter [![NuGet](https://img.shields.io/nuget/v/SharpGrip.FileSystem.Adapters.AzureBlobStorage)](https://www.nuget.org/packages/SharpGrip.FileSystem.Adapters.AzureBlobStorage)
2+
3+
## Installation
4+
5+
Reference NuGet package `SharpGrip.FileSystem.Adapters.AzureBlobStorage` (https://www.nuget.org/packages/SharpGrip.FileSystem.Adapters.AzureBlobStorage).
6+
7+
## Usage
8+
9+
```
10+
// Azure connection.
11+
var blobServiceClient = new BlobServiceClient("connectionString");
12+
var azureClient = blobServiceClient.GetBlobContainerClient("blobContainerName");
13+
14+
var adapters = new List<IAdapter>
15+
{
16+
new LocalAdapter("local", "/var/files"),
17+
new AzureBlobStorageAdapter("azure", "/Files", azureClient)
18+
};
19+
20+
var fileSystem = new FileSystem(adapters);
21+
```

‎FileSystem.Adapters.AzureBlobStorage/src/AzureBlobStorageAdapter.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ public override void Dispose()
2828
{
2929
}
3030

31-
public override void Connect()
31+
public override async Task ConnectAsync(CancellationToken cancellationToken = default)
3232
{
3333
Logger.LogStartConnectingAdapter(this);
34+
await Task.CompletedTask;
3435
Logger.LogFinishedConnectingAdapter(this);
3536
}
3637

‎FileSystem.Adapters.AzureFileStorage/FileSystem.Adapters.AzureFileStorage.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<None Include="..\README.md" Pack="true" PackagePath="\" />
16+
<None Include="README.md" Pack="true" PackagePath="\" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.17.1" />
20+
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.18.0" />
2121
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎FileSystem.Adapters.AzureFileStorage/README.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# SharpGrip FileSystem AzureFileStorage adapter [![NuGet](https://img.shields.io/nuget/v/SharpGrip.FileSystem.Adapters.AzureFileStorage)](https://www.nuget.org/packages/SharpGrip.FileSystem.Adapters.AzureFileStorage)
2+
3+
## Installation
4+
5+
Reference NuGet package `SharpGrip.FileSystem.Adapters.AzureFileStorage` (https://www.nuget.org/packages/SharpGrip.FileSystem.Adapters.AzureFileStorage).
6+
7+
## Usage
8+
9+
```
10+
// Azure connection.
11+
var azureClient = new ShareClient("connectionString", "shareName");
12+
13+
var adapters = new List<IAdapter>
14+
{
15+
new LocalAdapter("local", "/var/files"),
16+
new AzureFileStorageAdapter("azure", "/Files", azureClient)
17+
};
18+
19+
var fileSystem = new FileSystem(adapters);
20+
```

0 commit comments

Comments
 (0)