From 9580c45c65e0fb2032a5ac1375a210fd05b01639 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 5 Apr 2019 17:31:27 -0700
Subject: [PATCH 1/8] Add VS integration for design time build

---
 .../build/_protobuf/Google.Protobuf.Tools.targets | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
index 1a862337c58..de2f66e5be1 100644
--- a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
+++ b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
@@ -38,6 +38,21 @@
     <AvailableItemName Include="Protobuf" />
   </ItemGroup>
 
+  <!-- Design Time Build integration for Visual Studio -->
+  <ItemGroup Condition=" '$(DisableProtobufDesignTimeBuild)' != 'true' " >
+    <!-- Add Protobuf items to Content if they are not added yet -->
+    <UnaddedProtobufContent Include="@(Protobuf)" Exclude="@(Content)" />
+    <Content Include="@(UnaddedProtobufContent)" />
+
+    <!-- Remove Protobuf items from None -->
+    <None Remove="@(Protobuf)" />
+
+    <!-- Add Generator attribute to trigger Protobuf compilation -->
+    <Protobuf Update="@(Protobuf)" >
+      <Generator>MSBuild:Compile</Generator>
+    </Protobuf>
+  </ItemGroup>
+
   <PropertyGroup>
     <!-- NET SDK: by default, do not include proto files in the directory.
          Current Microsoft's recommendation is against globbing:

From 770be3d76bdc114f1ebc8c972478a92a55f9cdbe Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 5 Apr 2019 19:59:14 -0700
Subject: [PATCH 2/8] Use ItemDefinitionGroup to define generator

---
 .../build/_protobuf/Google.Protobuf.Tools.targets           | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
index de2f66e5be1..d1597872dab 100644
--- a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
+++ b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
@@ -28,6 +28,7 @@
       <ProtoRoot Condition="'%(Protobuf.ProtoRoot)' == '' " />
       <CompileOutputs Condition="'%(Protobuf.CompileOutputs)' == ''">True</CompileOutputs>
       <OutputDir Condition="'%(Protobuf.OutputDir)' == '' ">$(Protobuf_OutputPath)</OutputDir>
+      <Generator Condition=" '$(DisableProtobufDesignTimeBuild)' != 'true' " >MSBuild:Compile</Generator>
     </Protobuf>
   </ItemDefinitionGroup>
 
@@ -46,11 +47,6 @@
 
     <!-- Remove Protobuf items from None -->
     <None Remove="@(Protobuf)" />
-
-    <!-- Add Generator attribute to trigger Protobuf compilation -->
-    <Protobuf Update="@(Protobuf)" >
-      <Generator>MSBuild:Compile</Generator>
-    </Protobuf>
   </ItemGroup>
 
   <PropertyGroup>

From d116f58e8e0aa376ce1e8fc1147aa1a1780c09d0 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Mon, 8 Apr 2019 11:19:57 -0700
Subject: [PATCH 3/8] Remove fix for bug in project system

---
 .../build/_protobuf/Google.Protobuf.Tools.targets      | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
index d1597872dab..80c7109e016 100644
--- a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
+++ b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
@@ -39,16 +39,6 @@
     <AvailableItemName Include="Protobuf" />
   </ItemGroup>
 
-  <!-- Design Time Build integration for Visual Studio -->
-  <ItemGroup Condition=" '$(DisableProtobufDesignTimeBuild)' != 'true' " >
-    <!-- Add Protobuf items to Content if they are not added yet -->
-    <UnaddedProtobufContent Include="@(Protobuf)" Exclude="@(Content)" />
-    <Content Include="@(UnaddedProtobufContent)" />
-
-    <!-- Remove Protobuf items from None -->
-    <None Remove="@(Protobuf)" />
-  </ItemGroup>
-
   <PropertyGroup>
     <!-- NET SDK: by default, do not include proto files in the directory.
          Current Microsoft's recommendation is against globbing:

From e5fb24f5020b69db38f8079f526772be92b052c7 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Mon, 8 Apr 2019 18:41:14 -0700
Subject: [PATCH 4/8] Feedback

---
 .../Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
index 80c7109e016..b1030ba1f8b 100644
--- a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
+++ b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
@@ -28,7 +28,7 @@
       <ProtoRoot Condition="'%(Protobuf.ProtoRoot)' == '' " />
       <CompileOutputs Condition="'%(Protobuf.CompileOutputs)' == ''">True</CompileOutputs>
       <OutputDir Condition="'%(Protobuf.OutputDir)' == '' ">$(Protobuf_OutputPath)</OutputDir>
-      <Generator Condition=" '$(DisableProtobufDesignTimeBuild)' != 'true' " >MSBuild:Compile</Generator>
+      <Generator Condition="'%(Protobuf.Generator)' == '' and '$(DisableProtobufDesignTimeBuild)' != 'true' " >MSBuild:Compile</Generator>
     </Protobuf>
   </ItemDefinitionGroup>
 

