From e2b24c01056485d8d33aac3c3c980b8b6d9f664a Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Thu, 23 Dec 2021 10:38:17 +0100 Subject: [PATCH] Cleanup published api --- .../DataCollection/DataCollectorConfig.cs | 2 +- .../DataCollectionExtensionManager.cs | 12 +----------- .../IDataCollectorAttachmentsProcessorsFactory.cs | 4 ++-- .../Interfaces/IDataCollectorCapabilities.cs | 5 ----- .../PublicAPI/PublicAPI.Shipped.txt | 12 ++---------- .../TestRunAttachmentsProcessingManager.cs | 2 +- .../PublicAPI/PublicAPI.Shipped.txt | 4 ---- 7 files changed, 7 insertions(+), 34 deletions(-) diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorConfig.cs b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorConfig.cs index 71d4c769e9..538c65692c 100644 --- a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorConfig.cs +++ b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorConfig.cs @@ -64,7 +64,7 @@ public override ICollection Metadata { get { - return new object[] { this.TypeUri.ToString(), this.FriendlyName, this.FilePath, this.AttachmentsProcessorType != null }; + return new object[] { this.TypeUri.ToString(), this.FriendlyName, this.AttachmentsProcessorType != null }; } } diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/DataCollectionExtensionManager.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/DataCollectionExtensionManager.cs index a06177594e..6ddf3ddf7f 100644 --- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/DataCollectionExtensionManager.cs +++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/DataCollectionExtensionManager.cs @@ -100,11 +100,10 @@ public class DataCollectorMetadata : IDataCollectorCapabilities /// /// The friendly Name. /// - public DataCollectorMetadata(string extension, string friendlyName, string filePath, bool hasAttachmentProcessor) + public DataCollectorMetadata(string extension, string friendlyName, bool hasAttachmentProcessor) { this.ExtensionUri = extension; this.FriendlyName = friendlyName; - this.FilePath = filePath; this.HasAttachmentProcessor = hasAttachmentProcessor; } @@ -134,14 +133,5 @@ public bool HasAttachmentProcessor get; private set; } - - /// - /// Gets the file path of assemblies that contains the data collector. - /// - public string FilePath - { - get; - private set; - } } } diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IDataCollectorAttachmentsProcessorsFactory.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IDataCollectorAttachmentsProcessorsFactory.cs index 117495550d..530ae616dd 100644 --- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IDataCollectorAttachmentsProcessorsFactory.cs +++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IDataCollectorAttachmentsProcessorsFactory.cs @@ -10,7 +10,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine /// /// Creates and return a list of available attachments processor /// - public interface IDataCollectorAttachmentsProcessorsFactory + internal interface IDataCollectorAttachmentsProcessorsFactory { /// /// Creates and return a list of available attachments processor @@ -24,7 +24,7 @@ public interface IDataCollectorAttachmentsProcessorsFactory /// /// Registered data collector attachment processor /// - public class DataCollectorAttachmentProcessor + internal class DataCollectorAttachmentProcessor { /// /// Data collector FriendlyName diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/IDataCollectorCapabilities.cs b/src/Microsoft.TestPlatform.Common/Interfaces/IDataCollectorCapabilities.cs index b4c4a57c7f..965c3dd44f 100644 --- a/src/Microsoft.TestPlatform.Common/Interfaces/IDataCollectorCapabilities.cs +++ b/src/Microsoft.TestPlatform.Common/Interfaces/IDataCollectorCapabilities.cs @@ -13,11 +13,6 @@ public interface IDataCollectorCapabilities : ITestExtensionCapabilities /// string FriendlyName { get; } - /// - /// Gets the file path of the assembly that contains the data collector. - /// - string FilePath { get; } - /// /// Check if the data collector has got attachment processor registered. /// diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/PublicAPI.Shipped.txt index 5bf16e122b..8b699707da 100644 --- a/src/Microsoft.TestPlatform.Common/PublicAPI/PublicAPI.Shipped.txt +++ b/src/Microsoft.TestPlatform.Common/PublicAPI/PublicAPI.Shipped.txt @@ -21,11 +21,10 @@ Microsoft.VisualStudio.TestPlatform.Common.Exceptions.InvalidLoggerException Microsoft.VisualStudio.TestPlatform.Common.Exceptions.InvalidLoggerException.InvalidLoggerException(string message) -> void Microsoft.VisualStudio.TestPlatform.Common.Exceptions.InvalidLoggerException.InvalidLoggerException(string message, System.Exception innerException) -> void Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata -Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.DataCollectorMetadata(string extension, string friendlyName, string filePath, bool hasAttachmentProcessor) -> void +Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.DataCollectorMetadata(string extension, string friendlyName, bool hasAttachmentProcessor) -> void Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.ExtensionUri.get -> string Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.FriendlyName.get -> string Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.HasAttachmentProcessor.get -> bool -Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.FilePath.get -> string Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestLoggerMetadata Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestLoggerMetadata.ExtensionUri.get -> string Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestLoggerMetadata.FriendlyName.get -> string @@ -80,7 +79,6 @@ Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IBaseTestEventsRegistrar Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IBaseTestEventsRegistrar.LogWarning(string message) -> void Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IDataCollectorCapabilities Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IDataCollectorCapabilities.FriendlyName.get -> string -Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IDataCollectorCapabilities.FilePath.get -> string Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IDataCollectorCapabilities.HasAttachmentProcessor.get -> bool Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ISettingsProviderCapabilities Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ISettingsProviderCapabilities.SettingsName.get -> string @@ -297,10 +295,4 @@ static Microsoft.VisualStudio.TestPlatform.Common.Utilities.RunSettingsUtilities virtual Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache.GetFilteredExtensions(System.Collections.Generic.List extensions, string endsWithPattern) -> System.Collections.Generic.IEnumerable virtual Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestPluginInformation.IdentifierData.get -> string virtual Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestPluginInformation.Metadata.get -> System.Collections.Generic.ICollection -virtual Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeProviderManager.GetTestHostManagerByRunConfiguration(string runConfiguration) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider -Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DataCollectorAttachmentProcessor -Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DataCollectorAttachmentProcessor.DataCollectorAttachmentProcessor(string friendlyName, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachmentProcessor dataCollectorAttachmentProcessor) -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DataCollectorAttachmentProcessor.DataCollectorAttachmentProcessorInstance.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachmentProcessor -Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DataCollectorAttachmentProcessor.FriendlyName.get -> string -Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IDataCollectorAttachmentsProcessorsFactory -Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IDataCollectorAttachmentsProcessorsFactory.Create(Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector[] invokedDataCollectors, Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger logger) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DataCollectorAttachmentProcessor[] \ No newline at end of file +virtual Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeProviderManager.GetTestHostManagerByRunConfiguration(string runConfiguration) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs index be36c5b599..73dfb4269e 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs @@ -22,7 +22,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachments /// /// Orchestrates test run attachments processing operations. /// - public class TestRunAttachmentsProcessingManager : ITestRunAttachmentsProcessingManager + internal class TestRunAttachmentsProcessingManager : ITestRunAttachmentsProcessingManager { private static string AttachmentsProcessingCompleted = "Completed"; private static string AttachmentsProcessingCanceled = "Canceled"; diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/PublicAPI.Shipped.txt index 6e0600eca2..2d1e6db286 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/PublicAPI.Shipped.txt +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/PublicAPI.Shipped.txt @@ -103,10 +103,6 @@ Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestHostManagerFactory Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestHostManagerFactory.GetDiscoveryManager() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IDiscoveryManager Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestHostManagerFactory.GetExecutionManager() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IExecutionManager Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestHostManagerFactory.TestHostManagerFactory(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData requestData) -> void -Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingManager -Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingManager.ProcessTestRunAttachmentsAsync(string runSettingsXml, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData requestData, System.Collections.Generic.IEnumerable attachments, System.Collections.Generic.IEnumerable invokedDataCollector, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler eventHandler, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task -Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingManager.ProcessTestRunAttachmentsAsync(string runSettingsXml, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData requestData, System.Collections.Generic.IEnumerable attachments, System.Collections.Generic.IEnumerable invokedDataCollector, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task> -Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingManager.TestRunAttachmentsProcessingManager(Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource testPlatformEventSource, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IDataCollectorAttachmentsProcessorsFactory dataCollectorAttachmentsProcessorsFactory) -> void Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestSessionPool override Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManagerWithDataCollection.Initialize(bool skipDefaultAdapters) -> void override Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManagerWithDataCollection.SetupChannel(System.Collections.Generic.IEnumerable sources, string runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler eventHandler) -> bool