Skip to content

Commit e061cc0

Browse files
committed
Revert "R#: Move inline suppressions for AccessToDisposedClosure in tests to .editorconfig (#1682)"
Reverting because this breaks the R# formatting engine. By reading R# settings from .editorconfig (which takes precedence over .DotSettings), many R# rule severities are lowered or turned off entirely. The lowered severities in .editorconfig exist as a fallback for other IDEs only. The removal of the `public` modifier on IDiscoveryClient.InstancesFetched` is not reverted by this commit.
1 parent e79fcfa commit e061cc0

41 files changed

Lines changed: 62 additions & 6 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,3 @@ dotnet_diagnostic.JSON002.severity = silent
162162

163163
# CA1848: Use the LoggerMessage delegates (depends on https://github.com/SteeltoeOSS/Steeltoe/issues/969)
164164
dotnet_diagnostic.CA1848.severity = silent
165-
166-
[*Test.cs]
167-
resharper_access_to_disposed_closure_highlighting = none
168-
resharper_access_to_modified_closure_highlighting = none

src/Common/test/Hosting.Test/HostBuilderWrapperTest.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public async Task WebApplicationBuilder_Wraps()
2929
HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder);
3030
wrapper.ConfigureServices(services => services.AddSingleton<InjectableType>());
3131
wrapper.ConfigureAppConfiguration(configurationBuilder => configurationBuilder.AddInMemoryCollection(appSettings));
32+
// ReSharper disable once AccessToDisposedClosure
3233
wrapper.ConfigureLogging(loggingBuilder => loggingBuilder.AddProvider(capturingLoggerProvider));
3334
wrapper.ConfigureWebHost(hostBuilder => hostBuilder.UseUrls("http://*:8888"));
3435
wrapper.ConfigureServices((contextWrapper, _) => contextWrapper.HostEnvironment.ApplicationName = "TestApp");
@@ -64,6 +65,7 @@ public void HostApplicationBuilder_Wraps()
6465
HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder);
6566
wrapper.ConfigureServices(services => services.AddSingleton<InjectableType>());
6667
wrapper.ConfigureAppConfiguration(configurationBuilder => configurationBuilder.AddInMemoryCollection(appSettings));
68+
// ReSharper disable once AccessToDisposedClosure
6769
wrapper.ConfigureLogging(loggingBuilder => loggingBuilder.AddProvider(capturingLoggerProvider));
6870
wrapper.ConfigureServices((contextWrapper, _) => contextWrapper.HostEnvironment.ApplicationName = "TestApp");
6971

@@ -98,6 +100,7 @@ public void WebHostBuilder_Wraps()
98100
HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder);
99101
wrapper.ConfigureServices(services => services.AddSingleton<InjectableType>());
100102
wrapper.ConfigureAppConfiguration(configurationBuilder => configurationBuilder.AddInMemoryCollection(appSettings));
103+
// ReSharper disable once AccessToDisposedClosure
101104
wrapper.ConfigureLogging(loggingBuilder => loggingBuilder.AddProvider(capturingLoggerProvider));
102105
wrapper.ConfigureWebHost(hostBuilder => hostBuilder.UseUrls("http://*:8888"));
103106
wrapper.ConfigureServices((contextWrapper, _) => contextWrapper.HostEnvironment.ApplicationName = "TestApp");
@@ -135,6 +138,7 @@ public void GenericHostBuilder_Wraps()
135138
HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder);
136139
wrapper.ConfigureServices(services => services.AddSingleton<InjectableType>());
137140
wrapper.ConfigureAppConfiguration(configurationBuilder => configurationBuilder.AddInMemoryCollection(appSettings));
141+
// ReSharper disable once AccessToDisposedClosure
138142
wrapper.ConfigureLogging(loggingBuilder => loggingBuilder.AddProvider(capturingLoggerProvider));
139143
wrapper.ConfigureWebHost(hostBuilder => hostBuilder.UseUrls("http://*:8888"));
140144
wrapper.ConfigureServices((contextWrapper, _) => contextWrapper.HostEnvironment.ApplicationName = "TestApp");

src/Common/test/Logging.Test/BootstrapperLoggerFactoryTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public async Task Upgrades_existing_loggers()
2020
var bootstrapLoggerFactory = BootstrapLoggerFactory.CreateEmpty(loggingBuilder =>
2121
{
2222
loggingBuilder.SetMinimumLevel(LogLevel.Trace);
23+
// ReSharper disable once AccessToDisposedClosure
2324
loggingBuilder.AddProvider(capturingLoggerProvider);
2425
});
2526

src/Configuration/test/CloudFoundry.Test/CloudfoundryConfigurationProviderTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ public void Load_VCAP_APPLICATION_Allows_Reload_Without_Throwing_Exception()
216216

