(#2499) remove cucumber messages

(#2499) remove cucumber messages config (#2499) remove cucumber submodule (#2499) update changelog, adjust documentation
SpecFlowOSS · Oct 8, 2021 · 21c2d00 · 21c2d00
1 parent fc8cd9c
commit 21c2d00
Show file tree

Hide file tree

Showing 107 changed files with 90 additions and 4,069 deletions.
diff --git a/.gitignore b/.gitignore
@@ -364,8 +364,6 @@ Backup*/*
 UpgradeLog*
 .vs/*
 
-
-
 #SpecFlow Stuff
 /_NCrunch_TechTalk.SpecFlow_VS2013/StoredText
 !lib/**
@@ -375,17 +373,10 @@ TechTalk.SpecFlow.sln.GhostDoc.xml
 Features.Generated/
 GitExtensions.settings.backup
 
-!lib/**
-TechTalk.SpecFlow.Tools/app.config
-TechTalk.SpecFlow.Tools/plugincompability.config
-TechTalk.SpecFlow.sln.GhostDoc.xml
-Features.Generated/
-GitExtensions.settings.backup
 /Installer/NuGetPackages/SpecFlow.Tools.MsBuild.Generation/build/SpecFlow.Tools.MsBuild.Generation.targets
 /Installer/NuGetPackages/SpecFlow.Tools.MsBuild.Generation/build/SpecFlow.Tools.MsBuild.Generation.props
 /Tests/TechTalk.SpecFlow.MsBuildNetSdk.IntegrationTests/Features/dummy.feature.cs
 *.feature.cs
-/Tests/TechTalk.SpecFlow.Specs/Features/CucumberMessages
 *.AssemblyHooks.cs
 *.AssemblyHooks.vb
 

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "ExternalRepositories/SpecFlow.TestProjectGenerator"]
 	path = ExternalRepositories/SpecFlow.TestProjectGenerator
-	url = https://github.com/SpecFlowOSS/SpecFlow.TestProjectGenerator.git
-[submodule "ExternalRepositories/cucumber"]
-	path = ExternalRepositories/cucumber
-	url = https://github.com/SpecFlowOSS/cucumber.git
+	url = https://github.com/SpecFlowOSS/SpecFlow.TestProjectGenerator.git
diff --git a/ExternalRepositories/SpecFlow.TestProjectGenerator b/ExternalRepositories/SpecFlow.TestProjectGenerator
diff --git a/ExternalRepositories/cucumber b/ExternalRepositories/cucumber
diff --git a/GitExtensions.settings b/GitExtensions.settings
@@ -70,60 +70,60 @@
     </key>
     <value>
       <string>&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;ArrayOfGitExtLinkDef xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
+&lt;ArrayOfGitExtLinkDef&gt;
   &lt;GitExtLinkDef&gt;
-    &lt;SearchInParts&gt;
-      &lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
-      &lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
-      &lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
-    &lt;/SearchInParts&gt;
-    &lt;RemoteSearchInParts /&gt;
-    &lt;LinkFormats&gt;
-      &lt;GitExtLinkFormat&gt;
-        &lt;Caption&gt;Issue {0}&lt;/Caption&gt;
-        &lt;Format&gt;https://github.com/techtalk/SpecFlow/issues/{0}&lt;/Format&gt;
-      &lt;/GitExtLinkFormat&gt;
-    &lt;/LinkFormats&gt;
-    &lt;Name&gt;GitHub - issues&lt;/Name&gt;
-    &lt;SearchPattern&gt;(\s*(,|and)?\s*#\d+)+&lt;/SearchPattern&gt;
-    &lt;NestedSearchPattern&gt;(\d+)+&lt;/NestedSearchPattern&gt;
     &lt;Enabled&gt;true&lt;/Enabled&gt;
-    &lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
-  &lt;/GitExtLinkDef&gt;
-  &lt;GitExtLinkDef&gt;
-    &lt;SearchInParts&gt;
-      &lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
-    &lt;/SearchInParts&gt;
-    &lt;RemoteSearchInParts /&gt;
     &lt;LinkFormats&gt;
       &lt;GitExtLinkFormat&gt;
         &lt;Caption&gt;View on GitHub&lt;/Caption&gt;
-        &lt;Format&gt;https://github.com/techtalk/SpecFlow/commit/%COMMIT_HASH%&lt;/Format&gt;
+        &lt;Format&gt;https://github.com/SpecFlowOSS/SpecFlow/commit/%COMMIT_HASH%&lt;/Format&gt;
       &lt;/GitExtLinkFormat&gt;
     &lt;/LinkFormats&gt;
     &lt;Name&gt;GitHub - commit&lt;/Name&gt;
-    &lt;SearchPattern&gt;.*&lt;/SearchPattern&gt;
     &lt;NestedSearchPattern /&gt;
-    &lt;Enabled&gt;true&lt;/Enabled&gt;
+    &lt;RemoteSearchInParts /&gt;
+    &lt;SearchInParts&gt;
+      &lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
+    &lt;/SearchInParts&gt;
+    &lt;SearchPattern&gt;.*&lt;/SearchPattern&gt;
     &lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
   &lt;/GitExtLinkDef&gt;
   &lt;GitExtLinkDef&gt;
+    &lt;Enabled&gt;true&lt;/Enabled&gt;
+    &lt;LinkFormats&gt;
+      &lt;GitExtLinkFormat&gt;
+        &lt;Caption&gt;Issue {0}&lt;/Caption&gt;
+        &lt;Format&gt;https://github.com/SpecFlowOSS/SpecFlow/issues/{0}&lt;/Format&gt;
+      &lt;/GitExtLinkFormat&gt;
+    &lt;/LinkFormats&gt;
+    &lt;Name&gt;GitHub - issues&lt;/Name&gt;
+    &lt;NestedSearchPattern&gt;(\d+)+&lt;/NestedSearchPattern&gt;
+    &lt;RemoteSearchInParts /&gt;
     &lt;SearchInParts&gt;
       &lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
       &lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
       &lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
     &lt;/SearchInParts&gt;
-    &lt;RemoteSearchInParts /&gt;
+    &lt;SearchPattern&gt;(\s*(,|and)?\s*#\d+)+&lt;/SearchPattern&gt;
+    &lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
+  &lt;/GitExtLinkDef&gt;
+  &lt;GitExtLinkDef&gt;
+    &lt;Enabled&gt;true&lt;/Enabled&gt;
     &lt;LinkFormats&gt;
       &lt;GitExtLinkFormat&gt;
         &lt;Caption&gt;PR {0}&lt;/Caption&gt;
-        &lt;Format&gt;https://github.com/techtalk/SpecFlow/pull/{0}&lt;/Format&gt;
+        &lt;Format&gt;https://github.com/SpecFlowOSS/SpecFlow/pull/{0}&lt;/Format&gt;
       &lt;/GitExtLinkFormat&gt;
     &lt;/LinkFormats&gt;
     &lt;Name&gt;GitHub - PR&lt;/Name&gt;
-    &lt;SearchPattern&gt;Merge pull request (\s*(,|and)?\s*#\d+)+&lt;/SearchPattern&gt;
     &lt;NestedSearchPattern&gt;(\d+)+&lt;/NestedSearchPattern&gt;
-    &lt;Enabled&gt;true&lt;/Enabled&gt;
+    &lt;RemoteSearchInParts /&gt;
+    &lt;SearchInParts&gt;
+      &lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
+      &lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
+      &lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
+    &lt;/SearchInParts&gt;
+    &lt;SearchPattern&gt;Merge pull request (\s*(,|and)?\s*#\d+)+&lt;/SearchPattern&gt;
     &lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
   &lt;/GitExtLinkDef&gt;
 &lt;/ArrayOfGitExtLinkDef&gt;</string>

diff --git a/TechTalk.SpecFlow/Configuration/AppConfig/AppConfigConfigurationLoader.cs b/TechTalk.SpecFlow/Configuration/AppConfig/AppConfigConfigurationLoader.cs
@@ -32,7 +32,6 @@ public Configuration.SpecFlowConfiguration LoadAppConfig(Configuration.SpecFlowC
             bool allowDebugGeneratedFiles = specFlowConfiguration.AllowDebugGeneratedFiles;
             string[] addNonParallelizableMarkerForTags = specFlowConfiguration.AddNonParallelizableMarkerForTags;
 
-            CucumberMessagesConfiguration cucumberMessagesConfiguration = specFlowConfiguration.CucumberMessagesConfiguration;
 
             if (IsSpecified(configSection.Language))
             {
@@ -91,16 +90,6 @@ public Configuration.SpecFlowConfiguration LoadAppConfig(Configuration.SpecFlowC
                 additionalStepAssemblies.Add(assemblyName);
             }
 
-            if (IsSpecified(configSection.CucumberMessages))
-            {
-                cucumberMessagesConfiguration.Enabled = configSection.CucumberMessages.Enabled;
-
-                foreach (CucumberMessageSinkElement cucumberMessagesSink in configSection.CucumberMessages.Sinks)
-                {
-                    cucumberMessagesConfiguration.Sinks.Add(new CucumberMessagesSink(cucumberMessagesSink.Type, cucumberMessagesSink.Path));
-                }
-            }
-
             return new SpecFlowConfiguration(ConfigSource.AppConfig, 
                                             runtimeContainerRegistrationCollection,
                                             generatorContainerRegistrationCollection,
@@ -116,8 +105,7 @@ public Configuration.SpecFlowConfiguration LoadAppConfig(Configuration.SpecFlowC
                                             allowDebugGeneratedFiles,
                                             allowRowTests,
                                             addNonParallelizableMarkerForTags,
-                                            obsoleteBehavior,
-                                            cucumberMessagesConfiguration
+                                            obsoleteBehavior
                                             );
         }
 

diff --git a/TechTalk.SpecFlow/Configuration/AppConfig/ConfigurationSectionHandler.cs b/TechTalk.SpecFlow/Configuration/AppConfig/ConfigurationSectionHandler.cs
@@ -50,13 +50,6 @@ public StepAssemblyCollection StepAssemblies
             set { this["stepAssemblies"] = value; }
         }
 
-        [ConfigurationProperty("cucumber-messages", IsRequired = false)]
-        public CucumberMessagesElement CucumberMessages
-        {
-            get => (CucumberMessagesElement)this["cucumber-messages"];
-            set => this["cucumber-messages"] = value;
-        }
-
         public static ConfigurationSectionHandler CreateFromXml(string xmlContent)
         {
             ConfigurationSectionHandler section = new ConfigurationSectionHandler();

diff --git a/TechTalk.SpecFlow/Configuration/AppConfig/CucumberMessageSinkElement.cs b/TechTalk.SpecFlow/Configuration/AppConfig/CucumberMessageSinkElement.cs
diff --git a/TechTalk.SpecFlow/Configuration/AppConfig/CucumberMessagesElement.cs b/TechTalk.SpecFlow/Configuration/AppConfig/CucumberMessagesElement.cs
diff --git a/TechTalk.SpecFlow/Configuration/AppConfig/CucumberMessagesSinkCollection.cs b/TechTalk.SpecFlow/Configuration/AppConfig/CucumberMessagesSinkCollection.cs
diff --git a/TechTalk.SpecFlow/Configuration/ConfigurationLoader.cs b/TechTalk.SpecFlow/Configuration/ConfigurationLoader.cs
@@ -137,8 +137,7 @@ public static SpecFlowConfiguration GetDefault()
                 DefaultAllowDebugGeneratedFiles, 
                 DefaultAllowRowTests,
                 DefaultAddNonParallelizableMarkerForTags,
-                DefaultObsoleteBehavior,
-                new CucumberMessagesConfiguration()
+                DefaultObsoleteBehavior
                 );
         }
 

diff --git a/TechTalk.SpecFlow/Configuration/CucumberMessagesConfiguration.cs b/TechTalk.SpecFlow/Configuration/CucumberMessagesConfiguration.cs
diff --git a/TechTalk.SpecFlow/Configuration/JsonConfig/CucumberMessageSinkElement.cs b/TechTalk.SpecFlow/Configuration/JsonConfig/CucumberMessageSinkElement.cs
diff --git a/TechTalk.SpecFlow/Configuration/JsonConfig/CucumberMessagesElement.cs b/TechTalk.SpecFlow/Configuration/JsonConfig/CucumberMessagesElement.cs
diff --git a/TechTalk.SpecFlow/Configuration/JsonConfig/JsonConfig.cs b/TechTalk.SpecFlow/Configuration/JsonConfig/JsonConfig.cs
@@ -22,8 +22,5 @@ public class JsonConfig
 
         [DataMember(Name = "stepAssemblies")]
         public List<StepAssemblyElement> StepAssemblies { get; set; }
-
-        [DataMember(Name = "cucumber-messages")]
-        public CucumberMessagesElement CucumberMessages { get; set; } 
     }
 }
diff --git a/TechTalk.SpecFlow/Configuration/JsonConfig/JsonConfigurationLoader.cs b/TechTalk.SpecFlow/Configuration/JsonConfig/JsonConfigurationLoader.cs
@@ -30,7 +30,6 @@ public SpecFlowConfiguration LoadJson(SpecFlowConfiguration specFlowConfiguratio
             bool allowDebugGeneratedFiles = specFlowConfiguration.AllowDebugGeneratedFiles;
             var addNonParallelizableMarkerForTags = specFlowConfiguration.AddNonParallelizableMarkerForTags;
             var obsoleteBehavior = specFlowConfiguration.ObsoleteBehavior;
-            var cucumberMessagesConfiguration = specFlowConfiguration.CucumberMessagesConfiguration;
 
             if (jsonConfig.Language != null)
             {
@@ -86,19 +85,6 @@ public SpecFlowConfiguration LoadJson(SpecFlowConfiguration specFlowConfiguratio
                 }
             }
 
-            if (jsonConfig.CucumberMessages != null)
-            {
-                cucumberMessagesConfiguration.Enabled = jsonConfig.CucumberMessages.Enabled;
-
-                if (jsonConfig.CucumberMessages.Sinks != null)
-                {
-                    foreach (var cucumberMessageSinkElement in jsonConfig.CucumberMessages.Sinks)
-                    {
-                        cucumberMessagesConfiguration.Sinks.Add(new CucumberMessagesSink(cucumberMessageSinkElement.Type, cucumberMessageSinkElement.Path));
-                    }
-                }
-            }
-
             return new SpecFlowConfiguration(
                 ConfigSource.Json,
                 containerRegistrationCollection,
@@ -115,8 +101,7 @@ public SpecFlowConfiguration LoadJson(SpecFlowConfiguration specFlowConfiguratio
                 allowDebugGeneratedFiles,
                 allowRowTests,
                 addNonParallelizableMarkerForTags,
-                obsoleteBehavior,
-                cucumberMessagesConfiguration
+                obsoleteBehavior
             );
         }
     }