Skip to content

Commit 35574ea

Browse files
authored
Fix issues related to VS and update SDK (#411)
1 parent e85b685 commit 35574ea

File tree

11 files changed

+8
-88
lines changed

11 files changed

+8
-88
lines changed

Directory.Build.props

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,4 @@
1616
<Nullable>enable</Nullable>
1717
</PropertyGroup>
1818

19-
<ItemGroup>
20-
<!-- TODO (johluo): Remove this workaround when VS updates -->
21-
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" PrivateAssets="All" />
22-
</ItemGroup>
23-
24-
<Target Name="WorkaroundNetStandard" AfterTargets="ResolvePackageAssets">
25-
<!-- TODO (jamesnk): Remove this workaround when VS updates - https://github.com/dotnet/cli/issues/11378#issuecomment-499988244 -->
26-
<ItemGroup>
27-
<TransitiveFrameworkReference Remove="NETStandard.Library" />
28-
</ItemGroup>
29-
</Target>
30-
3119
</Project>

examples/Server/MailQueue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class MailQueue
4343
private int _forwardedMailCount;
4444

4545
public string Name { get; }
46-
public event Func<(int totalCount, int newCount, MailboxMessage.Types.Reason reason), Task> Changed;
46+
public event Func<(int totalCount, int newCount, MailboxMessage.Types.Reason reason), Task>? Changed;
4747

4848
public MailQueue(string name)
4949
{

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "3.0.100-preview8-013248"
3+
"version": "3.0.100-preview8-013421"
44
}
55
}

perf/Grpc.AspNetCore.Microbenchmarks/Internal/TestPipeReader.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public override void Complete(Exception? exception = null)
5151
throw new NotImplementedException();
5252
}
5353

54+
[Obsolete]
5455
public override void OnWriterCompleted(Action<Exception, object> callback, object state)
5556
{
5657
throw new NotImplementedException();

perf/Grpc.AspNetCore.Microbenchmarks/Internal/TestPipeWriter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public override Span<byte> GetSpan(int sizeHint = 0)
4444
return _buffer;
4545
}
4646

47+
[Obsolete]
4748
public override void OnReaderCompleted(Action<Exception, object> callback, object state)
4849
{
4950
throw new NotImplementedException();

src/Grpc.AspNetCore.Server/Internal/GrpcProtocolHelpers.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@
1818

1919
using System;
2020
using System.Collections.Generic;
21+
using System.Diagnostics.CodeAnalysis;
2122
using System.Globalization;
22-
using System.IO;
23-
using System.IO.Compression;
24-
using System.Runtime.CompilerServices;
2523
using System.Security.Cryptography.X509Certificates;
2624
using System.Text;
27-
using Grpc.AspNetCore.Server.Compression;
2825
using Grpc.Core;
2926
using Microsoft.AspNetCore.Http;
3027
using Microsoft.AspNetCore.Http.Features;

src/Grpc.AspNetCore.Server/Internal/NotNullWhenAttribute.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/Grpc.AspNetCore.Server/Internal/PipeExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
using System.Buffers.Binary;
2222
using System.Collections.Generic;
2323
using System.Diagnostics;
24+
using System.Diagnostics.CodeAnalysis;
2425
using System.IO;
2526
using System.IO.Compression;
2627
using System.IO.Pipelines;
2728
using System.Linq;
28-
using System.Runtime.CompilerServices;
2929
using System.Threading;
3030
using System.Threading.Tasks;
3131
using Grpc.AspNetCore.Server.Compression;

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

Lines changed: 0 additions & 34 deletions
This file was deleted.

test/FunctionalTests/Infrastructure/LogSinkProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class LogSinkProvider : ILoggerProvider, ISupportExternalScope
3030

3131
private IExternalScopeProvider? _scopeProvider;
3232

33-
public event Action<LogRecord> RecordLogged;
33+
public event Action<LogRecord>? RecordLogged;
3434

3535
public ILogger CreateLogger(string categoryName)
3636
{

0 commit comments

Comments
 (0)