Skip to content

Commit ad2f29f

Browse files
[main] Update dependencies from dotnet/efcore dotnet/runtime (#46055)
[main] Update dependencies from dotnet/efcore dotnet/runtime - Fix duplicate event name to resolve build failure - Suppress new SYSLIB1025 warning in HealthChecks. HealthCheckEnd intentionally uses the same Id and Name for these Events. - Fix duplicate event name in RedisLog. - Resolve duplicate EventNames in LoggerMessage attributes in Components.
1 parent 5f3484c commit ad2f29f

File tree

8 files changed

+219
-211
lines changed

8 files changed

+219
-211
lines changed

eng/Version.Details.xml

Lines changed: 138 additions & 138 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 69 additions & 69 deletions
Large diffs are not rendered by default.

src/Components/Server/src/Circuits/CircuitHost.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ public static void BeginInvokeDotNet(ILogger logger, string callId, string assem
794794
}
795795
}
796796

797-
[LoggerMessage(218, LogLevel.Debug, "Failed to invoke static method with identifier '{MethodIdentifier}' on assembly '{Assembly}' with callback id '{CallId}'.", EventName = "BeginInvokeDotNetFailed")]
797+
[LoggerMessage(218, LogLevel.Debug, "Failed to invoke static method with identifier '{MethodIdentifier}' on assembly '{Assembly}' with callback id '{CallId}'.", EventName = "BeginInvokeDotNetStaticFailed")]
798798
private static partial void BeginInvokeDotNetStaticFailed(ILogger logger, string methodIdentifier, string assembly, string callId, Exception exception);
799799

800800
public static void BeginInvokeDotNetFailed(ILogger logger, string callId, string assemblyName, string methodIdentifier, long dotNetObjectId, Exception exception)
@@ -809,7 +809,9 @@ public static void BeginInvokeDotNetFailed(ILogger logger, string callId, string
809809
}
810810
}
811811

812+
#pragma warning disable SYSLIB1025
812813
[LoggerMessage(219, LogLevel.Error, "Location change to '{URI}' in circuit '{CircuitId}' failed.", EventName = "LocationChangeFailed")]
813814
public static partial void LocationChangeFailedInCircuit(ILogger logger, string uri, CircuitId circuitId, Exception exception);
815+
#pragma warning restore SYSLIB1025
814816
}
815817
}

src/Components/Server/src/Circuits/CircuitRegistry.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public static void ExceptionDisposingTokenSource(ILogger logger, Exception excep
411411
[LoggerMessage(114, LogLevel.Error, "Exception handler for {CircuitId} failed.", EventName = "CircuitExceptionHandlerFailed")]
412412
public static partial void CircuitExceptionHandlerFailed(ILogger logger, CircuitId circuitId, Exception exception);
413413

414-
[LoggerMessage(115, LogLevel.Debug, "Reconnect to circuit with id {CircuitId} succeeded.", EventName = "FailedToReconnectToCircuit")]
414+
[LoggerMessage(115, LogLevel.Debug, "Reconnect to circuit with id {CircuitId} succeeded.", EventName = "ReconnectionSucceeded")]
415415
public static partial void ReconnectionSucceeded(ILogger logger, CircuitId circuitId);
416416
}
417417
}

src/Components/Server/src/Circuits/RemoteJSRuntime.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,18 @@ public static partial class Log
199199
[LoggerMessage(2, LogLevel.Debug, "There was an error invoking the static method '[{AssemblyName}]::{MethodIdentifier}' with callback id '{CallbackId}'.", EventName = "InvokeDotNetMethodException")]
200200
private static partial void InvokeStaticDotNetMethodException(ILogger logger, string assemblyName, string methodIdentifier, string? callbackId, Exception exception);
201201

202+
#pragma warning disable SYSLIB1025
202203
[LoggerMessage(4, LogLevel.Debug, "There was an error invoking the instance method '{MethodIdentifier}' on reference '{DotNetObjectReference}' with callback id '{CallbackId}'.", EventName = "InvokeDotNetMethodException")]
203204
private static partial void InvokeInstanceDotNetMethodException(ILogger logger, string methodIdentifier, long dotNetObjectReference, string? callbackId, Exception exception);
205+
#pragma warning restore SYSLIB1025
204206

