Remove RUC/RDC attributes where they are no longer needed

AArnott · AArnott · commit d3424db928f0 · 2025-11-07T16:14:33.000-07:00
diff --git a/src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.ProfferedRemoteServiceBroker.cs b/src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.ProfferedRemoteServiceBroker.cs
@@ -17,13 +17,12 @@ public partial class GlobalBrokeredServiceContainer
 	/// Services a brokered service that is proffered via a <see cref="IRemoteServiceBroker"/>.
 	/// </summary>
 	[DebuggerDisplay("{" + nameof(DebuggerDisplay) + "}")]
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	protected class ProfferedRemoteServiceBroker : IProffered
 	{
 		private readonly GlobalBrokeredServiceContainer container;
 		private readonly AsyncLazy<IServiceBroker> serviceBroker;
 
+		[RequiresUnreferencedCode(Reasons.TypeLoad)]
 		internal ProfferedRemoteServiceBroker(GlobalBrokeredServiceContainer container, IRemoteServiceBroker remoteServiceBroker, MultiplexingStream? multiplexingStream, ServiceSource source, IReadOnlyCollection<ServiceMoniker> serviceMonikers)
 		{
 			this.container = container ?? throw new ArgumentNullException(nameof(container));
diff --git a/src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.ProfferedServiceFactory.cs b/src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.ProfferedServiceFactory.cs
@@ -17,8 +17,7 @@ public abstract partial class GlobalBrokeredServiceContainer
 	/// Services a brokered service that is proffered via an in-proc factory.
 	/// </summary>
 	[DebuggerDisplay("{" + nameof(DebuggerDisplay) + "}")]
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
+	[RequiresUnreferencedCode(Reasons.TypeLoad)]
 	protected class ProfferedServiceFactory : IProffered
 	{
 		private static readonly ProtectedOperation ClientIsOwnerProtectedOperation = WellKnownProtectedOperations.CreateClientIsOwner();
diff --git a/src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.ProfferedViewIntrinsicService.cs b/src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.ProfferedViewIntrinsicService.cs
@@ -30,8 +30,7 @@ public abstract partial class GlobalBrokeredServiceContainer
 	/// Services a brokered service that is proffered via an in-proc factory.
 	/// </summary>
 	[DebuggerDisplay("{" + nameof(DebuggerDisplay) + "}")]
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
+	[RequiresUnreferencedCode(Reasons.TypeLoad)]
 	protected class ProfferedViewIntrinsicService : ProfferedServiceFactory
 	{
 		private readonly ViewIntrinsicBrokeredServiceFactory factory;
diff --git a/src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.View.cs b/src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.View.cs
@@ -17,6 +17,7 @@ public abstract partial class GlobalBrokeredServiceContainer
 	/// A filtered view on the services proffered to a <see cref="GlobalBrokeredServiceContainer"/>, exposed as an <see cref="IServiceBroker"/>.
 	/// </summary>
 	[DebuggerDisplay("{" + nameof(DebuggerDisplay) + "}")]
+	[RequiresUnreferencedCode(Reasons.TypeLoad)]
 	protected class View : IServiceBroker, IRemoteServiceBroker
 	{
 		/// <summary>
diff --git a/src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.cs b/src/Microsoft.ServiceHub.Framework/Container/GlobalBrokeredServiceContainer.cs
@@ -21,8 +21,7 @@ namespace Microsoft.VisualStudio.Utilities.ServiceBroker;
 /// <remarks>
 /// <para>When a service is registered without a version, it doubles as a fallback service when a request for that service name is made but no exact version match can be found.</para>
 /// </remarks>
-[RequiresUnreferencedCode(Reasons.Formatters)]
-[RequiresDynamicCode(Reasons.Formatters)]
+[RequiresUnreferencedCode(Reasons.TypeLoad)]
 public abstract partial class GlobalBrokeredServiceContainer : IBrokeredServiceContainer, IBrokeredServiceContainerInternal, IBrokeredServiceContainerDiagnostics
 {
 	/// <summary>
diff --git a/src/Microsoft.ServiceHub.Framework/Container/IMissingServiceDiagnosticsService.cs b/src/Microsoft.ServiceHub.Framework/Container/IMissingServiceDiagnosticsService.cs
@@ -2,13 +2,17 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Microsoft.ServiceHub.Framework;
+using PolyType;
+using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Utilities.ServiceBroker;
 
 /// <summary>
 /// Provides diagnostics to understand why brokered services are not activatable.
 /// </summary>
-public interface IMissingServiceDiagnosticsService
+[GenerateShape(IncludeMethods = MethodShapeFlags.PublicInstance)]
+[JsonRpcContract]
+public partial interface IMissingServiceDiagnosticsService
 {
 	/// <summary>
 	/// Analyzes possible explanations for why a brokered service could not be acquired.
diff --git a/src/Microsoft.ServiceHub.Framework/Container/ServiceBrokerOfExportedServices.cs b/src/Microsoft.ServiceHub.Framework/Container/ServiceBrokerOfExportedServices.cs
@@ -21,8 +21,6 @@ namespace Microsoft.VisualStudio.Shell.ServiceBroker;
 /// At startup, the IDE should acquire this export and call <see cref="RegisterAndProfferServicesAsync(System.Threading.CancellationToken)"/>
 /// to add MEF exported brokered services to the container.
 /// </remarks>
-[RequiresUnreferencedCode(Reasons.Formatters)]
-[RequiresDynamicCode(Reasons.Formatters)]
 public abstract class ServiceBrokerOfExportedServices : IServiceBroker
 {
 	private static readonly ProtectedOperation ClientIsOwnerProtectedOperation = WellKnownProtectedOperations.CreateClientIsOwner();
@@ -248,8 +246,6 @@ private static ServiceMoniker CreateServiceMoniker(IBrokeredServicesExportMetada
 	/// <param name="serviceActivationOptions">The activation options to use with this service.</param>
 	/// <param name="cancellationToken">A cancellation token.</param>
 	/// <returns>The MEF export representing this sharing boundary.</returns>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	private async ValueTask<Export<ServiceBrokerForExportedBrokeredServices>?> ActivateBrokeredServiceAsync(ServiceMoniker serviceMoniker, IServiceBroker contextualServiceBroker, ServiceActivationOptions serviceActivationOptions, CancellationToken cancellationToken)
 	{
 		Export<ServiceBrokerForExportedBrokeredServices> sb = this.ServiceBrokerFactory.CreateExport();
diff --git a/src/Microsoft.ServiceHub.Framework/DelegatingServiceJsonRpcPolyTypeDescriptor.cs b/src/Microsoft.ServiceHub.Framework/DelegatingServiceJsonRpcPolyTypeDescriptor.cs
@@ -22,8 +22,6 @@ namespace Microsoft.ServiceHub.Framework;
 /// </para>
 /// </remarks>
 [DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
-[RequiresDynamicCode(Reasons.Formatters)]
-[RequiresUnreferencedCode(Reasons.Formatters)]
 public abstract class DelegatingServiceJsonRpcPolyTypeDescriptor : ServiceJsonRpcPolyTypeDescriptor
 {
 	private ServiceJsonRpcPolyTypeDescriptor innerDescriptor;
diff --git a/src/Microsoft.ServiceHub.Framework/Extensions/ServiceManagerReflectionHelpers.cs b/src/Microsoft.ServiceHub.Framework/Extensions/ServiceManagerReflectionHelpers.cs
@@ -25,8 +25,7 @@ internal static class ServiceManagerReflectionHelpers
 	/// This is called via reflection from Microsoft.ServiceHub.HostStub.ServiceManager.GetServiceBrokerFromServiceActivationOptionsAsync so that the
 	/// <see cref="IServiceBroker"/> can be passed directly to the constructor of a ServiceHub service.
 	/// </devremarks>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
+	[RequiresUnreferencedCode(Reasons.TypeLoad)]
 	internal static async Task<IServiceBroker?> GetServiceBrokerAsync(ServiceActivationOptions options, CancellationToken cancellationToken)
 	{
 		string serverPipeName = options.GetServiceBrokerServerPipeName();
@@ -54,8 +53,6 @@ internal static class ServiceManagerReflectionHelpers
 	/// This called via reflection from Microsoft.ServiceHub.HostStub.ServiceManager.GetServiceFactoryCreateAsyncArguments so that an
 	/// <see cref="AuthorizationServiceClient"/> can be passed directly to the constructor of a ServiceHub service.
 	/// </devremarks>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	internal static Task<AuthorizationServiceClient> GetAuthorizationServiceClientAsync(IServiceBroker broker, CancellationToken cancellationToken) =>
 		Task.FromResult(new AuthorizationServiceClient(new LazyAuthorizationServiceProxy(broker, joinableTaskFactory: null), ownsAuthorizationService: true));
 
diff --git a/src/Microsoft.ServiceHub.Framework/FrameworkServices.cs b/src/Microsoft.ServiceHub.Framework/FrameworkServices.cs
@@ -16,8 +16,6 @@ namespace Microsoft.ServiceHub.Framework;
 /// <summary>
 /// Services and service contracts that provide core infrastructure.
 /// </summary>
-[RequiresUnreferencedCode(Reasons.Formatters)]
-[RequiresDynamicCode(Reasons.Formatters)]
 public static partial class FrameworkServices
 {
 	/// <summary>
@@ -62,8 +60,6 @@ public static partial class FrameworkServices
 	/// A <see cref="ServiceJsonRpcPolyTypeDescriptor"/> derived type that applies camelCase naming transforms to method and event names
 	/// and trims off any trailing "Async" suffix.
 	/// </summary>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	private class CamelCaseTransformingDescriptor : ServiceJsonRpcPolyTypeDescriptor
 	{
 		private const string AsyncSuffix = "Async";
diff --git a/src/Microsoft.ServiceHub.Framework/MultiplexingRelayServiceBroker.cs b/src/Microsoft.ServiceHub.Framework/MultiplexingRelayServiceBroker.cs
@@ -79,8 +79,6 @@ public MultiplexingRelayServiceBroker(IServiceBroker serviceBroker, Multiplexing
 	/// <remarks>
 	/// The <see cref="FrameworkServices.RemoteServiceBroker"/> is used as the wire protocol.
 	/// </remarks>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	public static async Task<MultiplexingRelayServiceBroker> ConnectToServerAsync(IServiceBroker serviceBroker, Stream duplexStreamWithClient, CancellationToken cancellationToken = default)
 	{
 		Requires.NotNull(serviceBroker, nameof(serviceBroker));
diff --git a/src/Microsoft.ServiceHub.Framework/Reasons.cs b/src/Microsoft.ServiceHub.Framework/Reasons.cs
@@ -10,7 +10,6 @@ internal static class Reasons
 {
 #pragma warning disable SA1600 // Elements should be documented
 	internal const string Formatters = "This API may create formatters that require this functionality.";
-	internal const string CloseGenerics = "This API closes generic types or methods.";
 	internal const string DynamicProxy = "This API creates dynamic proxies that require this functionality.";
 	internal const string TypeLoad = "This API loads types by name.";
 }
diff --git a/src/Microsoft.ServiceHub.Framework/RemoteServiceBroker.cs b/src/Microsoft.ServiceHub.Framework/RemoteServiceBroker.cs
@@ -144,13 +144,9 @@ public TraceSource TraceSource
 	/// </param>
 	/// <param name="cancellationToken">A cancellation token.</param>
 	/// <returns>An <see cref="IServiceBroker"/> that provides access to remote services.</returns>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	public static Task<RemoteServiceBroker> ConnectToMultiplexingServerAsync(Stream duplexStream, CancellationToken cancellationToken = default) => ConnectToMultiplexingServerAsync(duplexStream, options: null, cancellationToken: cancellationToken);
 
 	/// <inheritdoc cref="ConnectToMultiplexingServerAsync(Stream, MultiplexingStream.Options?, TraceSource?, CancellationToken)"/>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	public static Task<RemoteServiceBroker> ConnectToMultiplexingServerAsync(Stream duplexStream, MultiplexingStream.Options? options, CancellationToken cancellationToken = default) => ConnectToMultiplexingServerAsync(duplexStream, options, traceSource: null, cancellationToken);
 
 	/// <summary>
@@ -169,8 +165,6 @@ public TraceSource TraceSource
 	/// <param name="traceSource">An optional means of logging activity.</param>
 	/// <param name="cancellationToken">A cancellation token.</param>
 	/// <returns>An <see cref="IServiceBroker"/> that provides access to remote services.</returns>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	public static async Task<RemoteServiceBroker> ConnectToMultiplexingServerAsync(Stream duplexStream, MultiplexingStream.Options? options, TraceSource? traceSource, CancellationToken cancellationToken = default)
 	{
 		Requires.NotNull(duplexStream, nameof(duplexStream));
@@ -231,8 +225,6 @@ public static async Task<RemoteServiceBroker> ConnectToMultiplexingServerAsync(I
 	}
 
 	/// <inheritdoc cref="ConnectToServerAsync(IDuplexPipe, TraceSource?, CancellationToken)"/>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	public static Task<RemoteServiceBroker> ConnectToServerAsync(IDuplexPipe pipe, CancellationToken cancellationToken = default) => ConnectToServerAsync(pipe, traceSource: null, cancellationToken);
 
 	/// <summary>
@@ -250,8 +242,6 @@ public static async Task<RemoteServiceBroker> ConnectToMultiplexingServerAsync(I
 	/// <remarks>
 	/// The <see cref="FrameworkServices.RemoteServiceBroker"/> is used as the wire protocol.
 	/// </remarks>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	public static Task<RemoteServiceBroker> ConnectToServerAsync(IDuplexPipe pipe, TraceSource? traceSource, CancellationToken cancellationToken = default)
 	{
 		Requires.NotNull(pipe, nameof(pipe));
@@ -267,8 +257,6 @@ public static Task<RemoteServiceBroker> ConnectToServerAsync(IDuplexPipe pipe, T
 	}
 
 	/// <inheritdoc cref="ConnectToServerAsync(string, TraceSource?, CancellationToken)"/>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	public static Task<RemoteServiceBroker> ConnectToServerAsync(string pipeName, CancellationToken cancellationToken = default) => ConnectToServerAsync(pipeName, traceSource: null, cancellationToken);
 
 	/// <summary>
@@ -284,8 +272,6 @@ public static Task<RemoteServiceBroker> ConnectToServerAsync(IDuplexPipe pipe, T
 	/// <remarks>
 	/// The <see cref="FrameworkServices.RemoteServiceBroker"/> is used as the wire protocol.
 	/// </remarks>
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
 	public static async Task<RemoteServiceBroker> ConnectToServerAsync(string pipeName, TraceSource? traceSource, CancellationToken cancellationToken = default)
 	{
 		Requires.NotNullOrEmpty(pipeName, nameof(pipeName));
diff --git a/src/Microsoft.ServiceHub.Framework/ServiceBrokerClientMetadata.cs b/src/Microsoft.ServiceHub.Framework/ServiceBrokerClientMetadata.cs
@@ -19,7 +19,7 @@ public struct ServiceBrokerClientMetadata
 	/// when responding to future service requests.
 	/// </remarks>
 	[JsonNET.JsonConverter(typeof(JsonNET.Converters.StringEnumConverter))]
-	[STJ.JsonConverter(typeof(STJ.JsonStringEnumConverter))]
+	[STJ.JsonConverter(typeof(STJ.JsonStringEnumConverter<RemoteServiceConnections>))]
 	public RemoteServiceConnections SupportedConnections { get; set; }
 
 	/// <summary>
diff --git a/src/Microsoft.ServiceHub.Framework/ServiceHub/LazyAuthorizationServiceProxy.cs b/src/Microsoft.ServiceHub.Framework/ServiceHub/LazyAuthorizationServiceProxy.cs
@@ -19,10 +19,6 @@ internal class LazyAuthorizationServiceProxy : IAuthorizationService, IDisposabl
 	/// </summary>
 	/// <param name="serviceBroker">A service broker used to acquire the activation service.</param>
 	/// <param name="joinableTaskFactory">An optional <see cref="JoinableTaskFactory"/> to use when scheduling async work, to avoid deadlocks in an application with a main thread.</param>
-#if SHIPPING
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
-#endif
 	public LazyAuthorizationServiceProxy(IServiceBroker? serviceBroker, JoinableTaskFactory? joinableTaskFactory)
 	{
 		this.authorizationService = new(() => this.ActivateAsync(serviceBroker), joinableTaskFactory);
@@ -61,10 +57,6 @@ public async ValueTask<IReadOnlyDictionary<string, string>> GetCredentialsAsync(
 		return await service.GetCredentialsAsync(cancellationToken).ConfigureAwait(false);
 	}
 
-#if SHIPPING
-	[RequiresUnreferencedCode(Reasons.Formatters)]
-	[RequiresDynamicCode(Reasons.Formatters)]
-#endif
 	private async Task<IAuthorizationService> ActivateAsync(IServiceBroker? serviceBroker)
 	{
 		this.DisposeToken.ThrowIfCancellationRequested();

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,12 @@ public partial class GlobalBrokeredServiceContainer`
`17`	`17`	`/// Services a brokered service that is proffered via a <see cref="IRemoteServiceBroker"/>.`
`18`	`18`	`/// </summary>`
`19`	`19`	`[DebuggerDisplay("{" + nameof(DebuggerDisplay) + "}")]`
`20`		`- [RequiresUnreferencedCode(Reasons.Formatters)]`
`21`		`- [RequiresDynamicCode(Reasons.Formatters)]`
`22`	`20`	`protected class ProfferedRemoteServiceBroker : IProffered`
`23`	`21`	`{`
`24`	`22`	`private readonly GlobalBrokeredServiceContainer container;`
`25`	`23`	`private readonly AsyncLazy<IServiceBroker> serviceBroker;`
`26`	`24`
	`25`	`+ [RequiresUnreferencedCode(Reasons.TypeLoad)]`
`27`	`26`	`internal ProfferedRemoteServiceBroker(GlobalBrokeredServiceContainer container, IRemoteServiceBroker remoteServiceBroker, MultiplexingStream? multiplexingStream, ServiceSource source, IReadOnlyCollection<ServiceMoniker> serviceMonikers)`
`28`	`27`	`{`
`29`	`28`	`this.container = container ?? throw new ArgumentNullException(nameof(container));`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public abstract partial class GlobalBrokeredServiceContainer`
`17`	`17`	`/// A filtered view on the services proffered to a <see cref="GlobalBrokeredServiceContainer"/>, exposed as an <see cref="IServiceBroker"/>.`
`18`	`18`	`/// </summary>`
`19`	`19`	`[DebuggerDisplay("{" + nameof(DebuggerDisplay) + "}")]`
	`20`	`+ [RequiresUnreferencedCode(Reasons.TypeLoad)]`
`20`	`21`	`protected class View : IServiceBroker, IRemoteServiceBroker`
`21`	`22`	`{`
`22`	`23`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ namespace Microsoft.ServiceHub.Framework;`
`22`	`22`	`/// </para>`
`23`	`23`	`/// </remarks>`
`24`	`24`	`[DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]`
`25`		`-[RequiresDynamicCode(Reasons.Formatters)]`
`26`		`-[RequiresUnreferencedCode(Reasons.Formatters)]`
`27`	`25`	`public abstract class DelegatingServiceJsonRpcPolyTypeDescriptor : ServiceJsonRpcPolyTypeDescriptor`
`28`	`26`	`{`
`29`	`27`	`private ServiceJsonRpcPolyTypeDescriptor innerDescriptor;`