Skip to content

Commit d82a459

Browse files
martijn00martijn00
authored
Add polyfill for older .net versions and fixes (#825)
* Add polyfill for older .net versions and fixes * Update
1 parent d0c20be commit d82a459

Some content is hidden

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

41 files changed

+229
-270
lines changed

‎Directory.Build.props‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<AnalysisLevel>latest</AnalysisLevel>
2929
<AnalysisMode>Default</AnalysisMode>
3030
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
31+
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
3132

3233
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
3334
</PropertyGroup>
@@ -59,28 +60,43 @@
5960

6061
<ItemGroup>
6162
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
62-
<!--
63-
<PackageReference Include="Roslynator.Analyzers" Version="4.3.0">
63+
<PackageReference Include="Meziantou.Polyfill" Version="1.0.25">
6464
<PrivateAssets>all</PrivateAssets>
65-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
65+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
6666
</PackageReference>
67-
<PackageReference Include="AsyncFixer" Version="1.6.0">
67+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
6868
<PrivateAssets>all</PrivateAssets>
6969
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7070
</PackageReference>
71-
<PackageReference Include="IDisposableAnalyzers" Version="4.0.6">
71+
<PackageReference Include="Roslynator.Analyzers" Version="4.4.0">
7272
<PrivateAssets>all</PrivateAssets>
7373
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7474
</PackageReference>
75+
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.4.0">
76+
<PrivateAssets>all</PrivateAssets>
77+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
78+
</PackageReference>
7579
<PackageReference Include="ReflectionAnalyzers" Version="0.3.1">
7680
<PrivateAssets>all</PrivateAssets>
7781
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7882
</PackageReference>
79-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.68">
83+
<PackageReference Include="Nullable.Extended.Analyzer" Version="1.10.4539">
8084
<PrivateAssets>all</PrivateAssets>
8185
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
8286
</PackageReference>
87+
<!--
88+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.80">
89+
<PrivateAssets>all</PrivateAssets>
90+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
91+
</PackageReference>
92+
<PackageReference Include="IDisposableAnalyzers" Version="4.0.6">
93+
<PrivateAssets>all</PrivateAssets>
94+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
95+
</PackageReference>
96+
<PackageReference Include="AsyncFixer" Version="1.6.0">
97+
<PrivateAssets>all</PrivateAssets>
98+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
99+
</PackageReference>
83100
-->
84101
</ItemGroup>
85-
86102
</Project>

‎FileUploader/FileUpload.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private static async Task Main(string[] args)
5858
Console.WriteLine(ex.Message);
5959
}
6060

61-
if (IsWindows()) Console.ReadLine();
61+
if (IsWindows()) _ = Console.ReadLine();
6262
}
6363

6464
/// <summary>
@@ -96,7 +96,7 @@ private static async Task Run(IMinioClient minio)
9696
.WithObject(objectName)
9797
.WithFileName(filePath)
9898
.WithContentType(contentType);
99-
await minio.PutObjectAsync(putObjectArgs).ConfigureAwait(false);
99+
_ = await minio.PutObjectAsync(putObjectArgs).ConfigureAwait(false);
100100
Console.WriteLine($"\nSuccessfully uploaded {objectName}\n");
101101
}
102102
catch (Exception e)
@@ -106,6 +106,6 @@ private static async Task Run(IMinioClient minio)
106106

107107
// Added for Windows folks. Without it, the window, tests
108108
// run in, dissappears as soon as the test code completes.
109-
if (IsWindows()) Console.ReadLine();
109+
if (IsWindows()) _ = Console.ReadLine();
110110
}
111111
}

‎Minio.Examples/Cases/CustomRequestLogger.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static async Task Run(IMinioClient minio)
2727
{
2828
Console.WriteLine("Running example for: set custom request logger");
2929
minio.SetTraceOn(new MyRequestLogger());
30-
await minio.ListBucketsAsync().ConfigureAwait(false);
30+
_ = await minio.ListBucketsAsync().ConfigureAwait(false);
3131
minio.SetTraceOff();
3232
Console.WriteLine();
3333
}

‎Minio.Examples/Cases/FGetObject.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static async Task Run(IMinioClient minio,
3737
.WithObject(objectName)
3838
.WithFile(fileName)
3939
.WithServerSideEncryption(sse);
40-
await minio.GetObjectAsync(args).ConfigureAwait(false);
40+
_ = await minio.GetObjectAsync(args).ConfigureAwait(false);
4141
Console.WriteLine($"Downloaded the file {fileName} from bucket {bucketName}");
4242
Console.WriteLine();
4343
}

