Skip to content

Commit 5d1fef3

Browse files
authored
Update to latest nightly .NET Core SDK (#359)
1 parent c48870b commit 5d1fef3

File tree

9 files changed

+12
-17
lines changed

9 files changed

+12
-17
lines changed

build/dependencies.props

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
<CommandLineParserPackageVersion>2.3.0</CommandLineParserPackageVersion>
55
<ConfigureAwaitCheckerAnalyzerPackageVersion>3.0.0</ConfigureAwaitCheckerAnalyzerPackageVersion>
66
<GoogleProtobufPackageVersion>3.8.0</GoogleProtobufPackageVersion>
7-
<GrpcPackageVersion>1.22.0-dev201906181005</GrpcPackageVersion>
7+
<GrpcPackageVersion>1.22.0-pre1</GrpcPackageVersion>
88
<MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
99
<MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>
10-
<MicrosoftAspNetCorePackageVersion>3.0.0-preview6-19265-03</MicrosoftAspNetCorePackageVersion>
10+
<MicrosoftAspNetCorePackageVersion>3.0.0-preview7.19326.10</MicrosoftAspNetCorePackageVersion>
1111
<MicrosoftExtensionsPackageVersion>2.1.1</MicrosoftExtensionsPackageVersion>
12-
<MicrosoftExtensions30PackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensions30PackageVersion>
13-
<MicrosoftAspNetCoreAuthenticationCertificatePackageVersion>3.0.0-preview6.19307.2</MicrosoftAspNetCoreAuthenticationCertificatePackageVersion>
12+
<MicrosoftExtensions30PackageVersion>3.0.0-preview7.19327.1</MicrosoftExtensions30PackageVersion>
1413
<MicrosoftNetCompilersToolsetPackageVersion>3.2.0-beta3-19280-02</MicrosoftNetCompilersToolsetPackageVersion>
1514
<MicrosoftNETTestSdkPackageVersion>16.0.0</MicrosoftNETTestSdkPackageVersion>
1615
<MicrosoftSourceLinkGitHubPackageVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkGitHubPackageVersion>

examples/Server/Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ProjectReference Include="..\..\src\Grpc.AspNetCore\Grpc.AspNetCore.csproj" />
1717
<ProjectReference Include="..\..\src\Grpc.AspNetCore.Server.Reflection\Grpc.AspNetCore.Server.Reflection.csproj" />
1818

19-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="$(MicrosoftAspNetCoreAuthenticationCertificatePackageVersion)" />
19+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="$(MicrosoftAspNetCorePackageVersion)" />
2020
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCorePackageVersion)" />
2121
</ItemGroup>
2222

examples/Server/Services/TicketerService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override Task<BuyTicketsResponse> BuyTickets(BuyTicketsRequest request, S
4848

4949
return Task.FromResult(new BuyTicketsResponse
5050
{
51-
Success = _ticketRepository.BuyTickets(user.Identity.Name, request.Count)
51+
Success = _ticketRepository.BuyTickets(user.Identity.Name!, request.Count)
5252
});
5353
}
5454
}

examples/Server/TicketRepository.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class TicketRepository
2424
{
2525
private readonly ILogger<TicketRepository> _logger;
2626
private int _availableTickets = 5;
27-
27+
2828
public TicketRepository(ILoggerFactory loggerFactory)
2929
{
3030
_logger = loggerFactory.CreateLogger<TicketRepository>();

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-preview7-012518"
3+
"version": "3.0.100-preview7-012687"
44
}
55
}

perf/benchmarkapps/Shared/BenchmarkConfigurationHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
using System;
2020
using System.Net;
21-
using Microsoft.AspNetCore.Http.Internal;
21+
using Microsoft.AspNetCore.Http;
2222
using Microsoft.Extensions.Configuration;
2323

2424
namespace Common

src/dotnet-grpc/dotnet-grpc.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<OutputType>exe</OutputType>
1515
<PackAsTool>true</PackAsTool>
1616
<RootNamespace>Grpc.Dotnet.Cli</RootNamespace>
17+
18+
<!-- Workaround for MSBuild issue TODO (johluo): https://github.com/microsoft/msbuild/issues/4474 -->
19+
<GenerateResourceUsePreserializedResources>false</GenerateResourceUsePreserializedResources>
1720
</PropertyGroup>
1821

1922
<ItemGroup>

test/FunctionalTests/Infrastructure/DynamicGrpcServiceRegistry.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,11 @@
2121
using System.Linq;
2222
using FunctionalTestsWebsite.Infrastructure;
2323
using Google.Protobuf;
24-
using Grpc.AspNetCore.Server.Internal;
2524
using Grpc.AspNetCore.Server.Model;
2625
using Grpc.Core;
2726
using Microsoft.AspNetCore.Builder;
28-
using Microsoft.AspNetCore.Builder.Internal;
2927
using Microsoft.AspNetCore.Routing;
3028
using Microsoft.Extensions.DependencyInjection;
31-
using Moq;
32-
using NUnit.Framework;
3329

3430
namespace Grpc.AspNetCore.FunctionalTests.Infrastructure
3531
{

test/Grpc.AspNetCore.Server.Tests/HttpContextServerCallContextTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#endregion
1818

1919
using System;
20-
using System.Collections.Generic;
2120
using System.Linq;
2221
using System.Net;
2322
using System.Security.Cryptography.X509Certificates;
@@ -28,7 +27,6 @@
2827
using Grpc.Tests.Shared;
2928
using Microsoft.AspNetCore.Http;
3029
using Microsoft.AspNetCore.Http.Features;
31-
using Microsoft.AspNetCore.Http.Internal;
3230
using Microsoft.Extensions.Logging;
3331
using Microsoft.Extensions.Logging.Abstractions;
3432
using Microsoft.Extensions.Logging.Testing;
@@ -537,8 +535,7 @@ public void RequestHeaders_ManyHttpRequestHeaders_HeadersFiltered(string headerN
537535
{
538536
// Arrange
539537
var httpContext = new DefaultHttpContext();
540-
var httpRequest = new DefaultHttpRequest(httpContext);
541-
httpRequest.Headers[headerName] = "value";
538+
httpContext.Request.Headers[headerName] = "value";
542539
var serverCallContext = CreateServerCallContext(httpContext);
543540

544541
// Act

0 commit comments

Comments
 (0)