217217
_ = Task.Run(() =>
218218
{
219+
// ReSharper disable once AccessToDisposedClosure
219220
while (!tokenSource.IsCancellationRequested)
220221
{
221222
configurationRoot.Reload();

src/Configuration/test/ConfigServer.Discovery.Test/ConfigServerClientOptionsTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public void Config_Server_URI_is_resolved_from_discovery_and_survives_changes_in
9090

9191
var configurationBuilder = new ConfigurationBuilder();
9292
configurationBuilder.AddInMemoryAppSettingsJsonFile(fileProvider);
93+
// ReSharper disable once AccessToDisposedClosure
9394
configurationBuilder.AddConfigServer(new ConfigServerClientOptions(), configureOptions, () => handler, NullLoggerFactory.Instance);
9495
IConfigurationRoot configuration = configurationBuilder.Build();
9596

@@ -305,6 +306,7 @@ public void Updates_discovered_Config_Server_URI_on_provider_reload()
305306

306307
var configurationBuilder = new ConfigurationBuilder();
307308
configurationBuilder.AddInMemoryAppSettingsJsonFile(fileProvider);
309+
// ReSharper disable once AccessToDisposedClosure
308310
configurationBuilder.AddConfigServer(new ConfigServerClientOptions(), configureOptions, () => handler, NullLoggerFactory.Instance);
309311
IConfigurationRoot configuration = configurationBuilder.Build();
310312

src/Configuration/test/ConfigServer.Test/ConfigServerClientOptionsTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ public void Certificate_configuration_survives_options_reload()
265265

266266
var configurationBuilder = new ConfigurationBuilder();
267267
configurationBuilder.AddInMemoryAppSettingsJsonFile(fileProvider);
268+
// ReSharper disable once AccessToDisposedClosure
268269
configurationBuilder.AddConfigServer(new ConfigServerClientOptions(), null, () => handler, NullLoggerFactory.Instance);
269270
IConfigurationRoot configuration = configurationBuilder.Build();
270271

@@ -367,6 +368,7 @@ public void Changes_in_IConfiguration_update_provider_options_and_injected_optio
367368
var configurationBuilder = new ConfigurationBuilder();
368369
configurationBuilder.AddInMemoryAppSettingsJsonFile(fileProvider);
369370
configurationBuilder.AddPlaceholderResolver();
371+
// ReSharper disable once AccessToDisposedClosure
370372
configurationBuilder.AddConfigServer(defaultOptions, configureOptions, () => handler, NullLoggerFactory.Instance);
371373
IConfigurationRoot configuration = configurationBuilder.Build();
372374

src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.Settings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
using Microsoft.Extensions.Configuration;
88
using Microsoft.Extensions.Logging.Abstractions;
99

10-
// ReSharper disable AccessToDisposedClosure
11-
1210
namespace Steeltoe.Configuration.ConfigServer.Test;
1311

1412
public sealed partial class ConfigServerConfigurationProviderTest
@@ -67,7 +65,9 @@ public void GetConfigServerUri_NoBaseUri_Throws()
6765

6866
using var provider = new ConfigServerConfigurationProvider(options, null, null, null, NullLoggerFactory.Instance);
6967

68+
// ReSharper disable AccessToDisposedClosure
7069
Action action = () => provider.BuildConfigServerUri(provider.ClientOptions, null!, null);
70+
// ReSharper restore AccessToDisposedClosure
7171

7272
action.Should().ThrowExactly<ArgumentNullException>();
7373
}

src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ public async Task GetRequestMessage_AddsBearerToken_WhenAccessTokenUriIsSet()
264264
}
265265
""");
266266

267+
// ReSharper disable once AccessToDisposedClosure
267268
using var provider = new ConfigServerConfigurationProvider(options, null, null, () => handler, NullLoggerFactory.Instance);
268269

269270
Uri requestUri = provider.BuildConfigServerUri(provider.ClientOptions, new Uri(options.Uri), null);
@@ -293,6 +294,7 @@ public async Task RefreshVaultToken_Succeeds()
293294
handler.Mock.Expect(HttpMethod.Post, "http://localhost:8888/vault/v1/auth/token/renew-self").WithHeaders("X-Vault-Token", "MyVaultToken")
294295
.WithContent("{\"increment\":300}").Respond(HttpStatusCode.NoContent);
295296

297+
// ReSharper disable once AccessToDisposedClosure
296298
using var provider = new ConfigServerConfigurationProvider(options, null, null, () => handler, NullLoggerFactory.Instance);
297299
provider.Load();
298300

@@ -322,6 +324,7 @@ public async Task RefreshVaultToken_With_AccessTokenUri_Succeeds()
322324
handler.Mock.Expect(HttpMethod.Post, "http://localhost:8888/vault/v1/auth/token/renew-self").WithHeaders("X-Vault-Token", "MyVaultToken")
323325
.WithHeaders("Authorization", "Bearer secret").WithContent("{\"increment\":300}").Respond(HttpStatusCode.NoContent);
324326

327+
// ReSharper disable once AccessToDisposedClosure
325328
using var provider = new ConfigServerConfigurationProvider(options, null, null, () => handler, NullLoggerFactory.Instance);
326329

327330
await provider.RefreshVaultTokenAsync(provider.ClientOptions, TestContext.Current.CancellationToken);

src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbHealthContributorTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ public async Task Canceled_Throws()
116116
using var source = new CancellationTokenSource();
117117
await source.CancelAsync();
118118

119+
// ReSharper disable AccessToDisposedClosure
119120
Func<Task> action = async () => await healthContributor.CheckHealthAsync(source.Token);
121+
// ReSharper restore AccessToDisposedClosure
120122

121123
await action.Should().ThrowExactlyAsync<TaskCanceledException>();
122124
}

src/Connectors/test/Connectors.Test/MongoDb/MongoDbHealthContributorTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public async Task Canceled_Throws()
8686
using var source = new CancellationTokenSource();
8787
await source.CancelAsync();
8888

89+
// ReSharper disable once AccessToDisposedClosure
8990
Func<Task> action = async () => await healthContributor.CheckHealthAsync(source.Token);
9091

9192
await action.Should().ThrowExactlyAsync<OperationCanceledException>();

0 commit comments

Comments
 (0)