From 47921d6e544fc998ee6f1a3caeccb3061f5c62e6 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 23 Apr 2019 18:09:15 -0700
Subject: [PATCH 5/8] Workaround a different CPS bug

---
 .../build/_protobuf/Google.Protobuf.Tools.targets        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
index b1030ba1f8b..befff4d41c0 100644
--- a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
+++ b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
@@ -39,6 +39,15 @@
     <AvailableItemName Include="Protobuf" />
   </ItemGroup>
 
+  <!-- Workaround for VS Project System bug: -->
+  <!-- Duplicated items in None itemgroup without Generator attribute prevents the items -->
+  <!-- in Protobuf itemgroup with Generator attribute from triggering design time build. -->
+  <!-- https://devdiv.visualstudio.com/DevDiv/_workitems/edit/849161?src=WorkItemMention&src-action=artifact_link -->
+  <ItemGroup Condition=" '$(DisableProtobufDesignTimeBuild)' != 'true' " >
+    <!-- Working around this by removing the duplicated items from None itemgroup. -->
+    <None Remove="@(Protobuf)" />
+  </ItemGroup>
+
   <PropertyGroup>
     <!-- NET SDK: by default, do not include proto files in the directory.
          Current Microsoft's recommendation is against globbing:

From a2421cdeb169f9cb1947cb95924f21424b91e91c Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Wed, 24 Apr 2019 19:06:32 -0700
Subject: [PATCH 6/8] Remove internal link

---
 .../Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
index befff4d41c0..784f789528e 100644
--- a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
+++ b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
@@ -42,7 +42,6 @@
   <!-- Workaround for VS Project System bug: -->
   <!-- Duplicated items in None itemgroup without Generator attribute prevents the items -->
   <!-- in Protobuf itemgroup with Generator attribute from triggering design time build. -->
-  <!-- https://devdiv.visualstudio.com/DevDiv/_workitems/edit/849161?src=WorkItemMention&src-action=artifact_link -->
   <ItemGroup Condition=" '$(DisableProtobufDesignTimeBuild)' != 'true' " >
     <!-- Working around this by removing the duplicated items from None itemgroup. -->
     <None Remove="@(Protobuf)" />

From d74f04680f94b22982103cdddd9f6e7e76783d47 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 30 Apr 2019 15:04:11 -0700
Subject: [PATCH 7/8] Restrict workaround to MSBuild 15.0 and above

---
 .../build/_protobuf/Google.Protobuf.Tools.targets        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
index 784f789528e..b3fd02d4faa 100644
--- a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
+++ b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
@@ -40,10 +40,11 @@
   </ItemGroup>
 
   <!-- Workaround for VS Project System bug: -->
-  <!-- Duplicated items in None itemgroup without Generator attribute prevents the items -->
-  <!-- in Protobuf itemgroup with Generator attribute from triggering design time build. -->
-  <ItemGroup Condition=" '$(DisableProtobufDesignTimeBuild)' != 'true' " >
-    <!-- Working around this by removing the duplicated items from None itemgroup. -->
+  <!-- Duplicated items in None itemgroup without Generator attribute prevents the items in Protobuf -->
+  <!-- itemgroup with Generator attribute from triggering design time build. Working around this by -->
+  <!-- removing the duplicated items from None itemgroup. The Remove attribute was introduced -->
+  <!-- in the .NET Framework 3.5, but was only supported inside targets until MSBuild 15.0. -->
+  <ItemGroup Condition=" '$(MSBuildVersion)' &gt;= '15.0' and '$(DisableProtobufDesignTimeBuild)' != 'true' " >
     <None Remove="@(Protobuf)" />
   </ItemGroup>
 

From 57c4877352b00fd4c86e557d7ab3f3d523240774 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Sat, 4 May 2019 22:29:08 -0700
Subject: [PATCH 8/8] Remove non-compatible workaround

Will add this to Grpc.AspNetCore.Server instead
---
 .../build/_protobuf/Google.Protobuf.Tools.targets        | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
index b3fd02d4faa..b1030ba1f8b 100644
--- a/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
+++ b/src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
@@ -39,15 +39,6 @@
     <AvailableItemName Include="Protobuf" />
   </ItemGroup>
 
-  <!-- Workaround for VS Project System bug: -->
-  <!-- Duplicated items in None itemgroup without Generator attribute prevents the items in Protobuf -->
-  <!-- itemgroup with Generator attribute from triggering design time build. Working around this by -->
-  <!-- removing the duplicated items from None itemgroup. The Remove attribute was introduced -->
-  <!-- in the .NET Framework 3.5, but was only supported inside targets until MSBuild 15.0. -->
-  <ItemGroup Condition=" '$(MSBuildVersion)' &gt;= '15.0' and '$(DisableProtobufDesignTimeBuild)' != 'true' " >
-    <None Remove="@(Protobuf)" />
-  </ItemGroup>
-
   <PropertyGroup>
     <!-- NET SDK: by default, do not include proto files in the directory.
          Current Microsoft's recommendation is against globbing: