Skip to content

Commit 103105e

Browse files
authored
Update dependencies and fix warnings (#899)
1 parent 9bc4d27 commit 103105e

File tree

6 files changed

+24
-25
lines changed

6 files changed

+24
-25
lines changed

build/dependencies.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<Project>
22
<PropertyGroup>
3-
<BenchmarkDotNetPackageVersion>0.11.3</BenchmarkDotNetPackageVersion>
3+
<BenchmarkDotNetPackageVersion>0.12.1</BenchmarkDotNetPackageVersion>
44
<GoogleProtobufPackageVersion>3.11.4</GoogleProtobufPackageVersion>
55
<GrpcDotNetPackageVersion>2.28.0-pre2</GrpcDotNetPackageVersion> <!-- Only use for example projects -->
6-
<GrpcPackageVersion>2.27.0</GrpcPackageVersion>
6+
<GrpcPackageVersion>2.28.0</GrpcPackageVersion>
77
<MicrosoftAspNetCorePackageVersion>3.1.3</MicrosoftAspNetCorePackageVersion>
8-
<MicrosoftAspNetCoreBlazorPackageVersion>3.2.0-preview5.20216.8</MicrosoftAspNetCoreBlazorPackageVersion>
8+
<MicrosoftAspNetCoreBlazorPackageVersion>3.2.0-rc1.20223.4</MicrosoftAspNetCoreBlazorPackageVersion>
99
<MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>
1010
<MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
11-
<MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>2.9.4</MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>
11+
<MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>3.0.0</MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>
1212
<MicrosoftExtensionsPackageVersion>2.1.1</MicrosoftExtensionsPackageVersion>
1313
<MicrosoftExtensions30PackageVersion>3.0.0</MicrosoftExtensions30PackageVersion>
14-
<MicrosoftNETTestSdkPackageVersion>16.2.0</MicrosoftNETTestSdkPackageVersion>
15-
<MicrosoftSourceLinkGitHubPackageVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkGitHubPackageVersion>
14+
<MicrosoftNETTestSdkPackageVersion>16.6.1</MicrosoftNETTestSdkPackageVersion>
15+
<MicrosoftSourceLinkGitHubPackageVersion>1.0.0</MicrosoftSourceLinkGitHubPackageVersion>
1616
<MicrosoftWin32RegistryLinePackageVersion>4.6.0</MicrosoftWin32RegistryLinePackageVersion>
1717
<MoqPackageVersion>4.10.0</MoqPackageVersion>
1818
<NewtonsoftJsonPackageVersion>12.0.2</NewtonsoftJsonPackageVersion>
1919
<NunitPackageVersion>3.12.0</NunitPackageVersion>
20-
<Nunit3TestAdapterPackageVersion>3.13.0</Nunit3TestAdapterPackageVersion>
20+
<Nunit3TestAdapterPackageVersion>3.16.1</Nunit3TestAdapterPackageVersion>
2121
<OpenTelemetryPackageVersion>0.2.0-alpha.100</OpenTelemetryPackageVersion>
2222
<SystemCommandLinePackageVersion>2.0.0-beta1.20214.1</SystemCommandLinePackageVersion>
2323
<SystemCommandLineRenderingPackageVersion>0.3.0-alpha.20214.1</SystemCommandLineRenderingPackageVersion>

perf/Grpc.AspNetCore.Microbenchmarks/DefaultCoreConfig.cs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
using BenchmarkDotNet.Loggers;
2626
using BenchmarkDotNet.Toolchains.CsProj;
2727
using BenchmarkDotNet.Toolchains.DotNetCli;
28-
using BenchmarkDotNet.Toolchains.InProcess;
2928
using BenchmarkDotNet.Validators;
3029

3130
namespace Grpc.AspNetCore.Microbenchmarks
@@ -34,19 +33,19 @@ internal class DefaultCoreConfig : ManualConfig
3433
{
3534
public DefaultCoreConfig()
3635
{
37-
Add(ConsoleLogger.Default);
38-
Add(MarkdownExporter.GitHub);
36+
AddLogger(ConsoleLogger.Default);
37+
AddExporter(MarkdownExporter.GitHub);
3938

40-
Add(MemoryDiagnoser.Default);
41-
Add(StatisticColumn.OperationsPerSecond);
42-
Add(DefaultColumnProviders.Instance);
39+
AddDiagnoser(MemoryDiagnoser.Default);
40+
AddColumn(StatisticColumn.OperationsPerSecond);
41+
AddColumnProvider(DefaultColumnProviders.Instance);
4342

44-
Add(JitOptimizationsValidator.FailOnError);
43+
AddValidator(JitOptimizationsValidator.FailOnError);
4544

46-
Add(Job.Core
47-
.With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1")))
48-
.With(new GcMode { Server = true })
49-
.With(RunStrategy.Throughput));
45+
AddJob(Job.Default
46+
.WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1")))
47+
.WithGcMode(new GcMode { Server = true })
48+
.WithStrategy(RunStrategy.Throughput));
5049
}
5150
}
5251
}

