Skip to content

Commit 4594c30

Browse files
authored
Update to ReSharper v2026.1 (#1681)
* Update to R# v2026.1.0.1 * Fix R# warning: Member can be private * Fix R# warning: Type can be internal * Fix R# warning: Type is never used * Fix R# warning: Method return value is never used * Fix R# warning: Captured variable is disposed in the outer scope * Fix R# warning: Convert into method group * Fix R# warning: Use nameof * Fix R# warning: Type is never instantiated * Fix R# warning: Short-lived HttpClient * Fix R# warning: Missing doc-comment on public type * Fix R# warning: auto-property is never used * Fix CA1859: Use concrete types when possible for improved performance * Cleanup sandbox types
1 parent e46e6a5 commit 4594c30

21 files changed

Lines changed: 47 additions & 108 deletions

File tree

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2025.3.3",
6+
"version": "2026.1.0.1",
77
"commands": [
88
"jb"
99
],

src/Common/src/Hosting/HostBuilderWrapper.cs

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ private static void InvokeDeferredActions<TArgument>(IEnumerable<Action<HostBuil
8686
}
8787
}
8888

89-
public HostBuilderWrapper ConfigureServices(Action<IServiceCollection> configureAction)
89+
public void ConfigureServices(Action<IServiceCollection> configureAction)
9090
{
9191
ArgumentNullException.ThrowIfNull(configureAction);
9292

93-
return ConfigureServices((_, services) => configureAction(services));
93+
ConfigureServices((_, services) => configureAction(services));
9494
}
9595

