From 6dbcdcb9db15ba8b99d8dcf4e014e3291be7a0ce Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Thu, 6 Mar 2025 15:36:31 +0800
Subject: [PATCH 1/3] Change version to 2.70.0

---
 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 5cee5042a..e2d36067d 100644
--- a/build/version.props
+++ b/build/version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
 
     <!-- package version of grpc-dotnet -->
-    <GrpcDotnetVersion>2.70.0-pre1</GrpcDotnetVersion>
+    <GrpcDotnetVersion>2.70.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 5db9e5a61..dde8f5781 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.70.0-pre1";
+    public const string CurrentVersion = "2.70.0";
 }

From e284c81b69a0ce12f267f7e47894c583e4a5b0b0 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Fri, 7 Mar 2025 06:17:29 +0800
Subject: [PATCH 2/3] Remove old feed

---
 nuget.config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nuget.config b/nuget.config
index e4d73b867..d5ff7157f 100644
--- a/nuget.config
+++ b/nuget.config
@@ -3,7 +3,6 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />

From 6515442ea7b24c61dc1324b0948a5ec18d9bda1b Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Fri, 7 Mar 2025 07:06:10 +0800
Subject: [PATCH 3/3] Fix test

---
 test/Shared/TestResolver.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/Shared/TestResolver.cs b/test/Shared/TestResolver.cs
index 8136f981b..c6584d219 100644
--- a/test/Shared/TestResolver.cs
+++ b/test/Shared/TestResolver.cs
@@ -32,6 +32,7 @@ namespace Grpc.Tests.Shared;
 
 internal class TestResolver : PollingResolver
 {
+    private readonly object _lock;
     private readonly Func<Task>? _onRefreshAsync;
     private readonly TaskCompletionSource<object?> _hasResolvedTcs;
     private readonly ILogger _logger;
@@ -45,6 +46,7 @@ public TestResolver(ILoggerFactory loggerFactory) : this(loggerFactory, null)
 
     public TestResolver(ILoggerFactory? loggerFactory = null, Func<Task>? onRefreshAsync = null) : base(loggerFactory ?? NullLoggerFactory.Instance)
     {
+        _lock = new object();
         _onRefreshAsync = onRefreshAsync;
         _hasResolvedTcs = new TaskCompletionSource<object?>(TaskCreationOptions.RunContinuationsAsynchronously);
         _logger = (ILogger?)loggerFactory?.CreateLogger<TestResolver>() ?? NullLogger.Instance;
@@ -64,8 +66,11 @@ public void UpdateError(Status status)
 
     public void UpdateResult(ResolverResult result)
     {
-        _result = result;
-        Listener?.Invoke(result);
+        lock (_lock)
+        {
+            _result = result;
+            Listener?.Invoke(result);
+        }
     }
 
     protected override async Task ResolveAsync(CancellationToken cancellationToken)
@@ -75,7 +80,10 @@ protected override async Task ResolveAsync(CancellationToken cancellationToken)
             await _onRefreshAsync();
         }
 
-        Listener(_result ?? ResolverResult.ForResult(Array.Empty<BalancerAddress>(), serviceConfig: null, serviceConfigStatus: null));
+        lock (_lock)
+        {
+            Listener(_result ?? ResolverResult.ForResult(Array.Empty<BalancerAddress>(), serviceConfig: null, serviceConfigStatus: null));
+        }
         _hasResolvedTcs.TrySetResult(null);
     }
 }