From 83c34c6c57a7989ed6043f532dfe8eedffc5800f Mon Sep 17 00:00:00 2001
From: Alexander Polcyn <apolcyn@google.com>
Date: Thu, 10 Oct 2024 05:44:02 +0000
Subject: [PATCH 1/3] bump version for 2.67 RC

---
 build/version.props              | 4 ++--
 src/Grpc.Core.Api/VersionInfo.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/version.props b/build/version.props
index 75373120d..db7cbe5c4 100644
--- a/build/version.props
+++ b/build/version.props
@@ -2,13 +2,13 @@
   <PropertyGroup>
 
     <!-- package version of grpc-dotnet -->
-    <GrpcDotnetVersion>2.66.0-dev</GrpcDotnetVersion>
+    <GrpcDotnetVersion>2.67.0-pre1</GrpcDotnetVersion>
 
     <!-- assembly version of grpc-dotnet -->
     <GrpcDotnetAssemblyVersion>2.0.0.0</GrpcDotnetAssemblyVersion>
 
     <!-- file version of all grpc-dotnet -->
-    <GrpcDotnetAssemblyFileVersion>2.66.0.0</GrpcDotnetAssemblyFileVersion>
+    <GrpcDotnetAssemblyFileVersion>2.67.0.0</GrpcDotnetAssemblyFileVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/src/Grpc.Core.Api/VersionInfo.cs b/src/Grpc.Core.Api/VersionInfo.cs
index d4b472b99..5e43f7b8d 100644
--- a/src/Grpc.Core.Api/VersionInfo.cs
+++ b/src/Grpc.Core.Api/VersionInfo.cs
@@ -36,10 +36,10 @@ public static class VersionInfo
     /// <summary>
     /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
     /// </summary>
-    public const string CurrentAssemblyFileVersion = "2.66.0.0";
+    public const string CurrentAssemblyFileVersion = "2.67.0.0";
 
     /// <summary>
     /// Current version of gRPC C#
     /// </summary>
-    public const string CurrentVersion = "2.66.0-dev";
+    public const string CurrentVersion = "2.67.0-pre1";
 }

From 75b55a991d7f83d77cb8e5ba14f90baa049ca149 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Fri, 11 Oct 2024 06:51:57 +0800
Subject: [PATCH 2/3] Fix System.Text.Json vulnerability warning (#2556)

---
 Directory.Packages.props           | 1 +
 src/dotnet-grpc/dotnet-grpc.csproj | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9819d45ec..3e1741614 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -82,6 +82,7 @@
     <PackageVersion Include="System.Memory" Version="4.5.3" />
     <PackageVersion Include="System.Net.Http.WinHttpHandler" Version="8.0.0" />
     <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="6.0.10" />
     <PackageVersion Include="System.Threading.Channels" Version="4.6.0" />
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-grpc/dotnet-grpc.csproj b/src/dotnet-grpc/dotnet-grpc.csproj
index 3b246baeb..c48025ae9 100644
--- a/src/dotnet-grpc/dotnet-grpc.csproj
+++ b/src/dotnet-grpc/dotnet-grpc.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Command line tool for gRPC projects</Description>
     <PackageTags>gRPC RPC CLI</PackageTags>
@@ -26,6 +26,7 @@
     <PackageReference Include="Microsoft.Build.Locator" />
     <PackageReference Include="System.CommandLine.Rendering" />
     <PackageReference Include="System.Security.Principal.Windows" />
+    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Microsoft.Win32.Registry" />
   </ItemGroup>
 

From e0182fe8f7a278948a4767bf9cd4fb48c67b140c Mon Sep 17 00:00:00 2001
From: Alexander Polcyn <apolcyn@google.com>
Date: Wed, 13 Nov 2024 03:50:35 +0000
Subject: [PATCH 3/3] bump to final version

---
 build/version.props              | 2 +-
 src/Grpc.Core.Api/VersionInfo.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/version.props b/build/version.props
index db7cbe5c4..2372e44be 100644
--- a/build/version.props
+++ b/build/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
 
     <!-- package version of grpc-dotnet -->
-    <GrpcDotnetVersion>2.67.0-pre1</GrpcDotnetVersion>
+    <GrpcDotnetVersion>2.67.0</GrpcDotnetVersion>
 
     <!-- assembly version of grpc-dotnet -->
     <GrpcDotnetAssemblyVersion>2.0.0.0</GrpcDotnetAssemblyVersion>
diff --git a/src/Grpc.Core.Api/VersionInfo.cs b/src/Grpc.Core.Api/VersionInfo.cs
index 5e43f7b8d..a49e76e44 100644
--- a/src/Grpc.Core.Api/VersionInfo.cs
+++ b/src/Grpc.Core.Api/VersionInfo.cs
@@ -41,5 +41,5 @@ public static class VersionInfo
     /// <summary>
     /// Current version of gRPC C#
     /// </summary>
-    public const string CurrentVersion = "2.67.0-pre1";
+    public const string CurrentVersion = "2.67.0";
 }