96-
public HostBuilderWrapper ConfigureServices(Action<HostBuilderContextWrapper, IServiceCollection> configureAction)
96+
public void ConfigureServices(Action<HostBuilderContextWrapper, IServiceCollection> configureAction)
9797
{
9898
ArgumentNullException.ThrowIfNull(configureAction);
9999

@@ -106,18 +106,16 @@ public HostBuilderWrapper ConfigureServices(Action<HostBuilderContextWrapper, IS
106106
{
107107
_configureServicesActions.Add(configureAction);
108108
}
109-
110-
return this;
111109
}
112110

113-
public HostBuilderWrapper ConfigureAppConfiguration(Action<IConfigurationBuilder> configureAction)
111+
public void ConfigureAppConfiguration(Action<IConfigurationBuilder> configureAction)
114112
{
115113
ArgumentNullException.ThrowIfNull(configureAction);
116114

117-
return ConfigureAppConfiguration((_, configurationBuilder) => configureAction(configurationBuilder));
115+
ConfigureAppConfiguration((_, configurationBuilder) => configureAction(configurationBuilder));
118116
}
119117

120-
public HostBuilderWrapper ConfigureAppConfiguration(Action<HostBuilderContextWrapper, IConfigurationBuilder> configureAction)
118+
public void ConfigureAppConfiguration(Action<HostBuilderContextWrapper, IConfigurationBuilder> configureAction)
121119
{
122120
ArgumentNullException.ThrowIfNull(configureAction);
123121

@@ -130,18 +128,16 @@ public HostBuilderWrapper ConfigureAppConfiguration(Action<HostBuilderContextWra
130128
{
131129
_configureAppConfigurationActions.Add(configureAction);
132130
}
133-
134-
return this;
135131
}
136132

137-
public HostBuilderWrapper ConfigureLogging(Action<ILoggingBuilder> configureAction)
133+
public void ConfigureLogging(Action<ILoggingBuilder> configureAction)
138134
{
139135
ArgumentNullException.ThrowIfNull(configureAction);
140136

141-
return ConfigureLogging((_, configurationBuilder) => configureAction(configurationBuilder));
137+
ConfigureLogging((_, configurationBuilder) => configureAction(configurationBuilder));
142138
}
143139

144-
public HostBuilderWrapper ConfigureLogging(Action<HostBuilderContextWrapper, ILoggingBuilder> configureAction)
140+
public void ConfigureLogging(Action<HostBuilderContextWrapper, ILoggingBuilder> configureAction)
145141
{
146142
ArgumentNullException.ThrowIfNull(configureAction);
147143

@@ -156,11 +152,9 @@ public HostBuilderWrapper ConfigureLogging(Action<HostBuilderContextWrapper, ILo
156152
_configureServicesActions.Add((contextWrapper, collection) => collection.AddLogging(builder => configureAction(contextWrapper, builder)));
157153
#pragma warning restore S4792 // Configuring loggers is security-sensitive
158154
}
159-
160-
return this;
161155
}
162156

163-
public HostBuilderWrapper ConfigureWebHost(Action<IWebHostBuilder> configureAction)
157+
public void ConfigureWebHost(Action<IWebHostBuilder> configureAction)
164158
{
165159
ArgumentNullException.ThrowIfNull(configureAction);
166160

@@ -184,7 +178,5 @@ public HostBuilderWrapper ConfigureWebHost(Action<IWebHostBuilder> configureActi
184178
{
185179
throw new NotSupportedException($"Unknown host builder type '{_innerBuilder.GetType()}'.");
186180
}
187-
188-
return this;
189181
}
190182
}

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/Common/test/TestResources/EmptyDisposable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Steeltoe.Common.TestResources;
77
/// <summary>
88
/// Implements <see cref="IDisposable" /> without doing anything.
99
/// </summary>
10-
public sealed class EmptyDisposable : IDisposable
10+
internal sealed class EmptyDisposable : IDisposable
1111
{
1212
public static IDisposable Instance { get; } = new EmptyDisposable();
1313

src/Common/test/TestResources/IO/Sandbox.cs

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,13 @@ public Sandbox()
2929
/// <returns>
3030
/// The physical path.
3131
/// </returns>
32-
public string ResolvePath(string path)
32+
private string ResolvePath(string path)
3333
{
3434
ArgumentNullException.ThrowIfNull(path);
3535

3636
return Path.Combine(FullPath, path);
3737
}
3838

39-
/// <summary>
40-
/// Creates a directory at the specified path within the sandbox.
41-
/// </summary>
42-
/// <param name="path">
43-
/// The directory path.
44-
/// </param>
45-
/// <returns>
46-
/// The physical path of the created directory.
47-
/// </returns>
48-
public string CreateDirectory(string path)
49-
{
50-
ArgumentNullException.ThrowIfNull(path);
51-
52-
DirectoryInfo directoryInfo = Directory.CreateDirectory(ResolvePath(path));
53-
return directoryInfo.FullName;
54-
}
55-
5639
/// <summary>
5740
/// Creates a file at the specified path within the sandbox.
5841
/// </summary>

src/Common/test/TestResources/IO/TempDirectory.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,13 @@ namespace Steeltoe.Common.TestResources.IO;
99
/// </summary>
1010
public class TempDirectory : TempPath
1111
{
12-
/// <summary>
13-
/// Initializes a new instance of the <see cref="TempDirectory" /> class.
14-
/// </summary>
15-
public TempDirectory()
16-
: base(string.Empty)
17-
{
18-
}
19-
2012
/// <summary>
2113
/// Initializes a new instance of the <see cref="TempDirectory" /> class.
2214
/// </summary>
2315
/// <param name="prefix">
2416
/// Directory name prefix.
2517
/// </param>
26-
public TempDirectory(string prefix)
18+
protected TempDirectory(string prefix)
2719
: base(prefix)
2820
{
2921
}

src/Common/test/TestResources/IO/TempFile.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@ public TempFile()
1717
{
1818
}
1919

20-
/// <summary>
21-
/// Initializes a new instance of the <see cref="TempFile" /> class.
22-
/// </summary>
23-
/// <param name="prefix">
24-
/// File name prefix.
25-
/// </param>
26-
public TempFile(string prefix)
27-
: base(prefix)
28-
{
29-
}
30-
3120
/// <summary>
3221
/// Creates the temporary file.
3322
/// </summary>

src/Configuration/src/ConfigServer/ConfigServerConfigurationProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ public override void Load()
375375
return await DoLoadAsync(optionsSnapshot, updateDictionary, cancellationToken);
376376
}
377377

378-
internal async Task<ConfigEnvironment?> DoLoadAsync(ConfigServerClientOptions optionsSnapshot, bool updateDictionary, CancellationToken cancellationToken)
378+
private async Task<ConfigEnvironment?> DoLoadAsync(ConfigServerClientOptions optionsSnapshot, bool updateDictionary, CancellationToken cancellationToken)
379379
{
380380
LogFetchingRemoteConfiguration();
381381

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ await TestFailureTracer.CaptureAsync(async tracer =>
787787

788788
using var provider = new ConfigServerConfigurationProvider(options, null, null, () => handler, tracer.LoggerFactory);
789789

790-
Action action = () => provider.Load();
790+
Action action = provider.Load;
791791

792792
action.Should().ThrowExactly<ConfigServerException>();
793793

0 commit comments

Comments
 (0)