code review adjustments

arturcic · arturcic · commit 8219706eb58b · 2019-10-25T23:45:03.000+03:00
diff --git a/src/GitVersionCore.Tests/Extensions/ExtensionMethodsTests.cs b/src/GitVersionCore.Tests/Extensions/ExtensionMethodsTests.cs
@@ -1,5 +1,5 @@
-using GitVersion.Helpers;
 using NUnit.Framework;
+using GitVersion.Extensions;
 
 namespace GitVersionCore.Tests.Extensions
 {
diff --git a/src/GitVersionCore.Tests/GitRepoMetadataProviderTests.cs b/src/GitVersionCore.Tests/GitRepoMetadataProviderTests.cs
@@ -5,8 +5,8 @@
 using GitVersionCore.Tests.IntegrationTests;
 using NUnit.Framework;
 using Shouldly;
-using GitVersion.Helpers;
 using GitVersion.Logging;
+using GitVersion.Extensions;
 
 namespace GitVersionCore.Tests
 {
diff --git a/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs
@@ -5,11 +5,11 @@
 using GitVersion.OutputVariables;
 using LibGit2Sharp;
 using Shouldly;
-using GitVersion.Helpers;
 using GitVersion.Logging;
 using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.VersionCalculation;
 using Microsoft.Extensions.Options;
+using GitVersion.Extensions;
 
 namespace GitVersionCore.Tests
 {
diff --git a/src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs b/src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs
@@ -2,7 +2,7 @@
 using GitTools.Testing;
 using NUnit.Framework;
 using Shouldly;
-using GitVersion.Helpers;
+using GitVersion.Extensions;
 
 namespace GitVersionCore.Tests.IntegrationTests
 {
diff --git a/src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs b/src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs
@@ -5,10 +5,10 @@
 using GitTools.Testing;
 using GitVersion;
 using GitVersion.Configuration;
-using GitVersion.Helpers;
 using GitVersion.VersioningModes;
 using LibGit2Sharp;
 using NUnit.Framework;
+using GitVersion.Extensions;
 
 namespace GitVersionCore.Tests.IntegrationTests
 {
diff --git a/src/GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs
@@ -1,7 +1,7 @@
 using GitTools.Testing;
 using LibGit2Sharp;
 using NUnit.Framework;
-using GitVersion.Helpers;
+using GitVersion.Extensions;
 
 namespace GitVersionCore.Tests.IntegrationTests
 {
diff --git a/src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
@@ -10,8 +10,8 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;
-using GitVersion.Helpers;
 using GitVersion.Logging;
+using GitVersion.Extensions;
 
 namespace GitVersionCore.Tests.VersionCalculation
 {
diff --git a/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -8,9 +8,9 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;
-using GitVersion.Helpers;
 using GitVersion.Logging;
 using GitVersion;
+using GitVersion.Extensions;
 
 namespace GitVersionCore.Tests.VersionCalculation
 {
diff --git a/src/GitVersionCore/BuildServers/AzurePipelines.cs b/src/GitVersionCore/BuildServers/AzurePipelines.cs
@@ -2,8 +2,8 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.OutputVariables;
-using GitVersion.Helpers;
 using GitVersion.Logging;
+using GitVersion.Extensions;
 
 namespace GitVersion.BuildServers
 {
diff --git a/src/GitVersionCore/Configuration/BranchConfigurationCalculator.cs b/src/GitVersionCore/Configuration/BranchConfigurationCalculator.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using GitVersion.Helpers;
 using GitVersion.Logging;
 using LibGit2Sharp;
+using GitVersion.Extensions;
 
 namespace GitVersion.Configuration
 {
diff --git a/src/GitVersionCore/Configuration/Config.cs b/src/GitVersionCore/Configuration/Config.cs
@@ -5,12 +5,11 @@
 using GitVersion.VersioningModes;
 using YamlDotNet.Serialization;
 using GitVersion.Extensions;
+using System.IO;
+using System.Text;
 
 namespace GitVersion.Configuration
 {
-    using System.IO;
-    using System.Text;
-
     public class Config
     {
         private readonly Dictionary<string, BranchConfig> branches = new Dictionary<string, BranchConfig>();
diff --git a/src/GitVersionCore/Configuration/ConfigExtensions.cs b/src/GitVersionCore/Configuration/ConfigExtensions.cs
@@ -2,12 +2,11 @@
 using System.Linq;
 using GitVersion.Extensions;
 using GitVersion.VersioningModes;
+using System;
+using System.Text.RegularExpressions;
 
 namespace GitVersion.Configuration
 {
-    using System;
-    using System.Text.RegularExpressions;
-
     public static class ConfigExtensions
     {
         public static void Reset(this Config config)
diff --git a/src/GitVersionCore/Extensions/EnumerableExtensions.cs b/src/GitVersionCore/Extensions/EnumerableExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Extensions
 {
     public static class EnumerableExtensions
     {
diff --git a/src/GitVersionCore/Extensions/LibGitExtensions.cs b/src/GitVersionCore/Extensions/LibGitExtensions.cs
@@ -4,9 +4,10 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
+using GitVersion.Helpers;
 using LibGit2Sharp;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Extensions
 {
     public static class LibGitExtensions
     {
diff --git a/src/GitVersionCore/Extensions/ReadEmbeddedResourceExtensions.cs b/src/GitVersionCore/Extensions/ReadEmbeddedResourceExtensions.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Extensions
 {
     public static class ReadEmbeddedResourceExtensions
     {
diff --git a/src/GitVersionCore/Extensions/StringExtensions.cs b/src/GitVersionCore/Extensions/StringExtensions.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Extensions
 {
     public static class StringExtensions
     {
diff --git a/src/GitVersionCore/Extensions/TemplateManager.cs b/src/GitVersionCore/Extensions/TemplateManager.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using GitVersion.Helpers;
 
 namespace GitVersion.Extensions
 {
diff --git a/src/GitVersionCore/GitRepoMetadataProvider.cs b/src/GitVersionCore/GitRepoMetadataProvider.cs
@@ -4,8 +4,8 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Configuration;
-using GitVersion.Helpers;
 using GitVersion.Logging;
+using GitVersion.Extensions;
 
 namespace GitVersion
 {
diff --git a/src/GitVersionCore/GitVersionContext.cs b/src/GitVersionCore/GitVersionContext.cs
@@ -2,8 +2,8 @@
 using System;
 using System.Linq;
 using GitVersion.Configuration;
-using GitVersion.Helpers;
 using GitVersion.Logging;
+using GitVersion.Extensions;
 
 namespace GitVersion
 {
diff --git a/src/GitVersionCore/GitVersionFinder.cs b/src/GitVersionCore/GitVersionFinder.cs
@@ -2,8 +2,8 @@
 using System.IO;
 using GitVersion.Exceptions;
 using GitVersion.VersionCalculation;
-using GitVersion.Helpers;
 using GitVersion.Logging;
+using GitVersion.Extensions;
 
 namespace GitVersion
 {
diff --git a/src/GitVersionCore/Helpers/GitRepositoryHelper.cs b/src/GitVersionCore/Helpers/GitRepositoryHelper.cs
@@ -3,6 +3,7 @@
 using GitVersion.Exceptions;
 using GitVersion.Logging;
 using LibGit2Sharp;
+using GitVersion.Extensions;
 
 namespace GitVersion.Helpers
 {
diff --git a/src/GitVersionCore/IncrementStrategyFinder.cs b/src/GitVersionCore/IncrementStrategyFinder.cs
@@ -3,12 +3,11 @@
 using System.Text.RegularExpressions;
 using GitVersion.VersionCalculation.BaseVersionCalculators;
 using LibGit2Sharp;
-using GitVersion.Helpers;
+using GitVersion.Configuration;
+using GitVersion.Extensions;
 
 namespace GitVersion
 {
-    using GitVersion.Configuration;
-
     public enum CommitMessageIncrementMode
     {
         Enabled,
diff --git a/src/GitVersionCore/OutputFormatters/JsonOutputFormatter.cs b/src/GitVersionCore/OutputFormatters/JsonOutputFormatter.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text;
 using GitVersion.OutputVariables;
-using GitVersion.Helpers;
+using GitVersion.Extensions;
 
 namespace GitVersion.OutputFormatters
 {
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs
@@ -2,13 +2,12 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using LibGit2Sharp;
-using GitVersion.Helpers;
 using GitVersion.Logging;
+using GitVersion.Configuration;
+using GitVersion.Extensions;
 
 namespace GitVersion.VersionCalculation.BaseVersionCalculators
 {
-    using GitVersion.Configuration;
-
     /// <summary>
     /// Version is extracted from older commits's merge messages.
     /// BaseVersionSource is the commit where the message was found.
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using LibGit2Sharp;
-using GitVersion.Helpers;
+using GitVersion.Extensions;
 
 namespace GitVersion.VersionCalculation.BaseVersionCalculators
 {
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using GitVersion.Helpers;
 using LibGit2Sharp;
+using GitVersion.Extensions;
 
 namespace GitVersion.VersionCalculation.BaseVersionCalculators
 {
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
 using LibGit2Sharp;
-using GitVersion.Helpers;
+using GitVersion.Configuration;
+using GitVersion.Extensions;
 
 namespace GitVersion.VersionCalculation.BaseVersionCalculators
 {
-    using GitVersion.Configuration;
-
     /// <summary>
     /// Version is extracted from the name of the branch.
     /// BaseVersionSource is the commit where the branch was branched from its parent.
diff --git a/src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs
@@ -4,13 +4,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using GitVersion.Helpers;
 using GitVersion.Logging;
+using GitVersion.Configuration;
+using GitVersion.Extensions;
 
 namespace GitVersion.VersionCalculation
 {
-    using GitVersion.Configuration;
-
     internal class MainlineVersionCalculator : IMainlineVersionCalculator
     {
         private readonly IMetaDataCalculator metaDataCalculator;
diff --git a/src/GitVersionCore/VersionCalculation/MetaDataCalculator.cs b/src/GitVersionCore/VersionCalculation/MetaDataCalculator.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using LibGit2Sharp;
-using GitVersion.Helpers;
 using GitVersion.Logging;
+using GitVersion.Extensions;
 
 namespace GitVersion.VersionCalculation
 {
diff --git a/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs
@@ -4,8 +4,8 @@
 using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersion.VersioningModes;
 using GitVersion.Configuration;
-using GitVersion.Helpers;
 using GitVersion.Logging;
+using GitVersion.Extensions;
 
 namespace GitVersion.VersionCalculation
 {
diff --git a/src/GitVersionCore/VersionFilters/MinDateVersionFilter.cs b/src/GitVersionCore/VersionFilters/MinDateVersionFilter.cs
@@ -1,6 +1,6 @@
 using System;
 using GitVersion.VersionCalculation.BaseVersionCalculators;
-using GitVersion.Helpers;
+using GitVersion.Extensions;
 
 namespace GitVersion.VersionFilters
 {
diff --git a/src/GitVersionCore/VersioningModes/ContinuousDeliveryMode.cs b/src/GitVersionCore/VersioningModes/ContinuousDeliveryMode.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using LibGit2Sharp;
-using GitVersion.Helpers;
+using GitVersion.Extensions;
 
 namespace GitVersion.VersioningModes
 {
diff --git a/src/GitVersionExe/ArgumentParser.cs b/src/GitVersionExe/ArgumentParser.cs
@@ -5,10 +5,10 @@
 using System.Linq;
 using GitVersion.Configuration;
 using GitVersion.Exceptions;
-using GitVersion.Helpers;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 using GitVersion.OutputFormatters;
+using GitVersion.Extensions;
 
 namespace GitVersion
 {
diff --git a/src/GitVersionExe/GitVersionExecutor.cs b/src/GitVersionExe/GitVersionExecutor.cs
@@ -3,9 +3,9 @@
 using System.Reflection;
 using GitVersion.Configuration;
 using GitVersion.Exceptions;
-using GitVersion.Helpers;
 using GitVersion.Logging;
 using GitVersion.OutputFormatters;
+using GitVersion.Extensions;
 
 namespace GitVersion
 {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using GitVersion.Helpers;`
`2`	`1`	`using NUnit.Framework;`
	`2`	`+using GitVersion.Extensions;`
`3`	`3`
`4`	`4`	`namespace GitVersionCore.Tests.Extensions`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`using GitVersionCore.Tests.IntegrationTests;`
`6`	`6`	`using NUnit.Framework;`
`7`	`7`	`using Shouldly;`
`8`		`-using GitVersion.Helpers;`
`9`	`8`	`using GitVersion.Logging;`
	`9`	`+using GitVersion.Extensions;`
`10`	`10`
`11`	`11`	`namespace GitVersionCore.Tests`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using GitTools.Testing;`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using Shouldly;`
`5`		`-using GitVersion.Helpers;`
	`5`	`+using GitVersion.Extensions;`
`6`	`6`
`7`	`7`	`namespace GitVersionCore.Tests.IntegrationTests`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using GitTools.Testing;`
`2`	`2`	`using LibGit2Sharp;`
`3`	`3`	`using NUnit.Framework;`
`4`		`-using GitVersion.Helpers;`
	`4`	`+using GitVersion.Extensions;`
`5`	`5`
`6`	`6`	`namespace GitVersionCore.Tests.IntegrationTests`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`using LibGit2Sharp;`
`11`	`11`	`using NUnit.Framework;`
`12`	`12`	`using Shouldly;`
`13`		`-using GitVersion.Helpers;`
`14`	`13`	`using GitVersion.Logging;`
	`14`	`+using GitVersion.Extensions;`
`15`	`15`
`16`	`16`	`namespace GitVersionCore.Tests.VersionCalculation`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Text.RegularExpressions;`
`4`	`4`	`using GitVersion.OutputVariables;`
`5`		`-using GitVersion.Helpers;`
`6`	`5`	`using GitVersion.Logging;`
	`6`	`+using GitVersion.Extensions;`
`7`	`7`
`8`	`8`	`namespace GitVersion.BuildServers`
`9`	`9`	`{`