Skip to content

Commit 636eb3e

Browse files
mvdgunmvdgun
committed
merge netstandard2.0 and netstandard2.1 code
1 parent 06c4e87 commit 636eb3e

File tree

15 files changed

+64
-281
lines changed

15 files changed

+64
-281
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="AWSSDK.S3" Version="3.3.110.68" />
30+
<PackageReference Include="AWSSDK.S3" Version="3.3.110.68"/>
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<ProjectReference Include="..\FileSystem\FileSystem.csproj" />
34+
<ProjectReference Include="..\FileSystem\FileSystem.csproj"/>
3535
</ItemGroup>
3636

3737
</Project>

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

Lines changed: 8 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ public override async Task<IDirectory> GetDirectoryAsync(string path, Cancellati
7474

7575
if (pathParts.Length > 1)
7676
{
77-
prefix = string.Join("/", pathParts.Take(pathParts.Length-1) ) + "/";
78-
// prefix = string.Join("/", pathParts.SkipLast(1)) + "/";
77+
prefix = string.Join("/", pathParts.Take(pathParts.Length - 1)) + "/";
7978
}
8079

8180
var request = new ListObjectsV2Request {BucketName = bucketName, Prefix = prefix};
@@ -236,17 +235,10 @@ public override async Task<byte[]> ReadFileAsync(string path, CancellationToken
236235
try
237236
{
238237
using var response = await client.GetObjectAsync(bucketName, path, cancellationToken);
239-
#if NETSTANDARD2_1
240-
await using var memoryStream = new MemoryStream();
241-
await response.ResponseStream.CopyToAsync(memoryStream, cancellationToken);
238+
using var memoryStream = new MemoryStream();
239+
await response.ResponseStream.CopyToAsync(memoryStream, 81920, cancellationToken);
240+
242241
return memoryStream.ToArray();
243-
#else
244-
using (var memoryStream = new MemoryStream())
245-
{
246-
await response.ResponseStream.CopyToAsync(memoryStream, 81920, cancellationToken);
247-
return memoryStream.ToArray();
248-
}
249-
#endif
250242
}
251243
catch (Exception exception)
252244
{
@@ -262,25 +254,13 @@ public override async Task<string> ReadTextFileAsync(string path, CancellationTo
262254
try
263255
{
264256
using var response = await client.GetObjectAsync(bucketName, path, cancellationToken);
265-
#if NETSTANDARD2_1
266-
await using var memoryStream = new MemoryStream();
267-
await response.ResponseStream.CopyToAsync(memoryStream, cancellationToken);
257+
using var memoryStream = new MemoryStream();
258+
await response.ResponseStream.CopyToAsync(memoryStream, 81920, cancellationToken);
268259

269260
using var streamReader = new StreamReader(memoryStream);
270261
memoryStream.Position = 0;
271262

272263
return await streamReader.ReadToEndAsync();
273-
#else
274-
using (var memoryStream = new MemoryStream())
275-
{
276-
await response.ResponseStream.CopyToAsync(memoryStream, 81920, cancellationToken);
277-
278-
using var streamReader = new StreamReader(memoryStream);
279-
memoryStream.Position = 0;
280-
281-
return await streamReader.ReadToEndAsync();
282-
}
283-
#endif
284264
}
285265
catch (Exception exception)
286266
{
@@ -304,8 +284,7 @@ public override async Task WriteFileAsync(
304284

305285
try
306286
{
307-
#if NETSTANDARD2_1
308-
await using var memoryStream = new MemoryStream(contents);
287+
using var memoryStream = new MemoryStream(contents);
309288
var request = new PutObjectRequest
310289
{
311290
InputStream = memoryStream,
@@ -314,18 +293,6 @@ public override async Task WriteFileAsync(
314293
};
315294

316295
await client.PutObjectAsync(request, cancellationToken);
317-
#else
318-
using (var memoryStream = new MemoryStream(contents))
319-
{
320-
var request = new PutObjectRequest
321-
{
322-
InputStream = memoryStream,
323-
BucketName = bucketName,
324-
Key = path
325-
};
326-
await client.PutObjectAsync(request, cancellationToken);
327-
}
328-
#endif
329296
}
330297
catch (Exception exception)
331298
{
@@ -344,8 +311,7 @@ public override async Task AppendFileAsync(string path, byte[] contents, Cancell
344311

345312
try
346313
{
347-
#if NETSTANDARD2_1
348-
await using var memoryStream = new MemoryStream(contents);
314+
using var memoryStream = new MemoryStream(contents);
349315
var request = new PutObjectRequest
350316
{
351317
InputStream = memoryStream,
@@ -354,19 +320,6 @@ public override async Task AppendFileAsync(string path, byte[] contents, Cancell
354320
};
355321

356322
await client.PutObjectAsync(request, cancellationToken);
357-
#else
358-
using (var memoryStream = new MemoryStream(contents))
359-
{
360-
var request = new PutObjectRequest
361-
{
362-
InputStream = memoryStream,
363-
BucketName = bucketName,
364-
Key = path
365-
};
366-
367-
await client.PutObjectAsync(request, cancellationToken);
368-
}
369-
#endif
370323
}
371324
catch (Exception exception)
372325
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static FileModel CreateFile(S3Object file)
3131

3232
public static DirectoryModel CreateDirectory(S3Object directory)
3333
{
34-
var pathParts = directory.Key.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
34+
var pathParts = directory.Key.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
3535
var name = pathParts.Last();
3636

3737
if (pathParts.Length == 1)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Azure.Storage.Blobs" Version="12.4.2" />
30+
<PackageReference Include="Azure.Storage.Blobs" Version="12.4.2"/>
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<ProjectReference Include="..\FileSystem\FileSystem.csproj" />
34+
<ProjectReference Include="..\FileSystem\FileSystem.csproj"/>
3535
</ItemGroup>
3636

3737
</Project>

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

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -194,18 +194,10 @@ public override async Task<byte[]> ReadFileAsync(string path, CancellationToken
194194

195195
try
196196
{
197-
#if NETSTANDARD2_1
198-
await using var memoryStream = new MemoryStream();
197+
using var memoryStream = new MemoryStream();
199198
await client.GetBlobClient(path).DownloadToAsync(memoryStream, cancellationToken);
200199

201200
return memoryStream.ToArray();
202-
#else
203-
using (var memoryStream = new MemoryStream())
204-
{
205-
await client.GetBlobClient(path).DownloadToAsync(memoryStream, cancellationToken);
206-
return memoryStream.ToArray();
207-
}
208-
#endif
209201
}
210202
catch (Exception exception)
211203
{
@@ -220,25 +212,13 @@ public override async Task<string> ReadTextFileAsync(string path, CancellationTo
220212

221213
try
222214
{
223-
#if NETSTANDARD2_1
224-
await using var memoryStream = new MemoryStream();
215+
using var memoryStream = new MemoryStream();
225216
await client.GetBlobClient(path).DownloadToAsync(memoryStream, cancellationToken);
226217

227218
using var streamReader = new StreamReader(memoryStream);
228219
memoryStream.Position = 0;
229220

230221
return await streamReader.ReadToEndAsync();
231-
#else
232-
using (var memoryStream = new MemoryStream())
233-
{
234-
await client.GetBlobClient(path).DownloadToAsync(memoryStream, cancellationToken);
235-
236-
using var streamReader = new StreamReader(memoryStream);
237-
memoryStream.Position = 0;
238-
239-
return await streamReader.ReadToEndAsync();
240-
}
241-
#endif
242222
}
243223
catch (Exception exception)
244224
{
@@ -258,16 +238,9 @@ public override async Task WriteFileAsync(string path, byte[] contents, bool ove
258238

259239
try
260240
{
261-
#if NETSTANDARD2_1
262-
await using var memoryStream = new MemoryStream(contents);
241+
using var memoryStream = new MemoryStream(contents);
263242

264243
await client.UploadBlobAsync(path, memoryStream, cancellationToken);
265-
#else
266-
using (var memoryStream = new MemoryStream(contents))
267-
{
268-
await client.UploadBlobAsync(path, memoryStream, cancellationToken);
269-
}
270-
#endif
271244
}
272245
catch (Exception exception)
273246
{
@@ -286,16 +259,9 @@ public override async Task AppendFileAsync(string path, byte[] contents, Cancell
286259

287260
try
288261
{
289-
#if NETSTANDARD2_1
290-
await using var memoryStream = new MemoryStream(contents);
262+
using var memoryStream = new MemoryStream(contents);
291263

292264
await client.UploadBlobAsync(path, memoryStream, cancellationToken);
293-
#else
294-
using (var memoryStream = new MemoryStream(contents))
295-
{
296-
await client.UploadBlobAsync(path, memoryStream, cancellationToken);
297-
}
298-
#endif
299265
}
300266
catch (Exception exception)
301267
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.2.1" />
30+
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.2.1"/>
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<ProjectReference Include="..\FileSystem\FileSystem.csproj" />
34+
<ProjectReference Include="..\FileSystem\FileSystem.csproj"/>
3535
</ItemGroup>
3636

3737
</Project>

‎FileSystem.Adapters.AzureFileStorage/src/AzureFileStorageAdapter.cs

Lines changed: 13 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -192,17 +192,11 @@ public override async Task<byte[]> ReadFileAsync(string path, CancellationToken
192192
{
193193
var directory = client.GetDirectoryClient(directoryPath);
194194
var download = await directory.GetFileClient(filePath).DownloadAsync(cancellationToken: cancellationToken);
195-
#if NETSTANDARD2_1
196-
await using var memoryStream = new MemoryStream();
197-
await download.Value.Content.CopyToAsync(memoryStream, cancellationToken);
195+
196+
using var memoryStream = new MemoryStream();
197+
await download.Value.Content.CopyToAsync(memoryStream, 81920, cancellationToken);
198+
198199
return memoryStream.ToArray();
199-
#else
200-
using (var memoryStream = new MemoryStream())
201-
{
202-
await download.Value.Content.CopyToAsync(memoryStream, 81920, cancellationToken);
203-
return memoryStream.ToArray();
204-
}
205-
#endif
206200
}
207201
catch (Exception exception)
208202
{
@@ -222,21 +216,13 @@ public override async Task<string> ReadTextFileAsync(string path, CancellationTo
222216
var directory = client.GetDirectoryClient(directoryPath);
223217
var file = directory.GetFileClient(filePath);
224218
var download = await file.DownloadAsync(cancellationToken: cancellationToken);
225-
#if NETSTANDARD2_1
226-
await using var memoryStream = new MemoryStream();
227-
await download.Value.Content.CopyToAsync(memoryStream, cancellationToken);
219+
220+
using var memoryStream = new MemoryStream();
221+
await download.Value.Content.CopyToAsync(memoryStream, 81920, cancellationToken);
228222
using var streamReader = new StreamReader(memoryStream);
229223
memoryStream.Position = 0;
224+
230225
return await streamReader.ReadToEndAsync();
231-
#else
232-
using (var memoryStream = new MemoryStream())
233-
{
234-
await download.Value.Content.CopyToAsync(memoryStream, 81920, cancellationToken);
235-
using var streamReader = new StreamReader(memoryStream);
236-
memoryStream.Position = 0;
237-
return await streamReader.ReadToEndAsync();
238-
}
239-
#endif
240226
}
241227
catch (Exception exception)
242228
{
@@ -265,17 +251,11 @@ public override async Task WriteFileAsync(
265251
var directory = client.GetDirectoryClient(directoryPath);
266252
await directory.CreateIfNotExistsAsync(cancellationToken: cancellationToken);
267253
var file = directory.GetFileClient(filePath);
268-
#if NETSTANDARD2_1
269-
await using var memoryStream = new MemoryStream(contents);
254+
255+
using var memoryStream = new MemoryStream(contents);
270256
await file.CreateAsync(memoryStream.Length, cancellationToken: cancellationToken);
257+
271258
await file.UploadRangeAsync(new HttpRange(0, memoryStream.Length), memoryStream, cancellationToken: cancellationToken);
272-
#else
273-
using (var memoryStream = new MemoryStream(contents))
274-
{
275-
await file.CreateAsync(memoryStream.Length, cancellationToken: cancellationToken);
276-
await file.UploadRangeAsync(new HttpRange(0, memoryStream.Length), memoryStream, cancellationToken: cancellationToken);
277-
}
278-
#endif
279259
}
280260
catch (Exception exception)
281261
{
@@ -298,22 +278,13 @@ public override async Task AppendFileAsync(string path, byte[] contents, Cancell
298278
var file = directory.GetFileClient(filePath);
299279

300280
contents = existingContents.Concat(contents).ToArray();
301-
#if NETSTANDARD2_1
302-
await using var memoryStream = new MemoryStream(contents);
281+
282+
using var memoryStream = new MemoryStream(contents);
303283

304284
await file.DeleteAsync(cancellationToken);
305285
await file.CreateAsync(memoryStream.Length, cancellationToken: cancellationToken);
306286

307287
await file.UploadRangeAsync(new HttpRange(0, memoryStream.Length), memoryStream, cancellationToken: cancellationToken);
308-
#else
309-
using (var memoryStream = new MemoryStream(contents))
310-
{
311-
await file.DeleteAsync(cancellationToken);
312-
await file.CreateAsync(memoryStream.Length, cancellationToken: cancellationToken);
313-
314-
await file.UploadRangeAsync(new HttpRange(0, memoryStream.Length), memoryStream, cancellationToken: cancellationToken);
315-
}
316-
#endif
317288
}
318289
catch (Exception exception)
319290
{

‎FileSystem.Adapters.Dropbox/FileSystem.Adapters.Dropbox.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Dropbox.Api" Version="4.10.0" />
30+
<PackageReference Include="Dropbox.Api" Version="4.10.0"/>
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<ProjectReference Include="..\FileSystem\FileSystem.csproj" />
34+
<ProjectReference Include="..\FileSystem\FileSystem.csproj"/>
3535
</ItemGroup>
3636

3737
</Project>

‎FileSystem.Adapters.Dropbox/src/DropboxAdapter.cs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,9 @@ public override async Task WriteFileAsync(
217217

218218
try
219219
{
220-
#if NETSTANDARD2_1
221-
await using var memoryStream = new MemoryStream(contents);
220+
using var memoryStream = new MemoryStream(contents);
221+
222222
await client.Files.UploadAsync(PrependRootPath(path), WriteMode.Overwrite.Instance, body: memoryStream);
223-
#else
224-
using (var memoryStream = new MemoryStream(contents))
225-
{
226-
await client.Files.UploadAsync(PrependRootPath(path), WriteMode.Overwrite.Instance, body: memoryStream);
227-
}
228-
#endif
229223
}
230224
catch (Exception exception)
231225
{
@@ -241,15 +235,9 @@ public override async Task AppendFileAsync(string path, byte[] contents, Cancell
241235

242236
try
243237
{
244-
#if NETSTANDARD2_1
245-
await using var memoryStream = new MemoryStream(contents);
238+
using var memoryStream = new MemoryStream(contents);
239+
246240
await client.Files.UploadAsync(PrependRootPath(path), WriteMode.Overwrite.Instance, body: memoryStream);
247-
#else
248-
using (var memoryStream = new MemoryStream(contents))
249-
{
250-
await client.Files.UploadAsync(PrependRootPath(path), WriteMode.Overwrite.Instance, body: memoryStream);
251-
}
252-
#endif
253241
}
254242
catch (Exception exception)
255243
{

0 commit comments

Comments
 (0)