205207
[LoggerMessage(3, LogLevel.Debug, "Invocation of '[{AssemblyName}]::{MethodIdentifier}' with callback id '{CallbackId}' completed successfully.", EventName = "InvokeDotNetMethodSuccess")]
206208
private static partial void InvokeStaticDotNetMethodSuccess(ILogger<RemoteJSRuntime> logger, string assemblyName, string methodIdentifier, string? callbackId);
207209

210+
#pragma warning disable SYSLIB1025
208211
[LoggerMessage(5, LogLevel.Debug, "Invocation of '{MethodIdentifier}' on reference '{DotNetObjectReference}' with callback id '{CallbackId}' completed successfully.", EventName = "InvokeDotNetMethodSuccess")]
209212
private static partial void InvokeInstanceDotNetMethodSuccess(ILogger<RemoteJSRuntime> logger, string methodIdentifier, long dotNetObjectReference, string? callbackId);
213+
#pragma warning restore SYSLIB1025
210214

211215
internal static void InvokeDotNetMethodException(ILogger logger, in DotNetInvocationInfo invocationInfo, Exception exception)
212216
{

src/HealthChecks/HealthChecks/src/DefaultHealthCheckService.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ public static void HealthCheckProcessingEnd(ILogger logger, HealthStatus status,
218218
private const string HealthCheckEndText = "Health check {HealthCheckName} with status {HealthStatus} completed after {ElapsedMilliseconds}ms with message '{HealthCheckDescription}'";
219219

220220
#pragma warning disable SYSLIB1006
221+
#pragma warning disable SYSLIB1025
221222
[LoggerMessage(EventIds.HealthCheckEndId, LogLevel.Debug, HealthCheckEndText, EventName = EventIds.HealthCheckEndName)]
222223
private static partial void HealthCheckEndHealthy(ILogger logger, string HealthCheckName, HealthStatus HealthStatus, double ElapsedMilliseconds, string? HealthCheckDescription);
223224

@@ -226,6 +227,7 @@ public static void HealthCheckProcessingEnd(ILogger logger, HealthStatus status,
226227

227228
[LoggerMessage(EventIds.HealthCheckEndId, LogLevel.Error, HealthCheckEndText, EventName = EventIds.HealthCheckEndName)]
228229
private static partial void HealthCheckEndUnhealthy(ILogger logger, string HealthCheckName, HealthStatus HealthStatus, double ElapsedMilliseconds, string? HealthCheckDescription, Exception? exception);
230+
#pragma warning restore SYSLIB1025
229231
#pragma warning restore SYSLIB1006
230232

231233
public static void HealthCheckEnd(ILogger logger, HealthCheckRegistration registration, HealthReportEntry entry, TimeSpan duration)

src/Middleware/ResponseCaching/src/LoggerExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ internal static partial class LoggerExtensions
7878
EventName = "ResponseWithUnsuccessfulStatusCodeNotCacheable")]
7979
internal static partial void ResponseWithUnsuccessfulStatusCodeNotCacheable(this ILogger logger, int statusCode);
8080

81-
[LoggerMessage(18, LogLevel.Debug, "The 'IfNoneMatch' header of the request contains a value of *.", EventName = "ExpirationExpiresExceeded")]
81+
[LoggerMessage(18, LogLevel.Debug, "The 'IfNoneMatch' header of the request contains a value of *.", EventName = "NotModifiedIfNoneMatchStar")]
8282
internal static partial void NotModifiedIfNoneMatchStar(this ILogger logger);
8383

8484
[LoggerMessage(19, LogLevel.Debug, "The ETag {ETag} in the 'IfNoneMatch' header matched the ETag of a cached entry.",

src/SignalR/server/StackExchangeRedis/src/Internal/RedisLog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static void ConnectingToEndpoints(ILogger logger, EndPointCollection endp
3737
[LoggerMessage(6, LogLevel.Trace, "Unsubscribing from channel: {Channel}.", EventName = "Unsubscribe")]
3838
public static partial void Unsubscribe(ILogger logger, string channel);
3939

40-
[LoggerMessage(7, LogLevel.Error, "Not connected to Redis.", EventName = "Connected")]
40+
[LoggerMessage(7, LogLevel.Error, "Not connected to Redis.", EventName = "NotConnected")]
4141
public static partial void NotConnected(ILogger logger);
4242

4343
[LoggerMessage(8, LogLevel.Information, "Connection to Redis restored.", EventName = "ConnectionRestored")]

0 commit comments

Comments
 (0)