Bump Nerdbank.MessagePack to 0.10.89-rc (#1324)

Author: AArnott

Directory.Packages.props

@@ -27,10 +27,9 @@
     <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.10.63-rc" />
+    <PackageVersion Include="Nerdbank.MessagePack" Version="0.10.89-rc" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.13.16" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="PolyType" Version="1.0.0-rc.5" />
     <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
     <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />

src/StreamJsonRpc/NerdbankMessagePackFormatter.cs

@@ -1242,20 +1242,28 @@ protected internal override void SetExpectedDataType(Type dataType)
         }
     }
 
-    private class ConverterFactory : IMessagePackConverterFactory
+    private class ConverterFactory : IMessagePackConverterFactory, ITypeShapeFunc
     {
         internal static readonly ConverterFactory Instance = new();
 
         private ConverterFactory()
         {
         }
 
-        public MessagePackConverter<T>? CreateConverter<T>(ITypeShape<T> shape)
-            => MessageFormatterProgressTracker.CanDeserialize(typeof(T)) || MessageFormatterProgressTracker.CanSerialize(typeof(T)) ? new ProgressConverter<T>() :
-               TrackerHelpers.IsIAsyncEnumerable(typeof(T)) ? ActivateAssociatedType<MessagePackConverter<T>>(shape, typeof(AsyncEnumerableConverter<>)) :
-               TrackerHelpers.FindIAsyncEnumerableInterfaceImplementedBy(typeof(T)) is Type iface ? ActivateAssociatedType<MessagePackConverter<T>>(shape, typeof(AsyncEnumerableConverter<>)) :
+        public MessagePackConverter? CreateConverter(ITypeShape shape)
+            => MessageFormatterProgressTracker.CanDeserialize(shape.Type) || MessageFormatterProgressTracker.CanSerialize(shape.Type) ||
+               TrackerHelpers.IsIAsyncEnumerable(shape.Type) ||
+               TrackerHelpers.FindIAsyncEnumerableInterfaceImplementedBy(shape.Type) is Type ||
+               MessageFormatterRpcMarshaledContextTracker.TryGetMarshalOptionsForType(shape, DefaultRpcMarshalableProxyOptions, out JsonRpcProxyOptions? proxyOptions, out JsonRpcTargetOptions? targetOptions, out RpcMarshalableAttribute? attribute) ||
+               typeof(Exception).IsAssignableFrom(shape.Type)
+               ? this.Invoke(shape) : null;
+
+        object? ITypeShapeFunc.Invoke<T>(ITypeShape<T> shape, object? state)
+            => MessageFormatterProgressTracker.CanDeserialize(shape.Type) || MessageFormatterProgressTracker.CanSerialize(shape.Type) ? new ProgressConverter<T>() :
+               TrackerHelpers.IsIAsyncEnumerable(shape.Type) ? ActivateAssociatedType<MessagePackConverter<T>>(shape, typeof(AsyncEnumerableConverter<>)) :
+               TrackerHelpers.FindIAsyncEnumerableInterfaceImplementedBy(shape.Type) is Type iface ? ActivateAssociatedType<MessagePackConverter<T>>(shape, typeof(AsyncEnumerableConverter<>)) :
                MessageFormatterRpcMarshaledContextTracker.TryGetMarshalOptionsForType(shape, DefaultRpcMarshalableProxyOptions, out JsonRpcProxyOptions? proxyOptions, out JsonRpcTargetOptions? targetOptions, out RpcMarshalableAttribute? attribute) ? new RpcMarshalableConverter<T>(shape, proxyOptions, targetOptions, attribute) :
-               typeof(Exception).IsAssignableFrom(typeof(T)) ? new ExceptionConverter<T>() :
+               typeof(Exception).IsAssignableFrom(shape.Type) ? new ExceptionConverter<T>() :
                null;
     }
 

src/StreamJsonRpc/Reflection/MessageFormatterRpcMarshaledContextTracker.cs

@@ -96,8 +96,8 @@ private enum MarshalMode
         MarshallingRealObject = 1,
     }
 
-    internal static bool TryGetMarshalOptionsForType<T>(
-        ITypeShape<T> typeShape,
+    internal static bool TryGetMarshalOptionsForType(
+        ITypeShape typeShape,
         JsonRpcProxyOptions defaultProxyOptions,
         [NotNullWhen(true)] out JsonRpcProxyOptions? proxyOptions,
         [NotNullWhen(true)] out JsonRpcTargetOptions? targetOptions,