‎Minio.Examples/Cases/FPutObject.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static async Task Run(IMinioClient minio,
3434
.WithObject(objectName)
3535
.WithContentType("application/octet-stream")
3636
.WithFileName(fileName);
37-
await minio.PutObjectAsync(args).ConfigureAwait(false);
37+
_ = await minio.PutObjectAsync(args).ConfigureAwait(false);
3838

3939
Console.WriteLine($"Uploaded object {objectName} to bucket {bucketName}");
4040
Console.WriteLine();

‎Minio.Examples/Cases/GetObjectQuery.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static async Task Run(IMinioClient minio,
4040
.WithFile(fileName)
4141
.WithMatchETag(matchEtag)
4242
.WithModifiedSince(modifiedSince);
43-
await minio.GetObjectAsync(args).ConfigureAwait(false);
43+
_ = await minio.GetObjectAsync(args).ConfigureAwait(false);
4444
Console.WriteLine(
4545
$"Downloaded the file {fileName} for object {objectName} with given query parameters in bucket {bucketName}");
4646
Console.WriteLine();

‎Minio.Examples/Cases/GetObjectVersion.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static async Task Run(IMinioClient minio,
4141
.WithObject(objectName)
4242
.WithVersionId(versionId)
4343
.WithFile(fileName);
44-
await minio.GetObjectAsync(args).ConfigureAwait(false);
44+
_ = await minio.GetObjectAsync(args).ConfigureAwait(false);
4545
Console.WriteLine(
4646
$"Downloaded the file {fileName} for object {objectName} with version {versionId} in bucket {bucketName}");
4747
Console.WriteLine();

‎Minio.Examples/Cases/GetPartialObject.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static async Task Run(IMinioClient minio,
3535
var statObjectArgs = new StatObjectArgs()
3636
.WithBucket(bucketName)
3737
.WithObject(objectName);
38-
await minio.StatObjectAsync(statObjectArgs).ConfigureAwait(false);
38+
_ = await minio.StatObjectAsync(statObjectArgs).ConfigureAwait(false);
3939

4040
// Get object content starting at byte position 1024 and length of 4096
4141
var getObjectArgs = new GetObjectArgs()
@@ -45,7 +45,7 @@ public static async Task Run(IMinioClient minio,
4545
.WithCallbackStream(async (stream, cancellationToken) =>
4646
{
4747
var fileStream = File.Create(fileName);
48-
await stream.CopyToAsync(fileStream).ConfigureAwait(false);
48+
await stream.CopyToAsync(fileStream, cancellationToken).ConfigureAwait(false);
4949
await fileStream.DisposeAsync().ConfigureAwait(false);
5050
var writtenInfo = new FileInfo(fileName);
5151
var file_read_size = writtenInfo.Length;
@@ -55,7 +55,7 @@ public static async Task Run(IMinioClient minio,
5555
$"Successfully downloaded object with requested offset and length {writtenInfo.Length} into file");
5656
stream.Dispose();
5757
});
58-
await minio.GetObjectAsync(getObjectArgs).ConfigureAwait(false);
58+
_ = await minio.GetObjectAsync(getObjectArgs).ConfigureAwait(false);
5959
Console.WriteLine();
6060
}
6161
catch (Exception e)

‎Minio.Examples/Cases/MyRequestLogger.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ public void LogRequest(RequestToLog requestToLog, ResponseToLog responseToLog, d
2525
{
2626
var sb = new StringBuilder();
2727

28-
sb.AppendLine("My logger says:");
29-
sb.Append("statusCode: ");
30-
sb.AppendLine(responseToLog.StatusCode.ToString());
31-
sb.AppendLine();
28+
_ = sb.AppendLine("My logger says:");
29+
_ = sb.Append("statusCode: ");
30+
_ = sb.AppendLine(responseToLog.StatusCode.ToString());
31+
_ = sb.AppendLine();
3232

33-
sb.AppendLine("Response: ");
34-
sb.Append(responseToLog.Content);
33+
_ = sb.AppendLine("Response: ");
34+
_ = sb.Append(responseToLog.Content);
3535

3636
Console.WriteLine(sb.ToString());
3737
}

‎Minio.Examples/Cases/PutObject.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static async Task Run(IMinioClient minio,
5151
.WithHeaders(metaData)
5252
.WithProgress(progress)
5353
.WithServerSideEncryption(sse);
54-
await minio.PutObjectAsync(args).ConfigureAwait(false);
54+
_ = await minio.PutObjectAsync(args).ConfigureAwait(false);
5555

5656
Console.WriteLine($"Uploaded object {objectName} to bucket {bucketName}");
5757
Console.WriteLine();

0 commit comments

Comments
 (0)