Skip to content

Commit ab82ecc

Browse files
committed
misc: fix warnings after bump to .NET 10
1 parent bc5a1a7 commit ab82ecc

5 files changed

Lines changed: 5 additions & 63 deletions

File tree

Bleatingsheep.NewHydrant/Core/Hydrant.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ internal static string GetServiceName(object? hit)
260260
private void LogException(string name, string? message, Exception e)
261261
{
262262
var logger = _logFactory?.GetLogger(name) ?? LogManager.CreateNullLogger();
263-
logger.Warn(e, message);
263+
logger.Warn(e, message ?? string.Empty);
264264
}
265265

266266
#region Create Service Instance

Bleatingsheep.OsuApiClient/OsuApiClient.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,14 @@ public async Task<PlayRecord[]> GetRecentlyAsync(string username, Osu.Mode mode,
141141
#endregion
142142

143143
#region Utils
144-
private readonly ThreadSafeRandom _threadSafeRandom = new ThreadSafeRandom();
145-
146144
private async Task<T[]> SafeGetArrayAsync<T>(string url, params (string key, string value)[] ps)
147145
{
148146
// TODO: 增加访问数限制。
149147

150148
// Exponential backoff 指数退避
151149
return await Policy
152150
.HandleResult((T[])null)
153-
.WaitAndRetryAsync(2, t => TimeSpan.FromMilliseconds(_threadSafeRandom.Next(75 << (t - 1)) + 1))
151+
.WaitAndRetryAsync(2, t => TimeSpan.FromMilliseconds(Random.Shared.Next(75 << (t - 1)) + 1))
154152
.ExecuteAsync(() => HttpMethods.GetJsonArrayDeserializeAsync<T>(url, ps))
155153
.ConfigureAwait(false);
156154
}

Bleatingsheep.OsuApiClient/OsuApiFailedException.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
namespace Bleatingsheep.OsuMixedApi
44
{
5-
[Serializable]
65
public class OsuApiFailedException : Exception
76
{
87
public OsuApiFailedException() { }
98
public OsuApiFailedException(string message) : base(message) { }
109
public OsuApiFailedException(string message, Exception inner) : base(message, inner) { }
11-
protected OsuApiFailedException(
12-
System.Runtime.Serialization.SerializationInfo info,
13-
System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
1410
}
1511
}

Bleatingsheep.OsuApiClient/ThreadSafeRandom.cs

Lines changed: 0 additions & 52 deletions
This file was deleted.

NewHydrantApi/Startup.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ public void ConfigureServices(IServiceCollection services)
7676
// add prefixes to known networks.
7777
foreach (IPAddress ip in knownPrefixes)
7878
{
79-
options.KnownNetworks.Add(new IPNetwork(ip, 64));
79+
options.KnownIPNetworks.Add(new System.Net.IPNetwork(ip, 64));
8080
}
8181

82-
options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("172.16.0.0"), 12)); // dockerr internal
82+
options.KnownIPNetworks.Add(new System.Net.IPNetwork(IPAddress.Parse("172.16.0.0"), 12)); // docker internal
8383
options.ForwardLimit = 1;
8484
options.ForwardedHeaders = ForwardedHeaders.All;
8585
});
@@ -99,7 +99,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
9999
// Enable middleware to serve generated Swagger as a JSON endpoint.
100100
app.UseSwagger();
101101

102-
// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
102+
// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
103103
// specifying the Swagger JSON endpoint.
104104
app.UseSwaggerUI(c =>
105105
{

0 commit comments

Comments
 (0)