Skip to content

Commit 4779f6b

Browse files
JamesNKJamesNK
authored
Update package dependencies (#459)
1 parent 16772ae commit 4779f6b

File tree

12 files changed

+43
-112
lines changed

12 files changed

+43
-112
lines changed

‎Directory.Build.props‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,28 @@
1111
<!-- Don't make missing XML docs a fatal build error, but still surface so we have visibility into undocumented APIs. -->
1212
<WarningsNotAsErrors>$(WarningsNotAsErrors);CS1591</WarningsNotAsErrors>
1313

14-
<!-- static local methods are a C# 8.0 feature -->
15-
<LangVersion>preview</LangVersion>
14+
<LangVersion>8.0</LangVersion>
1615
<Nullable>enable</Nullable>
1716
</PropertyGroup>
1817

18+
<PropertyGroup Condition=" '$(IsGrpcPublishedPackage)' == 'true' ">
19+
<Authors>The gRPC Authors</Authors>
20+
<Copyright>Copyright 2019 The gRPC Authors</Copyright>
21+
<PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
22+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
23+
<PackageProjectUrl>https://github.com/grpc/grpc-dotnet</PackageProjectUrl>
24+
<VersionPrefix>$(GrpcDotnetVersion)</VersionPrefix>
25+
26+
<!-- Include PDB in the built .nupkg -->
27+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
28+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
29+
30+
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
31+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
32+
</PropertyGroup>
33+
34+
<ItemGroup Condition="'$(IsGrpcPublishedPackage)' == 'true'">
35+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" />
36+
</ItemGroup>
37+
1938
</Project>

‎Directory.Build.targets‎

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

‎build/dependencies.props‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@
33
<BenchmarkDotNetPackageVersion>0.11.3</BenchmarkDotNetPackageVersion>
44
<CommandLineParserPackageVersion>2.3.0</CommandLineParserPackageVersion>
55
<ConfigureAwaitCheckerAnalyzerPackageVersion>3.0.0</ConfigureAwaitCheckerAnalyzerPackageVersion>
6-
<GoogleProtobufPackageVersion>3.8.0</GoogleProtobufPackageVersion>
7-
<GrpcPackageVersion>2.23.0-dev201908011006</GrpcPackageVersion>
6+
<GoogleProtobufPackageVersion>3.9.1</GoogleProtobufPackageVersion>
7+
<GrpcPackageVersion>2.23.0-pre1</GrpcPackageVersion>
88
<MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
99
<MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>
10-
<MicrosoftAspNetCorePackageVersion>3.0.0-preview7.19326.10</MicrosoftAspNetCorePackageVersion>
10+
<MicrosoftAspNetCorePackageVersion>3.0.0-preview8.19405.7</MicrosoftAspNetCorePackageVersion>
1111
<MicrosoftExtensionsPackageVersion>2.1.1</MicrosoftExtensionsPackageVersion>
12-
<MicrosoftExtensions30PackageVersion>3.0.0-preview7.19327.1</MicrosoftExtensions30PackageVersion>
13-
<MicrosoftNetCompilersToolsetPackageVersion>3.2.0-beta4-final</MicrosoftNetCompilersToolsetPackageVersion>
12+
<MicrosoftExtensions30PackageVersion>3.0.0-preview8.19405.4</MicrosoftExtensions30PackageVersion>
1413
<MicrosoftNETTestSdkPackageVersion>16.2.0</MicrosoftNETTestSdkPackageVersion>
1514
<MicrosoftSourceLinkGitHubPackageVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkGitHubPackageVersion>
1615
<MoqPackageVersion>4.10.0</MoqPackageVersion>
1716
<NewtonsoftJsonPackageVersion>12.0.2</NewtonsoftJsonPackageVersion>
1817
<NunitPackageVersion>3.12.0</NunitPackageVersion>
1918
<Nunit3TestAdapterPackageVersion>3.13.0</Nunit3TestAdapterPackageVersion>
20-
<SystemCommandLinePackageVersion>0.3.0-alpha.19317.1</SystemCommandLinePackageVersion>
19+
<SystemCommandLinePackageVersion>0.3.0-alpha.19405.1</SystemCommandLinePackageVersion>
2120
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
2221
</PropertyGroup>
2322
</Project>

‎src/Grpc.AspNetCore.Server.ClientFactory/Grpc.AspNetCore.Server.ClientFactory.csproj‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Authors>The gRPC Authors</Authors>
5-
<Copyright>Copyright 2019 The gRPC Authors</Copyright>
64
<Description>HttpClientFactory integration the for gRPC .NET client when running in ASP.NET Core</Description>
7-
<PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
8-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9-
<PackageProjectUrl>https://github.com/grpc/grpc-dotnet</PackageProjectUrl>
105
<PackageTags>gRPC RPC HTTP/2 aspnetcore</PackageTags>
11-
<VersionPrefix>$(GrpcDotnetVersion)</VersionPrefix>
12-
</PropertyGroup>
136

14-
<PropertyGroup>
15-
<!-- Include PDB in the built .nupkg -->
16-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
17-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
18-
</PropertyGroup>
19-
20-
<PropertyGroup>
7+
<IsGrpcPublishedPackage>true</IsGrpcPublishedPackage>
218
<TargetFramework>netcoreapp3.0</TargetFramework>
22-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
239
</PropertyGroup>
2410

2511
<ItemGroup>

‎src/Grpc.AspNetCore.Server.Reflection/Grpc.AspNetCore.Server.Reflection.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<Description>Automatic discovery of services for Grpc.Reflection</Description>
5+
<PackageTags>gRPC RPC HTTP/2</PackageTags>
6+
7+
<IsGrpcPublishedPackage>true</IsGrpcPublishedPackage>
48
<TargetFramework>netcoreapp3.0</TargetFramework>
59
</PropertyGroup>
610

‎src/Grpc.AspNetCore.Server/Grpc.AspNetCore.Server.csproj‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Authors>The gRPC Authors</Authors>
5-
<Copyright>Copyright 2019 The gRPC Authors</Copyright>
64
<Description>gRPC support for ASP.NET Core</Description>
7-
<PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
8-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9-
<PackageProjectUrl>https://github.com/grpc/grpc-dotnet</PackageProjectUrl>
105
<PackageTags>gRPC RPC HTTP/2 aspnetcore</PackageTags>
11-
<VersionPrefix>$(GrpcDotnetVersion)</VersionPrefix>
12-
</PropertyGroup>
136

14-
<PropertyGroup>
15-
<!-- Include PDB in the built .nupkg -->
16-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
17-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
18-
</PropertyGroup>
19-
20-
<PropertyGroup>
7+
<IsGrpcPublishedPackage>true</IsGrpcPublishedPackage>
218
<TargetFramework>netcoreapp3.0</TargetFramework>
22-
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
23-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
249
</PropertyGroup>
2510

2611
<ItemGroup>
@@ -34,7 +19,6 @@
3419
<ProjectReference Include="..\Grpc.Net.Common\Grpc.Net.Common.csproj" />
3520

3621
<PackageReference Include="Grpc.Core.Api" Version="$(GrpcPackageVersion)" />
37-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" />
3822
</ItemGroup>
3923

4024
</Project>

‎src/Grpc.AspNetCore/Grpc.AspNetCore.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Authors>The gRPC Authors</Authors>
5-
<Copyright>Copyright 2019 The gRPC Authors</Copyright>
64
<Description>gRPC meta-package for ASP.NET Core</Description>
7-
<PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
8-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9-
<PackageProjectUrl>https://github.com/grpc/grpc-dotnet</PackageProjectUrl>
105
<PackageTags>gRPC RPC HTTP/2 aspnetcore</PackageTags>
11-
<VersionPrefix>$(GrpcDotnetVersion)</VersionPrefix>
12-
</PropertyGroup>
136

14-
<PropertyGroup>
7+
<IsGrpcPublishedPackage>true</IsGrpcPublishedPackage>
158
<TargetFramework>netcoreapp3.0</TargetFramework>
16-
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
179
</PropertyGroup>
1810

1911
<ItemGroup>

‎src/Grpc.Net.Client/Grpc.Net.Client.csproj‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Authors>The gRPC Authors</Authors>
5-
<Copyright>Copyright 2019 The gRPC Authors</Copyright>
64
<Description>.NET client for gRPC</Description>
7-
<PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
8-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9-
<PackageProjectUrl>https://github.com/grpc/grpc-dotnet</PackageProjectUrl>
105
<PackageTags>gRPC RPC HTTP/2</PackageTags>
11-
<VersionPrefix>$(GrpcDotnetVersion)</VersionPrefix>
12-
</PropertyGroup>
13-
14-
<PropertyGroup>
15-
<!-- Include PDB in the built .nupkg -->
16-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
17-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
18-
</PropertyGroup>
196

20-
<PropertyGroup>
7+
<IsGrpcPublishedPackage>true</IsGrpcPublishedPackage>
218
<TargetFramework>netstandard2.1</TargetFramework>
22-
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
23-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
249
</PropertyGroup>
2510

2611
<ItemGroup>

‎src/Grpc.Net.ClientFactory/Grpc.Net.ClientFactory.csproj‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Authors>The gRPC Authors</Authors>
5-
<Copyright>Copyright 2019 The gRPC Authors</Copyright>
64
<Description>HttpClientFactory integration the for gRPC .NET client</Description>
7-
<PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
8-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9-
<PackageProjectUrl>https://github.com/grpc/grpc-dotnet</PackageProjectUrl>
105
<PackageTags>gRPC RPC HTTP/2</PackageTags>
11-
<VersionPrefix>$(GrpcDotnetVersion)</VersionPrefix>
12-
</PropertyGroup>
13-
14-
<PropertyGroup>
15-
<!-- Include PDB in the built .nupkg -->
16-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
17-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
18-
</PropertyGroup>
196

20-
<PropertyGroup>
7+
<IsGrpcPublishedPackage>true</IsGrpcPublishedPackage>
218
<TargetFramework>netstandard2.1</TargetFramework>
22-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
239
</PropertyGroup>
2410

2511
<ItemGroup>
2612
<!-- PrivateAssets set to None to ensure the build targets/props are propagated to parent project -->
2713
<ProjectReference Include="..\Grpc.Net.Client\Grpc.Net.Client.csproj" PrivateAssets="None" />
14+
15+
<!-- Roslyn analyzer that enforces ConfigureAwait(false) -->
16+
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="$(ConfigureAwaitCheckerAnalyzerPackageVersion)" PrivateAssets="All" />
2817
<PackageReference Include="Grpc.Core.Api" Version="$(GrpcPackageVersion)" />
2918
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsPackageVersion)" />
3019
</ItemGroup>

