Change version to 2.70.0 (#2610)

* Change version to 2.70.0

* Remove old feed

* Fix test

Author: JamesNK

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>

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" />

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";
 }

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);
     }
 }