From 6fba3c02216bf5d205da6338cffee088d722a900 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Mon, 25 Mar 2019 12:47:29 -0700
Subject: [PATCH] dependency versions are imported through Directory props
---
src/csharp/Grpc.Auth/Grpc.Auth.csproj | 1 -
src/csharp/Grpc.Core.Api/Grpc.Core.Api.csproj | 1 -
src/csharp/Grpc.Core.NativeDebug/Grpc.Core.NativeDebug.csproj | 1 -
src/csharp/Grpc.Core.Testing/Grpc.Core.Testing.csproj | 1 -
src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj | 1 -
src/csharp/Grpc.Core/Grpc.Core.csproj | 1 -
.../Grpc.Examples.MathClient/Grpc.Examples.MathClient.csproj | 1 -
.../Grpc.Examples.MathServer/Grpc.Examples.MathServer.csproj | 1 -
src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj | 1 -
src/csharp/Grpc.Examples/Grpc.Examples.csproj | 1 -
src/csharp/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj | 1 -
src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj | 1 -
.../Grpc.IntegrationTesting.Client.csproj | 1 -
.../Grpc.IntegrationTesting.QpsWorker.csproj | 1 -
.../Grpc.IntegrationTesting.Server.csproj | 1 -
.../Grpc.IntegrationTesting.StressClient.csproj | 1 -
.../Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj | 1 -
src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj | 1 -
src/csharp/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj | 1 -
src/csharp/Grpc.Reflection/Grpc.Reflection.csproj | 1 -
src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj | 2 --
src/csharp/Grpc.Tools/Grpc.Tools.csproj | 2 --
src/csharp/Grpc/Grpc.csproj | 1 -
23 files changed, 25 deletions(-)
diff --git a/src/csharp/Grpc.Auth/Grpc.Auth.csproj b/src/csharp/Grpc.Auth/Grpc.Auth.csproj
index dbdb2a78bb..298b721409 100755
--- a/src/csharp/Grpc.Auth/Grpc.Auth.csproj
+++ b/src/csharp/Grpc.Auth/Grpc.Auth.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Core.Api/Grpc.Core.Api.csproj b/src/csharp/Grpc.Core.Api/Grpc.Core.Api.csproj
index 2d9746e88b..1d8632a1df 100755
--- a/src/csharp/Grpc.Core.Api/Grpc.Core.Api.csproj
+++ b/src/csharp/Grpc.Core.Api/Grpc.Core.Api.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Core.NativeDebug/Grpc.Core.NativeDebug.csproj b/src/csharp/Grpc.Core.NativeDebug/Grpc.Core.NativeDebug.csproj
index 3cd5ba4fa6..a8b13030ee 100644
--- a/src/csharp/Grpc.Core.NativeDebug/Grpc.Core.NativeDebug.csproj
+++ b/src/csharp/Grpc.Core.NativeDebug/Grpc.Core.NativeDebug.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Core.Testing/Grpc.Core.Testing.csproj b/src/csharp/Grpc.Core.Testing/Grpc.Core.Testing.csproj
index 0d38517563..3cd36d4500 100755
--- a/src/csharp/Grpc.Core.Testing/Grpc.Core.Testing.csproj
+++ b/src/csharp/Grpc.Core.Testing/Grpc.Core.Testing.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj b/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj
index 656f0c1dbb..23e5d7f65e 100755
--- a/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj
+++ b/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Core/Grpc.Core.csproj b/src/csharp/Grpc.Core/Grpc.Core.csproj
index 9d79358a2c..b7c191ea6a 100755
--- a/src/csharp/Grpc.Core/Grpc.Core.csproj
+++ b/src/csharp/Grpc.Core/Grpc.Core.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Examples.MathClient/Grpc.Examples.MathClient.csproj b/src/csharp/Grpc.Examples.MathClient/Grpc.Examples.MathClient.csproj
index c34af241a1..0301823952 100755
--- a/src/csharp/Grpc.Examples.MathClient/Grpc.Examples.MathClient.csproj
+++ b/src/csharp/Grpc.Examples.MathClient/Grpc.Examples.MathClient.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Examples.MathServer/Grpc.Examples.MathServer.csproj b/src/csharp/Grpc.Examples.MathServer/Grpc.Examples.MathServer.csproj
index c34af241a1..0301823952 100755
--- a/src/csharp/Grpc.Examples.MathServer/Grpc.Examples.MathServer.csproj
+++ b/src/csharp/Grpc.Examples.MathServer/Grpc.Examples.MathServer.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj b/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj
index 9b93ffb30f..b3fbbfffcc 100755
--- a/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj
+++ b/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Examples/Grpc.Examples.csproj b/src/csharp/Grpc.Examples/Grpc.Examples.csproj
index 03bc53f13c..66ea71853b 100755
--- a/src/csharp/Grpc.Examples/Grpc.Examples.csproj
+++ b/src/csharp/Grpc.Examples/Grpc.Examples.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj b/src/csharp/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj
index a2c2ce4036..223c9985ec 100755
--- a/src/csharp/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj
+++ b/src/csharp/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj b/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj
index 9130b1cc99..7e8a8a7de8 100755
--- a/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj
+++ b/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.IntegrationTesting.Client/Grpc.IntegrationTesting.Client.csproj b/src/csharp/Grpc.IntegrationTesting.Client/Grpc.IntegrationTesting.Client.csproj
index ee23f4dcaf..a5baf96357 100755
--- a/src/csharp/Grpc.IntegrationTesting.Client/Grpc.IntegrationTesting.Client.csproj
+++ b/src/csharp/Grpc.IntegrationTesting.Client/Grpc.IntegrationTesting.Client.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.IntegrationTesting.QpsWorker/Grpc.IntegrationTesting.QpsWorker.csproj b/src/csharp/Grpc.IntegrationTesting.QpsWorker/Grpc.IntegrationTesting.QpsWorker.csproj
index 2e6b1a5b9a..8f4833ea74 100755
--- a/src/csharp/Grpc.IntegrationTesting.QpsWorker/Grpc.IntegrationTesting.QpsWorker.csproj
+++ b/src/csharp/Grpc.IntegrationTesting.QpsWorker/Grpc.IntegrationTesting.QpsWorker.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.IntegrationTesting.Server/Grpc.IntegrationTesting.Server.csproj b/src/csharp/Grpc.IntegrationTesting.Server/Grpc.IntegrationTesting.Server.csproj
index ee23f4dcaf..a5baf96357 100755
--- a/src/csharp/Grpc.IntegrationTesting.Server/Grpc.IntegrationTesting.Server.csproj
+++ b/src/csharp/Grpc.IntegrationTesting.Server/Grpc.IntegrationTesting.Server.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.IntegrationTesting.StressClient/Grpc.IntegrationTesting.StressClient.csproj b/src/csharp/Grpc.IntegrationTesting.StressClient/Grpc.IntegrationTesting.StressClient.csproj
index ee23f4dcaf..a5baf96357 100755
--- a/src/csharp/Grpc.IntegrationTesting.StressClient/Grpc.IntegrationTesting.StressClient.csproj
+++ b/src/csharp/Grpc.IntegrationTesting.StressClient/Grpc.IntegrationTesting.StressClient.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
index 3db50b9ed7..9d719896fc 100755
--- a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
+++ b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj b/src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj
index bf51032043..e0fcdecd9a 100644
--- a/src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj
+++ b/src/csharp/Grpc.Microbenchmarks/Grpc.Microbenchmarks.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj b/src/csharp/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj
index 2f31a0439c..ef9d2a1c57 100755
--- a/src/csharp/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj
+++ b/src/csharp/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Reflection/Grpc.Reflection.csproj b/src/csharp/Grpc.Reflection/Grpc.Reflection.csproj
index 8149880a26..cf08e58ed6 100755
--- a/src/csharp/Grpc.Reflection/Grpc.Reflection.csproj
+++ b/src/csharp/Grpc.Reflection/Grpc.Reflection.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
diff --git a/src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj b/src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj
index 36a422f4f0..7ad2ce2169 100644
--- a/src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj
+++ b/src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj
@@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
-
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp2.1</TargetFrameworks>
<OutputType>Exe</OutputType>
diff --git a/src/csharp/Grpc.Tools/Grpc.Tools.csproj b/src/csharp/Grpc.Tools/Grpc.Tools.csproj
index 33bfc25e65..d09d97d139 100644
--- a/src/csharp/Grpc.Tools/Grpc.Tools.csproj
+++ b/src/csharp/Grpc.Tools/Grpc.Tools.csproj
@@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\Grpc.Core.Api\Version.csproj.include" />
-
<PropertyGroup>
<AssemblyName>Protobuf.MSBuild</AssemblyName>
<VersionPrefix>$(GrpcCsharpVersion)</VersionPrefix>
diff --git a/src/csharp/Grpc/Grpc.csproj b/src/csharp/Grpc/Grpc.csproj
index 5174b97086..b71cd93ff9 100644
--- a/src/csharp/Grpc/Grpc.csproj
+++ b/src/csharp/Grpc/Grpc.csproj
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\Grpc.Core\Version.csproj.include" />
<Import Project="..\Grpc.Core\Common.csproj.include" />
<PropertyGroup>
--
GitLab