Skip to content

Commit 3848bc2

Browse files
JamesNKJamesNK
authored
Merge branch 'master' into update_version
2 parents fcd2201 + 7425732 commit 3848bc2

File tree

5 files changed

+43
-26
lines changed

5 files changed

+43
-26
lines changed

‎Directory.Build.props‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,6 @@
1313

1414
<LangVersion>8.0</LangVersion>
1515
<Nullable>enable</Nullable>
16-
<CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Grpc.DotNet.ruleset</CodeAnalysisRuleset>
1716
</PropertyGroup>
1817

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

‎Directory.Build.targets‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project>
2+
3+
<!-- IsGrpcPublishedPackage is set in csproj so related config must be in targets file -->
4+
<PropertyGroup Condition=" '$(IsGrpcPublishedPackage)' == 'true' ">
5+
<Authors>The gRPC Authors</Authors>
6+
<Copyright>Copyright 2019 The gRPC Authors</Copyright>
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>
10+
<Version>$(GrpcDotnetVersion)</Version>
11+
<AssemblyVersion>$(GrpcDotnetAssemblyVersion)</AssemblyVersion>
12+
<FileVersion>$(GrpcDotnetAssemblyFileVersion)</FileVersion>
13+
14+
<!-- Include PDB in the built .nupkg -->
15+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
16+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
17+
18+
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
19+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
20+
21+
<CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Grpc.DotNet.ruleset</CodeAnalysisRuleset>
22+
</PropertyGroup>
23+
24+
<!-- IsGrpcPublishedPackage is set in csproj so related config must be in targets file -->
25+
<ItemGroup Condition="'$(IsGrpcPublishedPackage)' == 'true'">
26+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="$(MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion)" PrivateAssets="All" />
27+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" />
28+
</ItemGroup>
29+
30+
</Project>

‎build/version.props‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<Project>
22
<PropertyGroup>
3-
<!-- version of all grpc-dotnet packages -->
3+
4+
<!-- package version of grpc-dotnet -->
45
<GrpcDotnetVersion>0.2.23-pre1</GrpcDotnetVersion>
6+
7+
<!-- assembly version of grpc-dotnet -->
8+
<GrpcDotnetAssemblyVersion>0.2.0.0</GrpcDotnetAssemblyVersion>
9+
10+
<!-- file version of all grpc-dotnet -->
11+
<GrpcDotnetAssemblyFileVersion>0.2.23.0</GrpcDotnetAssemblyFileVersion>
12+
513
</PropertyGroup>
614
</Project>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
<IsGrpcPublishedPackage>true</IsGrpcPublishedPackage>
88
<TargetFramework>netcoreapp3.0</TargetFramework>
9+
10+
<!-- Don't include empty DLL or PDB in metapackage -->
11+
<IncludeBuildOutput>false</IncludeBuildOutput>
12+
<IncludeSymbols>false</IncludeSymbols>
913
</PropertyGroup>
1014

1115
<ItemGroup>

‎src/dotnet-grpc/dotnet-grpc.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<!-- Temporary workaround for dependency conflict TODO (JamesNK): https://github.com/grpc/grpc-dotnet/issues/360 -->
1414
<MSBuildWarningsAsMessages>MSB3277</MSBuildWarningsAsMessages>
1515

16-
<!-- Temporary workaround for MSBuild issue TODO (johluo): https://github.com/microsoft/msbuild/issues/4474 -->
17-
<GenerateResourceUsePreserializedResources>false</GenerateResourceUsePreserializedResources>
18-
1916
<!-- Disable analysis for ConfigureAwait(false) -->
2017
<WarningsNotAsErrors>$(WarningsNotAsErrors);CA2007</WarningsNotAsErrors>
2118
<NoWarn>$(NoWarn);CA2007</NoWarn>

0 commit comments

Comments
 (0)