Merge pull request #1360 from microsoft/dev/andarno/updateNbMsgPack

AArnott · web-flow · commit eaf2b4cd8e0d · 2025-11-17T10:50:37.000-07:00
Bump Nerdbank.MessagePack to 0.12.4-rc
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -27,7 +27,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Only" Version="$(VisualStudioThreadingVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="$(VisualStudioThreadingVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.13.22" />
-    <PackageVersion Include="Nerdbank.MessagePack" Version="0.11.54-rc" />
+    <PackageVersion Include="Nerdbank.MessagePack" Version="0.12.4-rc" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.13.16" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
diff --git a/src/StreamJsonRpc/RpcTargetMetadata.cs b/src/StreamJsonRpc/RpcTargetMetadata.cs
@@ -496,7 +496,7 @@ private static IReadOnlyList<Type> GetMissingInterfacesFromSet([DynamicallyAcces
         return missing ?? [];
     }
 
-    private static MethodInfo GetMethodInfo(IMethodShape shape) => (MethodInfo)(shape.AttributeProvider ?? throw new ArgumentException(Resources.FormatAttributeProviderRequired($"{shape.DeclaringType.Type.FullName}.{shape.Name}"), nameof(shape)));
+    private static MethodInfo GetMethodInfo(IMethodShape shape) => (MethodInfo)(shape.MethodBase ?? throw new ArgumentException(Resources.FormatAttributeProviderRequired($"{shape.DeclaringType.Type.FullName}.{shape.Name}"), nameof(shape)));
 
     internal struct RpcTargetInterface([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.PublicEvents)] Type iface)
     {

Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ private static IReadOnlyList<Type> GetMissingInterfacesFromSet([DynamicallyAcces`
`496`	`496`	`return missing ?? [];`
`497`	`497`	`}`
`498`	`498`
`499`		`- private static MethodInfo GetMethodInfo(IMethodShape shape) => (MethodInfo)(shape.AttributeProvider ?? throw new ArgumentException(Resources.FormatAttributeProviderRequired($"{shape.DeclaringType.Type.FullName}.{shape.Name}"), nameof(shape)));`
	`499`	`+ private static MethodInfo GetMethodInfo(IMethodShape shape) => (MethodInfo)(shape.MethodBase ?? throw new ArgumentException(Resources.FormatAttributeProviderRequired($"{shape.DeclaringType.Type.FullName}.{shape.Name}"), nameof(shape)));`
`500`	`500`
`501`	`501`	`internal struct RpcTargetInterface([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods \| DynamicallyAccessedMemberTypes.NonPublicMethods \| DynamicallyAccessedMemberTypes.PublicEvents)] Type iface)`
`502`	`502`	`{`