From a2eed32f3cbff0d029aaf800100a7b3837af83e9 Mon Sep 17 00:00:00 2001
From: apolcyn <apolcyn@google.com>
Date: Mon, 21 Oct 2024 21:45:49 -0700
Subject: [PATCH] Bump version for 2.67 RC (#2555)

* bump version for 2.67 RC

* Fix System.Text.Json vulnerability warning (#2556)

* Fix build

---------

Co-authored-by: James Newton-King <james@newtonking.com>
---
 Directory.Packages.props           | 5 +++--
 build/version.props                | 4 ++--
 src/Grpc.Core.Api/VersionInfo.cs   | 4 ++--
 src/dotnet-grpc/dotnet-grpc.csproj | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9819d45ec..9a3224d64 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <MicrosoftAspNetCoreAppPackageVersion>9.0.0-preview.5.24306.11</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreAppPackageVersion>
     <MicrosoftAspNetCoreApp8PackageVersion>8.0.6</MicrosoftAspNetCoreApp8PackageVersion>
     <MicrosoftAspNetCoreApp7PackageVersion>7.0.5</MicrosoftAspNetCoreApp7PackageVersion>
     <MicrosoftAspNetCoreApp6PackageVersion>6.0.33</MicrosoftAspNetCoreApp6PackageVersion>
@@ -9,7 +9,7 @@
     <OpenTelemetryPackageVersion>1.6.0</OpenTelemetryPackageVersion>
     <OpenTelemetryIntergationPackageVersion>1.8.1</OpenTelemetryIntergationPackageVersion>
     <OpenTelemetryGrpcPackageVersion>1.8.0-beta.1</OpenTelemetryGrpcPackageVersion>
-    <MicrosoftExtensionsPackageVersion>9.0.0-preview.5.24306.7</MicrosoftExtensionsPackageVersion>
+    <MicrosoftExtensionsPackageVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsPackageVersion>
     <MicrosoftExtensionsLtsPackageVersion>6.0.0</MicrosoftExtensionsLtsPackageVersion>
   </PropertyGroup>
   <ItemGroup>
@@ -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/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";
 }
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>