src/Grpc.Net.Client.Web/Internal/Base64RequestStream.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public override async ValueTask WriteAsync(ReadOnlyMemory<byte> data, Cancellati
8787
OperationStatus.NeedMoreData);
8888

8989
var base64Remainder = _buffer.Length - localBuffer.Length;
90-
await _inner.WriteAsync(_buffer.AsMemory(0, bytesWritten + base64Remainder), cancellationToken);
90+
await _inner.WriteAsync(_buffer.AsMemory(0, bytesWritten + base64Remainder), cancellationToken).ConfigureAwait(false);
9191

9292
data = data.Slice(bytesConsumed);
9393
localBuffer = _buffer;
@@ -97,7 +97,7 @@ public override async ValueTask WriteAsync(ReadOnlyMemory<byte> data, Cancellati
9797
// If there was not enough data to write along with remainder then write it here
9898
if (localBuffer.Length < _buffer.Length)
9999
{
100-
await _inner.WriteAsync(_buffer.AsMemory(0, 4), cancellationToken);
100+
await _inner.WriteAsync(_buffer.AsMemory(0, 4), cancellationToken).ConfigureAwait(false);
101101
}
102102

103103
if (data.Length > 0)
@@ -180,7 +180,7 @@ public override void SetLength(long value)
180180
public override void Write(byte[] buffer, int offset, int count)
181181
{
182182
// Used by unit tests
183-
WriteAsync(buffer.AsMemory(0, count)).GetAwaiter().GetResult();
183+
WriteAsync(buffer.AsMemory(0, count)).AsTask().GetAwaiter().GetResult();
184184
FlushAsync().GetAwaiter().GetResult();
185185
}
186186
#endregion

src/Grpc.Net.Client.Web/Internal/Base64ResponseStream.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public override async ValueTask<int> ReadAsync(Memory<byte> data, CancellationTo
7373
// Minimum valid base64 length is 4. Read until we have at least that much content
7474
do
7575
{
76-
var read = await _inner.ReadAsync(availableReadData, cancellationToken);
76+
var read = await _inner.ReadAsync(availableReadData, cancellationToken).ConfigureAwait(false);
7777
if (read == 0)
7878
{
7979
if (_remainder > 0)

src/Grpc.Net.Client.Web/Internal/GrpcWebResponseStream.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public override async ValueTask<int> ReadAsync(Memory<byte> data, CancellationTo
9595
data = data.Slice(0, _contentRemaining);
9696
}
9797

98-
var read = await _inner.ReadAsync(data, cancellationToken);
98+
var read = await _inner.ReadAsync(data, cancellationToken).ConfigureAwait(false);
9999
_contentRemaining -= read;
100100
if (_contentRemaining == 0)
101101
{
@@ -137,7 +137,7 @@ private async Task ReadTrailersAsync(int trailerLength, Memory<byte> data, Cance
137137
// 2. The response stream is read to completion. HttpClient may not recognize the
138138
// request as completing successfully if the request and response aren't completely
139139
// consumed.
140-
var count = await _inner.ReadAsync(data, cancellationToken);
140+
var count = await _inner.ReadAsync(data, cancellationToken).ConfigureAwait(false);
141141
if (count > 0)
142142
{
143143
throw new InvalidOperationException("Unexpected data after trailers.");

src/Grpc.Net.Client/Internal/GrpcCall.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ internal RpcException CreateRpcException(Status status)
440440
return new RpcException(status, trailers ?? Metadata.Empty);
441441
}
442442

443-
private async ValueTask RunCall(HttpRequestMessage request, TimeSpan? timeout)
443+
private async Task RunCall(HttpRequestMessage request, TimeSpan? timeout)
444444
{
445445
using (StartScope())
446446
{

0 commit comments

Comments
 (0)