‎src/Grpc.Net.Common/Grpc.Net.Common.csproj‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Authors>The gRPC Authors</Authors>
5-
<Copyright>Copyright 2019 The gRPC Authors</Copyright>
64
<Description>Infrastructure for common functionality in gRPC</Description>
7-
<PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
8-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9-
<PackageProjectUrl>https://github.com/grpc/grpc-dotnet</PackageProjectUrl>
105
<PackageTags>gRPC RPC HTTP/2</PackageTags>
11-
<VersionPrefix>$(GrpcDotnetVersion)</VersionPrefix>
12-
</PropertyGroup>
13-
14-
<PropertyGroup>
15-
<!-- Include PDB in the built .nupkg -->
16-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
17-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
18-
</PropertyGroup>
196

20-
<PropertyGroup>
7+
<IsGrpcPublishedPackage>true</IsGrpcPublishedPackage>
218
<TargetFramework>netstandard2.1</TargetFramework>
22-
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
23-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
249
</PropertyGroup>
2510

2611
<ItemGroup>
@@ -29,8 +14,4 @@
2914
<PackageReference Include="Grpc.Core.Api" Version="$(GrpcPackageVersion)" />
3015
</ItemGroup>
3116

32-
<ItemGroup>
33-
<Folder Include="Properties\" />
34-
</ItemGroup>
35-
3617
</Project>

0 commit comments

Comments
 (0)