Update gRPC template to use 2.52.0 (dotnet#47214)

Applesauce314 · Mar 16, 2023 · 2745e0b · 2745e0b
1 parent 354efd4
commit 2745e0b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 7 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -257,12 +257,12 @@
     <CommandLineParserVersion>2.3.0</CommandLineParserVersion>
     <FSharpCoreVersion>6.0.0</FSharpCoreVersion>
     <GoogleApiCommonProtosVersion>2.5.0</GoogleApiCommonProtosVersion>
-    <GoogleProtobufVersion>3.21.6</GoogleProtobufVersion>
-    <GrpcAspNetCoreVersion>2.51.0</GrpcAspNetCoreVersion>
-    <GrpcAspNetCoreServerVersion>2.51.0</GrpcAspNetCoreServerVersion>
-    <GrpcAuthVersion>2.51.0</GrpcAuthVersion>
-    <GrpcNetClientVersion>2.51.0</GrpcNetClientVersion>
-    <GrpcToolsVersion>2.51.0</GrpcToolsVersion>
+    <GoogleProtobufVersion>3.22.0</GoogleProtobufVersion>
+    <GrpcAspNetCoreVersion>2.52.0</GrpcAspNetCoreVersion>
+    <GrpcAspNetCoreServerVersion>2.52.0</GrpcAspNetCoreServerVersion>
+    <GrpcAuthVersion>2.52.0</GrpcAuthVersion>
+    <GrpcNetClientVersion>2.52.0</GrpcNetClientVersion>
+    <GrpcToolsVersion>2.52.0</GrpcToolsVersion>
     <DuendeIdentityServerAspNetIdentityVersion>6.0.4</DuendeIdentityServerAspNetIdentityVersion>
     <DuendeIdentityServerEntityFrameworkVersion>6.0.4</DuendeIdentityServerEntityFrameworkVersion>
     <DuendeIdentityServerVersion>6.0.4</DuendeIdentityServerVersion>

diff --git a/src/Grpc/Interop/Directory.Build.props b/src/Grpc/Interop/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+
+  <PropertyGroup>
+    <!-- TODO: Remove when Grpc.Tools on MacOS 11 is fixed. See https://github.com/grpc/grpc/issues/32558 -->
+    <ExcludeFromBuild Condition="'$(TargetOsName)' == 'osx'">true</ExcludeFromBuild>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Grpc/JsonTranscoding/perf/Directory.Build.props b/src/Grpc/JsonTranscoding/perf/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+
+  <PropertyGroup>
+    <!-- TODO: Remove when Grpc.Tools on MacOS 11 is fixed. See https://github.com/grpc/grpc/issues/32558 -->
+    <ExcludeFromBuild Condition="'$(TargetOsName)' == 'osx'">true</ExcludeFromBuild>
+  </PropertyGroup>
+
+</Project>
diff --git a/...icrosoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj b/...icrosoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj
@@ -6,6 +6,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TieredCompilation>false</TieredCompilation>
     <DefineConstants>$(DefineConstants);IS_BENCHMARKS</DefineConstants>
+    <!-- TODO: Remove when Grpc.Tools on MacOS 11 is fixed. See https://github.com/grpc/grpc/issues/32558 -->
+    <SkipMicrobenchmarksValidation>true</SkipMicrobenchmarksValidation>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Grpc/JsonTranscoding/test/Directory.Build.props b/src/Grpc/JsonTranscoding/test/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+
+  <PropertyGroup>
+    <!-- TODO: Remove when Grpc.Tools on MacOS 11 is fixed. See https://github.com/grpc/grpc/issues/32558 -->
+    <ExcludeFromBuild Condition="'$(TargetOsName)' == 'osx'">true</ExcludeFromBuild>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in
@@ -16,7 +16,6 @@
 
   <ItemGroup>
     <PackageReference Include="Grpc.AspNetCore" Version="${GrpcAspNetCoreVersion}" />
-    <PackageReference Include="Google.Protobuf" Version="3.22.0-rc2" />
   </ItemGroup>
 
 </Project>