Skip to content

Commit 5816e69

Browse files
authored
Remove old dotnet-core feed (#2611)
1 parent 147a464 commit 5816e69

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

nuget.config

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<packageSources>
44
<clear />
55
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
6-
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
76
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
87
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
98
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />

test/Grpc.Net.Client.Tests/Balancer/ConnectivityStateTests.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region Copyright notice and license
1+
#region Copyright notice and license
22

33
// Copyright 2019 The gRPC Authors
44
//
@@ -29,6 +29,7 @@
2929
using Grpc.Net.Client.Tests.Infrastructure.Balancer;
3030
using Grpc.Tests.Shared;
3131
using Microsoft.Extensions.DependencyInjection;
32+
using Microsoft.Extensions.Logging;
3233
using NUnit.Framework;
3334

3435
namespace Grpc.Net.Client.Tests.Balancer;
@@ -52,11 +53,13 @@ public async Task ResolverReturnsNoAddresses_CallWithWaitForReady_Wait()
5253
});
5354

5455
var services = new ServiceCollection();
56+
services.AddNUnitLogger();
5557
services.AddSingleton<TestResolver>();
5658
services.AddSingleton<ResolverFactory, TestResolverFactory>();
5759
services.AddSingleton<ISubchannelTransportFactory>(new TestSubchannelTransportFactory());
5860
var serviceProvider = services.BuildServiceProvider();
5961

62+
var logger = serviceProvider.GetRequiredService<ILogger<ConnectivityStateTests>>();
6063
var invoker = HttpClientCallInvokerFactory.Create(testMessageHandler, "test:///localhost", configure: o =>
6164
{
6265
o.Credentials = ChannelCredentials.Insecure;
@@ -72,6 +75,8 @@ public async Task ResolverReturnsNoAddresses_CallWithWaitForReady_Wait()
7275
Assert.IsNull(authority);
7376

7477
var resolver = serviceProvider.GetRequiredService<TestResolver>();
78+
79+
logger.LogInformation("UpdateAddresses");
7580
resolver.UpdateAddresses(new List<BalancerAddress>
7681
{
7782
new BalancerAddress("localhost", 81)

test/Shared/TestResolver.cs

+11-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ namespace Grpc.Tests.Shared;
3232

3333
internal class TestResolver : PollingResolver
3434
{
35+
private readonly object _lock;
3536
private readonly Func<Task>? _onRefreshAsync;
3637
private readonly TaskCompletionSource<object?> _hasResolvedTcs;
3738
private readonly ILogger _logger;
@@ -45,6 +46,7 @@ public TestResolver(ILoggerFactory loggerFactory) : this(loggerFactory, null)
4546

4647
public TestResolver(ILoggerFactory? loggerFactory = null, Func<Task>? onRefreshAsync = null) : base(loggerFactory ?? NullLoggerFactory.Instance)
4748
{
49+
_lock = new object();
4850
_onRefreshAsync = onRefreshAsync;
4951
_hasResolvedTcs = new TaskCompletionSource<object?>(TaskCreationOptions.RunContinuationsAsynchronously);
5052
_logger = (ILogger?)loggerFactory?.CreateLogger<TestResolver>() ?? NullLogger.Instance;
@@ -64,8 +66,11 @@ public void UpdateError(Status status)
6466

6567
public void UpdateResult(ResolverResult result)
6668
{
67-
_result = result;
68-
Listener?.Invoke(result);
69+
lock (_lock)
70+
{
71+
_result = result;
72+
Listener?.Invoke(result);
73+
}
6974
}
7075

7176
protected override async Task ResolveAsync(CancellationToken cancellationToken)
@@ -75,7 +80,10 @@ protected override async Task ResolveAsync(CancellationToken cancellationToken)
7580
await _onRefreshAsync();
7681
}
7782

78-
Listener(_result ?? ResolverResult.ForResult(Array.Empty<BalancerAddress>(), serviceConfig: null, serviceConfigStatus: null));
83+
lock (_lock)
84+
{
85+
Listener(_result ?? ResolverResult.ForResult(Array.Empty<BalancerAddress>(), serviceConfig: null, serviceConfigStatus: null));
86+
}
7987
_hasResolvedTcs.TrySetResult(null);
8088
}
8189
}

0 commit comments

Comments
 (0)