Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

introduce common.props, set LangVersion to 7.2

Browse Source
pull/24567/head
Jan Tattermusch 4 years ago
parent 9936d7785c
commit 94edf0e21f
27 changed files with 14 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/csharp/Directory.Build.props
  2. 9
      src/csharp/Directory.Build.targets
  3. 3
      src/csharp/Grpc.Auth/Grpc.Auth.csproj
  4. 3
      src/csharp/Grpc.Core.Api/Grpc.Core.Api.csproj
  5. 3
      src/csharp/Grpc.Core.NativeDebug/Grpc.Core.NativeDebug.csproj
  6. 3
      src/csharp/Grpc.Core.Testing/Grpc.Core.Testing.csproj
  7. 3
      src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj
  8. 3
      src/csharp/Grpc.Core.Xamarin/Grpc.Core.Xamarin.csproj
  9. 7
      src/csharp/Grpc.Core/Grpc.Core.csproj
  10. 3
      src/csharp/Grpc.Examples.MathClient/Grpc.Examples.MathClient.csproj
  11. 3
      src/csharp/Grpc.Examples.MathServer/Grpc.Examples.MathServer.csproj
  12. 3
      src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj
  13. 3
      src/csharp/Grpc.Examples/Grpc.Examples.csproj
  14. 3
      src/csharp/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj
  15. 3
      src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj
  16. 3
      src/csharp/Grpc.IntegrationTesting.Client/Grpc.IntegrationTesting.Client.csproj
  17. 3
      src/csharp/Grpc.IntegrationTesting.QpsWorker/Grpc.IntegrationTesting.QpsWorker.csproj
  18. 3
      src/csharp/Grpc.IntegrationTesting.Server/Grpc.IntegrationTesting.Server.csproj
  19. 3
      src/csharp/Grpc.IntegrationTesting.StressClient/Grpc.IntegrationTesting.StressClient.csproj
  20. 3
      src/csharp/Grpc.IntegrationTesting.XdsClient/Grpc.IntegrationTesting.XdsClient.csproj
  21. 3
      src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
  22. 3
      src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj
  23. 3
      src/csharp/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj
  24. 3
      src/csharp/Grpc.Reflection/Grpc.Reflection.csproj
  25. 3
      src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj
  26. 3
      src/csharp/Grpc.Tools/Grpc.Tools.csproj
  27. 11
      src/csharp/build/common.props

1
src/csharp/Directory.Build.props
Unescape View File

@ -1,3 +1,4 @@
<Project> <Project>
<Import Project="build\dependencies.props" /> <Import Project="build\dependencies.props" />
<Import Project="build\common.props" />
</Project> </Project>

9
src/csharp/Directory.Build.targets
Unescape View File

@ -0,0 +1,9 @@
<Project>
<!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>

3
src/csharp/Grpc.Auth/Grpc.Auth.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<Authors>The gRPC Authors</Authors> <Authors>The gRPC Authors</Authors>
<Copyright>Copyright 2015 The gRPC Authors</Copyright> <Copyright>Copyright 2015 The gRPC Authors</Copyright>

3
src/csharp/Grpc.Core.Api/Grpc.Core.Api.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<Authors>The gRPC Authors</Authors> <Authors>The gRPC Authors</Authors>
<Copyright>Copyright 2019 The gRPC Authors</Copyright> <Copyright>Copyright 2019 The gRPC Authors</Copyright>

3
src/csharp/Grpc.Core.NativeDebug/Grpc.Core.NativeDebug.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<Authors>The gRPC Authors</Authors> <Authors>The gRPC Authors</Authors>
<Copyright>Copyright 2015 The gRPC Authors</Copyright> <Copyright>Copyright 2015 The gRPC Authors</Copyright>

3
src/csharp/Grpc.Core.Testing/Grpc.Core.Testing.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<Authors>The gRPC Authors</Authors> <Authors>The gRPC Authors</Authors>
<Description>Miscellaneous code for testing Grpc.Core</Description> <Description>Miscellaneous code for testing Grpc.Core</Description>

3
src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.Core.Xamarin/Grpc.Core.Xamarin.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<Authors>The gRPC Authors</Authors> <Authors>The gRPC Authors</Authors>
<Copyright>Copyright 2015 The gRPC Authors</Copyright> <Copyright>Copyright 2015 The gRPC Authors</Copyright>

7
src/csharp/Grpc.Core/Grpc.Core.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<Authors>The gRPC Authors</Authors> <Authors>The gRPC Authors</Authors>
<Copyright>Copyright 2015 The gRPC Authors</Copyright> <Copyright>Copyright 2015 The gRPC Authors</Copyright>
@ -23,10 +20,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<LangVersion>7.2</LangVersion>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\Grpc.Core.Api\Version.cs" /> <Compile Include="..\Grpc.Core.Api\Version.cs" />
</ItemGroup> </ItemGroup>

3
src/csharp/Grpc.Examples.MathClient/Grpc.Examples.MathClient.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.Examples.MathServer/Grpc.Examples.MathServer.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.Examples/Grpc.Examples.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

3
src/csharp/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<Authors>The gRPC Authors</Authors> <Authors>The gRPC Authors</Authors>
<Copyright>Copyright 2015 The gRPC Authors</Copyright> <Copyright>Copyright 2015 The gRPC Authors</Copyright>

3
src/csharp/Grpc.IntegrationTesting.Client/Grpc.IntegrationTesting.Client.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.IntegrationTesting.QpsWorker/Grpc.IntegrationTesting.QpsWorker.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.IntegrationTesting.Server/Grpc.IntegrationTesting.Server.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.IntegrationTesting.StressClient/Grpc.IntegrationTesting.StressClient.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.IntegrationTesting.XdsClient/Grpc.IntegrationTesting.XdsClient.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.Reflection/Grpc.Reflection.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<Authors>The gRPC Authors</Authors> <Authors>The gRPC Authors</Authors>
<Copyright>Copyright 2016 The gRPC Authors</Copyright> <Copyright>Copyright 2016 The gRPC Authors</Copyright>

3
src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks> <TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

3
src/csharp/Grpc.Tools/Grpc.Tools.csproj
Unescape View File

@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup> <PropertyGroup>
<AssemblyName>Protobuf.MSBuild</AssemblyName> <AssemblyName>Protobuf.MSBuild</AssemblyName>
<VersionPrefix>$(GrpcCsharpVersion)</VersionPrefix> <VersionPrefix>$(GrpcCsharpVersion)</VersionPrefix>

11
src/csharp/Grpc.Core/Common.csproj.include → src/csharp/build/common.props
Unescape View File

@ -19,11 +19,8 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign> <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
</PropertyGroup> </PropertyGroup>
<!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 --> <PropertyGroup>
<ItemGroup> <LangVersion>7.2</LangVersion>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0"> </PropertyGroup>
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project> </Project>
Write Preview
Loading…
Cancel
Save