Fix IMissingServiceDiagnosticsService descriptor and ServiceMoniker serialization

The descriptor for `IMissingServiceDiagnosticsService` was evidently always broken, because is used MessagePack-CSharp and `MissingServiceAnalysis` was not annotated with `[MessagePackObject]`.
The fix then is to just switch to Nerdbank.MessagePack, which doesn't require the attributes.

Also `ServiceMoniker` was dropping its `Version` property when serialized with Nerdbank.MessagePack on account of PolyType not seeing the constructor that could initialize the property.

Author: AArnott

src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.cs

@@ -11,6 +11,7 @@
 using Nerdbank.Streams;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Utilities.ServiceBroker;
 
@@ -99,10 +100,12 @@ protected GlobalBrokeredServiceContainer(ImmutableDictionary<ServiceMoniker, Ser
 	/// Gets a descriptor for the service that can diagnose the cause of a missing brokered service.
 	/// Use <see cref="IMissingServiceDiagnosticsService"/> to interact with this service.
 	/// </summary>
-	public static ServiceRpcDescriptor MissingServiceDiagnostics { get; } = new ServiceJsonRpcDescriptor(
+	public static ServiceRpcDescriptor MissingServiceDiagnostics { get; } = new ServiceJsonRpcPolyTypeDescriptor(
 		new ServiceMoniker("Microsoft.VisualStudio.GlobalBrokeredServiceContainer.MissingServiceDiagnostics", new Version(1, 0)),
-		ServiceJsonRpcDescriptor.Formatters.MessagePack,
-		ServiceJsonRpcDescriptor.MessageDelimiters.BigEndianInt32LengthHeader);
+		ServiceJsonRpcPolyTypeDescriptor.Formatters.NerdbankMessagePack,
+		ServiceJsonRpcPolyTypeDescriptor.MessageDelimiters.BigEndianInt32LengthHeader,
+		PolyType.SourceGenerator.TypeShapeProvider_Microsoft_ServiceHub_Framework.Default)
+		.WithRpcTargetMetadata(RpcTargetMetadata.FromShape(PolyType.SourceGenerator.TypeShapeProvider_Microsoft_ServiceHub_Framework.Default.IMissingServiceDiagnosticsService));
 
 	/// <inheritdoc />
 	public abstract IReadOnlyDictionary<string, string> LocalUserCredentials { get; }

src/Microsoft.ServiceHub.Framework/Container/MissingServiceAnalysis.cs

@@ -15,7 +15,7 @@ public class MissingServiceAnalysis
 	/// </summary>
 	/// <param name="errorCode">The error code explaining why the service could not be obtained.</param>
 	/// <param name="expectedSource">The source that the service was expected to come from.</param>
-	internal MissingServiceAnalysis(MissingBrokeredServiceErrorCode errorCode, ServiceSource? expectedSource)
+	public MissingServiceAnalysis(MissingBrokeredServiceErrorCode errorCode, ServiceSource? expectedSource)
 	{
 		this.ErrorCode = errorCode;
 		this.ExpectedSource = expectedSource;

src/Microsoft.ServiceHub.Framework/ServiceMoniker.cs

@@ -3,7 +3,6 @@
 
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Runtime.Serialization;
 using JsonNET = Newtonsoft.Json;
@@ -38,6 +37,7 @@ public ServiceMoniker(string name)
 	/// <param name="version">The version of the service or expected by the client. May be null.</param>
 	[JsonNET.JsonConstructor]
 	[STJ.JsonConstructor]
+	[PolyType.ConstructorShape]
 	public ServiceMoniker(string name, Version? version)
 		: this(name)
 	{

test/Microsoft.ServiceHub.Framework.Tests/MissingServiceDiagnosticsTests.cs

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.ServiceHub.Framework;
+using Microsoft.VisualStudio.Utilities.ServiceBroker;
+
+public class MissingServiceDiagnosticsTests : RpcTestBase<IMissingServiceDiagnosticsService, MockMissingServiceDiagnosticsService>
+{
+	public MissingServiceDiagnosticsTests(ITestOutputHelper logger)
+		: base(logger, GlobalBrokeredServiceContainer.MissingServiceDiagnostics)
+	{
+	}
+
+	[Fact]
+	public async Task RpcTest()
+	{
+		ServiceMoniker expectedMoniker = new("Test.MissingService", new Version(15, 0));
+
+		MissingServiceAnalysis result = await this.ClientProxy.AnalyzeMissingServiceAsync(expectedMoniker, TestContext.Current.CancellationToken);
+
+		// Verify result was serialized properly.
+		Assert.Equal(ServiceSource.TrustedServer, result.ExpectedSource);
+		Assert.Equal(MissingBrokeredServiceErrorCode.NotLocallyRegistered, result.ErrorCode);
+
+		// Verify the parameter was serialized properly.
+		Assert.Equal(expectedMoniker, this.Service.LastReceivedMoniker);
+	}
+}

test/Microsoft.ServiceHub.Framework.Tests/Mocks/MockMissingServiceDiagnosticsService.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.ServiceHub.Framework;
+using Microsoft.VisualStudio.Utilities.ServiceBroker;
+
+public class MockMissingServiceDiagnosticsService : IMissingServiceDiagnosticsService
+{
+	internal ServiceMoniker? LastReceivedMoniker { get; set; }
+
+	public Task<MissingServiceAnalysis> AnalyzeMissingServiceAsync(ServiceMoniker missingServiceMoniker, CancellationToken cancellationToken)
+	{
+		this.LastReceivedMoniker = missingServiceMoniker;
+		return Task.FromResult(new MissingServiceAnalysis(MissingBrokeredServiceErrorCode.NotLocallyRegistered, ServiceSource.TrustedServer));
+	}
+}