refactor out LegacyOutProcReqnrollConnector from base class

Author: gasparnagy

Reqnroll.VisualStudio.sln.DotSettings

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=53eecf85_002Dd821_002D40e8_002Dac97_002Dfdb734542b84/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Instance fields (not private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Deveroom/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Reqnroll/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Reqnroll.VisualStudio/Connectors/LegacyOutProcReqnrollConnector.cs

@@ -0,0 +1,41 @@
+namespace Reqnroll.VisualStudio.Connectors;
+
+public class LegacyOutProcReqnrollConnector : OutProcReqnrollConnector
+{
+    private const string ConnectorV1AnyCpu = @"Reqnroll-V1\reqnroll-vs.exe";
+    private const string ConnectorV1X86 = @"Reqnroll-V1\reqnroll-vs-x86.exe";
+    private const string SpecFlowConnectorV1AnyCpu = @"SpecFlow-V1\specflow-vs.exe";
+    private const string SpecFlowConnectorV1X86 = @"SpecFlow-V1\specflow-vs-x86.exe";
+    private const string SpecFlowConnectorV2Net60 = @"SpecFlow-V2-net6.0\specflow-vs.dll";
+    private const string SpecFlowConnectorV3Net60 = @"SpecFlow-V3-net6.0\specflow-vs.dll";
+
+    public LegacyOutProcReqnrollConnector(DeveroomConfiguration configuration, IDeveroomLogger logger, TargetFrameworkMoniker targetFrameworkMoniker, string extensionFolder, ProcessorArchitectureSetting processorArchitecture, ProjectSettings projectSettings, IMonitoringService monitoringService) : base(configuration, logger, targetFrameworkMoniker, extensionFolder, processorArchitecture, projectSettings, monitoringService)
+    {
+    }
+
+    protected override string GetConnectorPath(List<string> arguments)
+    {
+        var connectorsFolder = GetConnectorsFolder();
+
+        if (_targetFrameworkMoniker.IsNetCore && _projectSettings.IsSpecFlowProject)
+        {
+            if (ReqnrollVersion != null && ReqnrollVersion.Version >= new Version(3, 9, 22))
+                return GetDotNetExecCommand(arguments, connectorsFolder, SpecFlowConnectorV3Net60);
+            return GetDotNetExecCommand(arguments, connectorsFolder, SpecFlowConnectorV2Net60);
+        }
+
+        //V1
+        string connectorName = _projectSettings.IsSpecFlowProject ?
+            SpecFlowConnectorV1AnyCpu : ConnectorV1AnyCpu;
+        if (_processorArchitecture == ProcessorArchitectureSetting.X86)
+            connectorName = _projectSettings.IsSpecFlowProject ?
+                SpecFlowConnectorV1X86 : ConnectorV1X86;
+
+#if DEBUG
+        _logger.LogInfo($"Invoking '{connectorName}'...");
+#endif
+
+        return Path.Combine(connectorsFolder, connectorName);
+    }
+
+}

Reqnroll.VisualStudio/Connectors/OutProcReqnrollConnector.cs

@@ -1,26 +1,20 @@
 #nullable disable
 namespace Reqnroll.VisualStudio.Connectors;
 
-public class OutProcReqnrollConnector
+public abstract class OutProcReqnrollConnector
 {
-    private const string ConnectorV1AnyCpu = @"Reqnroll-V1\reqnroll-vs.exe";
-    private const string ConnectorV1X86 = @"Reqnroll-V1\reqnroll-vs-x86.exe";
-    private const string SpecFlowConnectorV1AnyCpu = @"SpecFlow-V1\specflow-vs.exe";
-    private const string SpecFlowConnectorV1X86 = @"SpecFlow-V1\specflow-vs-x86.exe";
-    private const string SpecFlowConnectorV2Net60 = @"SpecFlow-V2-net6.0\specflow-vs.dll";
-    private const string SpecFlowConnectorV3Net60 = @"SpecFlow-V3-net6.0\specflow-vs.dll";
     private const string BindingDiscoveryCommandName = "binding discovery";
 
-    private readonly DeveroomConfiguration _configuration;
-    private readonly string _extensionFolder;
-    private readonly IDeveroomLogger _logger;
-    private readonly IMonitoringService _monitoringService;
-    private readonly ProcessorArchitectureSetting _processorArchitecture;
+    protected readonly DeveroomConfiguration _configuration;
+    protected readonly string _extensionFolder;
+    protected readonly IDeveroomLogger _logger;
+    protected readonly IMonitoringService _monitoringService;
+    protected readonly ProcessorArchitectureSetting _processorArchitecture;
     protected readonly ProjectSettings _projectSettings;
     protected readonly TargetFrameworkMoniker _targetFrameworkMoniker;
     protected NuGetVersion ReqnrollVersion => _projectSettings.ReqnrollVersion;
 
-    public OutProcReqnrollConnector(DeveroomConfiguration configuration, IDeveroomLogger logger,
+    protected OutProcReqnrollConnector(DeveroomConfiguration configuration, IDeveroomLogger logger,
         TargetFrameworkMoniker targetFrameworkMoniker, string extensionFolder,
         ProcessorArchitectureSetting processorArchitecture, ProjectSettings projectSettings,
         IMonitoringService monitoringService)
@@ -127,30 +121,7 @@ private string GetDetailedErrorMessage(ProcessHelper.RunProcessResult result, st
             $"Error during {command}. {Environment.NewLine}Command executed:{Environment.NewLine}  {result.CommandLine}{Environment.NewLine}Exit code: {exitCode}{Environment.NewLine}Message: {Environment.NewLine}{errorMessage}";
     }
 
-    protected virtual string GetConnectorPath(List<string> arguments)
-    {
-        var connectorsFolder = GetConnectorsFolder();
-
-        if (_targetFrameworkMoniker.IsNetCore && _projectSettings.IsSpecFlowProject)
-        {
-            if (ReqnrollVersion != null && ReqnrollVersion.Version >= new Version(3, 9, 22))
-                return GetDotNetExecCommand(arguments, connectorsFolder, SpecFlowConnectorV3Net60);
-            return GetDotNetExecCommand(arguments, connectorsFolder, SpecFlowConnectorV2Net60);
-        }
-
-        //V1
-        string connectorName = _projectSettings.IsSpecFlowProject ?
-            SpecFlowConnectorV1AnyCpu : ConnectorV1AnyCpu;
-        if (_processorArchitecture == ProcessorArchitectureSetting.X86)
-            connectorName = _projectSettings.IsSpecFlowProject ? 
-                SpecFlowConnectorV1X86 : ConnectorV1X86;
-
-#if DEBUG
-        _logger.LogInfo($"Invoking '{connectorName}'...");
-#endif
-
-        return Path.Combine(connectorsFolder, connectorName);
-    }
+    protected abstract string GetConnectorPath(List<string> arguments);
 
     private string GetDotNetInstallLocation()
     {

Reqnroll.VisualStudio/Connectors/OutProcReqnrollConnectorFactory.cs

@@ -18,13 +18,13 @@ public static OutProcReqnrollConnector CreateGeneric(IProjectScope projectScope)
             ideScope.MonitoringService);
     }
 
-    public static OutProcReqnrollConnector Create(IProjectScope projectScope)
+    public static OutProcReqnrollConnector CreateLegacy(IProjectScope projectScope)
     {
         var ideScope = projectScope.IdeScope;
         var projectSettings = projectScope.GetProjectSettings();
         var deveroomConfiguration = projectScope.GetDeveroomConfiguration();
         var processorArchitecture = GetProcessorArchitecture(deveroomConfiguration, projectSettings);
-        return new OutProcReqnrollConnector(
+        return new LegacyOutProcReqnrollConnector(
             deveroomConfiguration,
             ideScope.Logger,
             projectSettings.TargetFrameworkMoniker,

Reqnroll.VisualStudio/Discovery/IDiscoveryResultProvider.cs

@@ -20,7 +20,7 @@ public DiscoveryResult RunDiscovery(string testAssemblyPath, string configFilePa
     {
         if (projectSettings.IsSpecFlowProject && projectSettings.ReqnrollVersion.Version <= new Version(3, 0, 225))
         {
-            return RunDiscovery(testAssemblyPath, configFilePath, projectSettings, GetConnector(projectSettings));
+            return RunDiscovery(testAssemblyPath, configFilePath, projectSettings, GetLegacyConnector(projectSettings));
         }
 
         DiscoveryResult genericConnectorResult = RunDiscovery(testAssemblyPath, configFilePath, projectSettings,
@@ -30,7 +30,7 @@ public DiscoveryResult RunDiscovery(string testAssemblyPath, string configFilePa
             return genericConnectorResult;
 
         var retryResult =
-            RunDiscovery(testAssemblyPath, configFilePath, projectSettings, GetConnector(projectSettings));
+            RunDiscovery(testAssemblyPath, configFilePath, projectSettings, GetLegacyConnector(projectSettings));
 
         if (retryResult.IsFailed)
         {
@@ -47,6 +47,6 @@ public DiscoveryResult RunDiscovery(string testAssemblyPath, string configFilePa
         OutProcReqnrollConnector connector) => connector.RunDiscovery(projectSettings.OutputAssemblyPath,
         projectSettings.ReqnrollConfigFilePath);
 
-    private OutProcReqnrollConnector GetConnector(ProjectSettings projectSettings) =>
-        OutProcReqnrollConnectorFactory.Create(_projectScope);
+    private OutProcReqnrollConnector GetLegacyConnector(ProjectSettings projectSettings) =>
+        OutProcReqnrollConnectorFactory.CreateLegacy(_projectScope);
 }