Version bump and style fixes

Author: stajs

README.md

@@ -50,7 +50,7 @@ Update your project:
 
     ```xml
     <ItemGroup>
-      <DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.3.3" />
+      <DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.3.4" />
     </ItemGroup>
     ```
 

samples/VS2017/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/Sample.Website.Tests.MSTest.csproj

@@ -36,7 +36,7 @@
   </Target>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.3.3" />
+    <DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.3.4" />
   </ItemGroup>
 
 </Project>

samples/VS2017/SpecFlow 2.1.0/net461/Sample.Website.Tests.NUnit/Sample.Website.Tests.NUnit.csproj

@@ -36,7 +36,7 @@
   </Target>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.3.3" />
+    <DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.3.4" />
   </ItemGroup>
 
 </Project>

samples/VS2017/SpecFlow 2.1.0/net461/Sample.Website.Tests.XUnit/Sample.Website.Tests.XUnit.csproj

@@ -36,7 +36,7 @@
   </Target>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.3.3" />
+    <DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.3.4" />
   </ItemGroup>
 
 </Project>

src/SpecFlow.NetCore/AppConfig.cs

@@ -53,8 +53,8 @@ public static AppConfig CreateIn(DirectoryInfo directory, FileInfo csproj, strin
 
 			Content = string.Format(Content, testFramework);
 
-			// fixes SpecFlow Scenario Outline scenarios appearing under the project they belong to.
-			// see https://github.com/stajs/SpecFlow.NetCore/issues/34 and https://github.com/techtalk/SpecFlow/issues/275
+			// Fixes SpecFlow Scenario Outline scenarios appearing under the project they belong to.
+			// See https://github.com/stajs/SpecFlow.NetCore/issues/34 and https://github.com/techtalk/SpecFlow/issues/275.
 			if (testFramework.ToLower() == "mstest")
 				Content = Content.Replace("</specFlow>", "  <generator allowDebugGeneratedFiles=\"true\" />\r\n  </specFlow>");
 
@@ -143,6 +143,5 @@ private static IEnumerable<string> GetProjectPackageReferences(string csproj)
 
 			return packageReferences;
 		}
-
 	}
 }

src/SpecFlow.NetCore/Args.cs

@@ -27,7 +27,7 @@ public Args(string[] args)
 			if (args == null || !args.Any())
 				return;
 
-			// establish a dictionary of all good command line variables
+			// Establish a dictionary of all good command line variables.
 			var argDictionary = new Dictionary<string, string>
 			{
  				{ SpecFlowPathArgName, null },

src/SpecFlow.NetCore/Fixer.cs

@@ -46,9 +46,7 @@ private static string FindSpecFlow(string version)
 			var userProfile = Environment.GetEnvironmentVariable("USERPROFILE");
 
 			if (string.IsNullOrWhiteSpace(userProfile))
-			{
 				userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-			}
 
 			path = Path.Combine(userProfile, ".nuget", "packages", relativePathToSpecFlow);
 
@@ -64,29 +62,37 @@ private static bool TryGetSpecFlowVersion(FileInfo csproj, out string version)
 			doc.Load(csproj.FullName);
 
 			var root = doc.DocumentElement;
-			var node = root.SelectSingleNode("//ItemGroup/PackageReference[translate(@Include, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')='specflow']"); // case-insensitive for XPath version 1.0
+
+			// Case-insensitive for XPath version 1.0
+			var node = root.SelectSingleNode("//ItemGroup/PackageReference[translate(@Include, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')='specflow']");
+
 			if (node == null)
 			{
-				if (TryGetSpecflowVersionFromImports(csproj, root, out version))
+				if (TryGetSpecFlowVersionFromImports(csproj, root, out version))
 					return true;
 
 				version = default(string);
 				return false;
 			}
+
 			version = node.Attributes["Version"].Value;
 			return true;
 		}
 
-		private static bool TryGetSpecflowVersionFromImports(FileInfo csproj, XmlElement root, out string version)
+		private static bool TryGetSpecFlowVersionFromImports(FileInfo csproj, XmlElement root, out string version)
 		{
 			var importNodes = root.SelectNodes("//Import");
+
 			foreach (XmlNode import in importNodes)
 			{
 				var relativePath = import.Attributes["Project"].Value;
 				var fullPath = Path.Combine(csproj.DirectoryName, relativePath);
+
 				if (!File.Exists(fullPath))
 					continue;
+
 				var importInfo = new FileInfo(fullPath);
+
 				if (TryGetSpecFlowVersion(importInfo, out version))
 					return true;
 			}
@@ -107,9 +113,7 @@ public IEnumerable<FileInfo> GetFeatureFromLinks(FileInfo csproj)
 				var include = node.Attributes["Include"].Value;
 
 				if (File.Exists(include) && Path.GetExtension(include).Equals(".feature", StringComparison.OrdinalIgnoreCase))
-				{
 					yield return new FileInfo(include);
-				}
 			}
 		}
 
@@ -128,6 +132,7 @@ public void Fix(DirectoryInfo directory)
 			EnsureSpecFlow(csproj);
 
 			var fakeCsproj = SaveFakeCsProj(directory, csproj);
+
 			try
 			{
 				GenerateSpecFlowGlue(directory, fakeCsproj, csproj);
@@ -136,6 +141,7 @@ public void Fix(DirectoryInfo directory)
 			{
 				DeleteFakeCsProj(fakeCsproj);
 			}
+
 			FixTests(directory);
 
 			if (missingGeneratedFiles.Any())
@@ -150,19 +156,17 @@ private void EnsureSpecFlow(FileInfo csproj)
 			if (string.IsNullOrWhiteSpace(_specFlowExe))
 			{
 				if (!TryGetSpecFlowVersion(csproj, out _specFlowVersion))
-				{
 					throw new XmlException("Could not get SpecFlow version from: " + csproj.FullName);
-				}
 
 				_specFlowExe = FindSpecFlow(_specFlowVersion);
 				WriteLine("Found: " + _specFlowExe);
+
 				return;
 			}
 
 			if (File.Exists(_specFlowExe))
-			{
 				return;
-			}
+
 			throw new FileNotFoundException("Path to SpecFlow was supplied as an argument, but doesn't exist: " + _specFlowExe);
 		}
 
@@ -209,6 +213,7 @@ private static string FixXunit(string content)
 		{
 			content = content.Replace(" : Xunit.IUseFixture<", " : Xunit.IClassFixture<");
 			content = content.Replace("[Xunit.Extensions", "[Xunit");
+
 			return content;
 		}
 
@@ -223,10 +228,12 @@ private void RunSpecFlow(string csproj)
 		{
 			// Credit: http://www.marcusoft.net/2010/12/specflowexe-and-mstest.html
 			var arguments = "generateall ";
+
 			// Version 2.4.0 and higher require the -p parameter
 			// Version 2.3.2 and below cannot work with the -p parameter so we can't add
 			var projectParameterVersion = Version.Parse("2.4.0");
 			var localSpecFlowVersion = Version.Parse(_specFlowVersion);
+
 			if (localSpecFlowVersion >= projectParameterVersion)
 				arguments += $@"-p ""{csproj}"" --force --verbose";
 			else