diff --git a/.editorconfig b/.editorconfig index 7280cb9f65..b0bf5f3a30 100644 --- a/.editorconfig +++ b/.editorconfig @@ -158,9 +158,20 @@ resharper_csharp_use_roslyn_logic_for_evident_types = true # Alignment resharper_csharp_align_multiline_parameter = true -# Qualify fields with "this." +# Qualify fields with `this.` in ReSharper resharper_csharp_instance_members_qualify_members = field +# Qualify fields with `this.` in Roslyn +dotnet_style_qualification_for_field = true:error + +# Do not qualify properties, methods, and events with `this.` in Roslyn +dotnet_style_qualification_for_property = false:error +dotnet_style_qualification_for_method = false:error +dotnet_style_qualification_for_event = false:error + +# Make missing `this.` qualification an error +dotnet_diagnostic.IDE0009.severity = error + # IDE0005: Using directive is unnecessary. dotnet_diagnostic.ide0005.severity = warning diff --git a/.github/skills/dotnet-dev/SKILL.md b/.github/skills/dotnet-dev/SKILL.md index a7a83ab48f..baa8d73a92 100644 --- a/.github/skills/dotnet-dev/SKILL.md +++ b/.github/skills/dotnet-dev/SKILL.md @@ -151,7 +151,7 @@ public string RequiredProperty { get; set; } = string.Empty; Use file-scoped namespaces: ```csharp -namespace GitVersion.Core; +namespace GitVersion; public class MyClass { diff --git a/new-cli/GitVersion.Calculation/CalculateCommand.cs b/new-cli/GitVersion.Calculation/CalculateCommand.cs index 6b3dbb798a..b24b97f567 100644 --- a/new-cli/GitVersion.Calculation/CalculateCommand.cs +++ b/new-cli/GitVersion.Calculation/CalculateCommand.cs @@ -9,20 +9,20 @@ public record CalculateSettings : GitVersionSettings; [Command("calculate", "Calculates the version object from the git history.")] public class CalculateCommand(ILogger logger, IService service, IGitRepository repository) : ICommand { - private readonly ILogger _logger = logger.NotNull(); - private readonly IService _service = service.NotNull(); - private readonly IGitRepository _repository = repository.NotNull(); + private readonly ILogger logger = logger.NotNull(); + private readonly IService service = service.NotNull(); + private readonly IGitRepository repository = repository.NotNull(); public Task InvokeAsync(CalculateSettings settings, CancellationToken cancellationToken = default) { - var value = _service.Call(); + var value = this.service.Call(); if (settings.WorkDir != null) { - _repository.DiscoverRepository(settings.WorkDir.FullName); - var branches = _repository.Branches.ToList(); - _logger.LogInformation("Command : 'calculate', LogFile : '{logFile}', WorkDir : '{workDir}' ", + this.repository.DiscoverRepository(settings.WorkDir.FullName); + var branches = this.repository.Branches.ToList(); + this.logger.LogInformation("Command : 'calculate', LogFile : '{logFile}', WorkDir : '{workDir}' ", settings.LogFile, settings.WorkDir); - _logger.LogInformation("Found {count} branches", branches.Count); + this.logger.LogInformation("Found {count} branches", branches.Count); } return Task.FromResult(value); diff --git a/new-cli/GitVersion.Cli.Generator/TypeVisitor.cs b/new-cli/GitVersion.Cli.Generator/TypeVisitor.cs index 6507afdd7d..e2f5e0f897 100644 --- a/new-cli/GitVersion.Cli.Generator/TypeVisitor.cs +++ b/new-cli/GitVersion.Cli.Generator/TypeVisitor.cs @@ -3,9 +3,9 @@ namespace GitVersion; internal class TypeVisitor(Func searchQuery, CancellationToken cancellation) : SymbolVisitor { - private readonly HashSet _exportedTypes = new(SymbolEqualityComparer.Default); + private readonly HashSet exportedTypes = new(SymbolEqualityComparer.Default); - public ImmutableArray GetResults() => [.. _exportedTypes]; + public ImmutableArray GetResults() => [.. this.exportedTypes]; public override void VisitAssembly(IAssemblySymbol symbol) { @@ -28,7 +28,7 @@ public override void VisitNamedType(INamedTypeSymbol type) if (searchQuery(type)) { - _exportedTypes.Add(type); + this.exportedTypes.Add(type); } } } diff --git a/new-cli/GitVersion.Configuration/ConfigCommand.cs b/new-cli/GitVersion.Configuration/ConfigCommand.cs index 7fde5361e2..23f7d2621b 100644 --- a/new-cli/GitVersion.Configuration/ConfigCommand.cs +++ b/new-cli/GitVersion.Configuration/ConfigCommand.cs @@ -8,13 +8,13 @@ public record ConfigSettings : GitVersionSettings; [Command("config", "Manages the GitVersion configuration file.")] public class ConfigCommand(ILogger logger, IService service) : ICommand { - private readonly ILogger _logger = logger.NotNull(); - private readonly IService _service = service.NotNull(); + private readonly ILogger logger = logger.NotNull(); + private readonly IService service = service.NotNull(); public Task InvokeAsync(ConfigSettings settings, CancellationToken cancellationToken = default) { - var value = _service.Call(); - _logger.LogInformation($"Command : 'config', LogFile : '{settings.LogFile}', WorkDir : '{settings.WorkDir}' "); + var value = this.service.Call(); + this.logger.LogInformation($"Command : 'config', LogFile : '{settings.LogFile}', WorkDir : '{settings.WorkDir}' "); return Task.FromResult(value); } } diff --git a/new-cli/GitVersion.Configuration/Init/ConfigInitCommand.cs b/new-cli/GitVersion.Configuration/Init/ConfigInitCommand.cs index 1a1298e3be..8417453de0 100644 --- a/new-cli/GitVersion.Configuration/Init/ConfigInitCommand.cs +++ b/new-cli/GitVersion.Configuration/Init/ConfigInitCommand.cs @@ -8,13 +8,13 @@ public record ConfigInitSettings : ConfigSettings; [Command("init", "Inits the configuration for current repository.")] public class ConfigInitCommand(ILogger logger, IService service) : ICommand { - private readonly ILogger _logger = logger.NotNull(); - private readonly IService _service = service.NotNull(); + private readonly ILogger logger = logger.NotNull(); + private readonly IService service = service.NotNull(); public Task InvokeAsync(ConfigInitSettings settings, CancellationToken cancellationToken = default) { - var value = _service.Call(); - _logger.LogInformation($"Command : 'config init', LogFile : '{settings.LogFile}', WorkDir : '{settings.WorkDir}' "); + var value = this.service.Call(); + this.logger.LogInformation($"Command : 'config init', LogFile : '{settings.LogFile}', WorkDir : '{settings.WorkDir}' "); return Task.FromResult(value); } } diff --git a/new-cli/GitVersion.Configuration/Show/ConfigShowCommand.cs b/new-cli/GitVersion.Configuration/Show/ConfigShowCommand.cs index 6da714ca22..dc2eac2bd1 100644 --- a/new-cli/GitVersion.Configuration/Show/ConfigShowCommand.cs +++ b/new-cli/GitVersion.Configuration/Show/ConfigShowCommand.cs @@ -8,13 +8,13 @@ public record ConfigShowSettings : ConfigSettings; [Command("show", "Shows the effective configuration.")] public class ConfigShowCommand(ILogger logger, IService service) : ICommand { - private readonly ILogger _logger = logger.NotNull(); - private readonly IService _service = service.NotNull(); + private readonly ILogger logger = logger.NotNull(); + private readonly IService service = service.NotNull(); public Task InvokeAsync(ConfigShowSettings settings, CancellationToken cancellationToken = default) { - var value = _service.Call(); - _logger.LogInformation($"Command : 'config show', LogFile : '{settings.LogFile}', WorkDir : '{settings.WorkDir}' "); + var value = this.service.Call(); + this.logger.LogInformation($"Command : 'config show', LogFile : '{settings.LogFile}', WorkDir : '{settings.WorkDir}' "); return Task.FromResult(value); } } diff --git a/new-cli/GitVersion.Core/Infrastructure/LoggingEnricher.cs b/new-cli/GitVersion.Core/Infrastructure/LoggingEnricher.cs index c20dadce14..1f51ddfec9 100644 --- a/new-cli/GitVersion.Core/Infrastructure/LoggingEnricher.cs +++ b/new-cli/GitVersion.Core/Infrastructure/LoggingEnricher.cs @@ -6,11 +6,11 @@ namespace GitVersion.Infrastructure; public class LoggingEnricher : ILogEventEnricher { public static readonly LoggingLevelSwitch LogLevel = new(); - private string? _cachedLogFilePath; - private LogEventProperty? _cachedLogFilePathProp; + private string? cachedLogFilePath; + private LogEventProperty? cachedLogFilePathProp; // this path and level will be set by the LogInterceptor.cs after parsing the settings - private static string _path = string.Empty; + private static string path = string.Empty; public const string LogFilePathPropertyName = "LogFilePath"; @@ -20,17 +20,17 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propFactory) // we won't have the setting, so a default value for the log file will be required LogEventProperty logFilePathProp; - if (_cachedLogFilePathProp != null && _path.Equals(_cachedLogFilePath)) + if (this.cachedLogFilePathProp != null && path.Equals(this.cachedLogFilePath)) { // The Path hasn't changed, so let's use the cached property - logFilePathProp = _cachedLogFilePathProp; + logFilePathProp = this.cachedLogFilePathProp; } else { // We've got a new path for the log. Let's create a new property // and cache it for future log events to use - _cachedLogFilePath = _path; - _cachedLogFilePathProp = logFilePathProp = propFactory.CreateProperty(LogFilePathPropertyName, _path); + this.cachedLogFilePath = path; + this.cachedLogFilePathProp = logFilePathProp = propFactory.CreateProperty(LogFilePathPropertyName, path); } logEvent.AddPropertyIfAbsent(logFilePathProp); @@ -38,7 +38,7 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propFactory) public static void Configure(string? logFile, Verbosity verbosity) { - if (!string.IsNullOrWhiteSpace(logFile)) _path = logFile; + if (!string.IsNullOrWhiteSpace(logFile)) path = logFile; LogLevel.MinimumLevel = GetLevelForVerbosity(verbosity); } diff --git a/new-cli/GitVersion.Normalization/NormalizeCommand.cs b/new-cli/GitVersion.Normalization/NormalizeCommand.cs index ed38ea327b..8f1e13547f 100644 --- a/new-cli/GitVersion.Normalization/NormalizeCommand.cs +++ b/new-cli/GitVersion.Normalization/NormalizeCommand.cs @@ -8,13 +8,13 @@ public record NormalizeSettings : GitVersionSettings; [Command("normalize", "Normalizes the git repository for GitVersion calculations.")] public class NormalizeCommand(ILogger logger, IService service) : ICommand { - private readonly ILogger _logger = logger.NotNull(); - private readonly IService _service = service.NotNull(); + private readonly ILogger logger = logger.NotNull(); + private readonly IService service = service.NotNull(); public Task InvokeAsync(NormalizeSettings settings, CancellationToken cancellationToken = default) { - var value = _service.Call(); - _logger.LogInformation($"Command : 'normalize', LogFile : '{settings.LogFile}', WorkDir : '{settings.WorkDir}' "); + var value = this.service.Call(); + this.logger.LogInformation($"Command : 'normalize', LogFile : '{settings.LogFile}', WorkDir : '{settings.WorkDir}' "); return Task.FromResult(value); } } diff --git a/new-cli/GitVersion.Output/AssemblyInfo/OutputAssemblyInfoCommand.cs b/new-cli/GitVersion.Output/AssemblyInfo/OutputAssemblyInfoCommand.cs index 44c373ef46..2d8903d44a 100644 --- a/new-cli/GitVersion.Output/AssemblyInfo/OutputAssemblyInfoCommand.cs +++ b/new-cli/GitVersion.Output/AssemblyInfo/OutputAssemblyInfoCommand.cs @@ -6,15 +6,15 @@ namespace GitVersion.Commands; [Command("assemblyinfo", "Outputs version to assembly")] public class OutputAssemblyInfoCommand(ILogger logger, IService service) : ICommand { - private readonly ILogger _logger = logger.NotNull(); - private readonly IService _service = service.NotNull(); + private readonly ILogger logger = logger.NotNull(); + private readonly IService service = service.NotNull(); public Task InvokeAsync(OutputAssemblyInfoSettings settings, CancellationToken cancellationToken = default) { - var value = _service.Call(); + var value = this.service.Call(); var versionInfo = settings.VersionInfo.Value; - _logger.LogInformation($"Command : 'output assemblyinfo', LogFile : '{settings.LogFile}', WorkDir : '{settings.OutputDir}', InputFile: '{settings.InputFile}', AssemblyInfo: '{settings.AssemblyinfoFile}' "); - _logger.LogInformation($"Version info: {versionInfo}"); + this.logger.LogInformation($"Command : 'output assemblyinfo', LogFile : '{settings.LogFile}', WorkDir : '{settings.OutputDir}', InputFile: '{settings.InputFile}', AssemblyInfo: '{settings.AssemblyinfoFile}' "); + this.logger.LogInformation($"Version info: {versionInfo}"); return Task.FromResult(value); } } diff --git a/new-cli/GitVersion.Output/OutputCommand.cs b/new-cli/GitVersion.Output/OutputCommand.cs index 2791d211cf..93d625b230 100644 --- a/new-cli/GitVersion.Output/OutputCommand.cs +++ b/new-cli/GitVersion.Output/OutputCommand.cs @@ -6,13 +6,13 @@ namespace GitVersion.Commands; [Command("output", "Outputs the version object.")] public class OutputCommand(ILogger logger, IService service) : ICommand { - private readonly ILogger _logger = logger.NotNull(); - private readonly IService _service = service.NotNull(); + private readonly ILogger logger = logger.NotNull(); + private readonly IService service = service.NotNull(); public Task InvokeAsync(OutputSettings settings, CancellationToken cancellationToken = default) { - var value = _service.Call(); - _logger.LogInformation($"Command : 'output', LogFile : '{settings.LogFile}', WorkDir : '{settings.WorkDir}' "); + var value = this.service.Call(); + this.logger.LogInformation($"Command : 'output', LogFile : '{settings.LogFile}', WorkDir : '{settings.WorkDir}' "); return Task.FromResult(value); } } diff --git a/new-cli/GitVersion.Output/Project/OutputProjectCommand.cs b/new-cli/GitVersion.Output/Project/OutputProjectCommand.cs index 2608bc51fb..abeeb5594e 100644 --- a/new-cli/GitVersion.Output/Project/OutputProjectCommand.cs +++ b/new-cli/GitVersion.Output/Project/OutputProjectCommand.cs @@ -6,13 +6,13 @@ namespace GitVersion.Commands; [Command("project", "Outputs version to project")] public class OutputProjectCommand(ILogger logger, IService service) : ICommand { - private readonly ILogger _logger = logger.NotNull(); - private readonly IService _service = service.NotNull(); + private readonly ILogger logger = logger.NotNull(); + private readonly IService service = service.NotNull(); public Task InvokeAsync(OutputProjectSettings settings, CancellationToken cancellationToken = default) { - var value = _service.Call(); - _logger.LogInformation($"Command : 'output project', LogFile : '{settings.LogFile}', WorkDir : '{settings.OutputDir}', InputFile: '{settings.InputFile}', Project: '{settings.ProjectFile}' "); + var value = this.service.Call(); + this.logger.LogInformation($"Command : 'output project', LogFile : '{settings.LogFile}', WorkDir : '{settings.OutputDir}', InputFile: '{settings.InputFile}', Project: '{settings.ProjectFile}' "); return Task.FromResult(value); } } diff --git a/new-cli/GitVersion.Output/Wix/OutputWixCommand.cs b/new-cli/GitVersion.Output/Wix/OutputWixCommand.cs index abe89f7e9e..63001d572f 100644 --- a/new-cli/GitVersion.Output/Wix/OutputWixCommand.cs +++ b/new-cli/GitVersion.Output/Wix/OutputWixCommand.cs @@ -6,13 +6,13 @@ namespace GitVersion.Commands; [Command("wix", "Outputs version to wix file")] public class OutputWixCommand(ILogger logger, IService service) : ICommand { - private readonly ILogger _logger = logger.NotNull(); - private readonly IService _service = service.NotNull(); + private readonly ILogger logger = logger.NotNull(); + private readonly IService service = service.NotNull(); public Task InvokeAsync(OutputWixSettings settings, CancellationToken cancellationToken = default) { - var value = _service.Call(); - _logger.LogInformation($"Command : 'output wix', LogFile : '{settings.LogFile}', WorkDir : '{settings.OutputDir}', InputFile: '{settings.InputFile}', WixFile: '{settings.WixFile}' "); + var value = this.service.Call(); + this.logger.LogInformation($"Command : 'output wix', LogFile : '{settings.LogFile}', WorkDir : '{settings.OutputDir}', InputFile: '{settings.InputFile}', WixFile: '{settings.WixFile}' "); return Task.FromResult(value); } } diff --git a/new-cli/GitVersion.sln.DotSettings b/new-cli/GitVersion.sln.DotSettings index ca580a27b8..71f967e9dc 100644 --- a/new-cli/GitVersion.sln.DotSettings +++ b/new-cli/GitVersion.sln.DotSettings @@ -1,2 +1,729 @@ - - True \ No newline at end of file + + + True + + True + + False + SOLUTION + DO_NOT_SHOW + ERROR + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + DO_NOT_SHOW + DO_NOT_SHOW + ERROR + DO_NOT_SHOW + DO_NOT_SHOW + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + WARNING + ERROR + DO_NOT_SHOW + DO_NOT_SHOW + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + SUGGESTION + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + WARNING + ERROR + ERROR + ERROR + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + DoHide + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + ERROR + DO_NOT_SHOW + SUGGESTION + WARNING + + ERROR + ERROR + ERROR + ERROR + ERROR + <?xml version="1.0" encoding="utf-16"?><Profile name="C# Only"><XAMLCollapseEmptyTags>False</XAMLCollapseEmptyTags><CSReformatCode>True</CSReformatCode><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><IDEA_SETTINGS>&lt;profile version="1.0"&gt; + &lt;option name="myName" value="C# Only" /&gt; + &lt;inspection_tool class="ES6ShorthandObjectProperty" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="JSArrowFunctionBracesCanBeRemoved" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="JSPrimitiveTypeWrapperUsage" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="JSRemoveUnnecessaryParentheses" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="JSUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="TypeScriptExplicitMemberType" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="UnnecessaryContinueJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="UnnecessaryLabelJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="UnnecessaryLabelOnBreakStatementJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="UnnecessaryLabelOnContinueStatementJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="UnnecessaryReturnJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; + &lt;inspection_tool class="WrongPropertyKeyValueDelimiter" enabled="false" level="WEAK WARNING" enabled_by_default="false" /&gt; +&lt;/profile&gt;</IDEA_SETTINGS><RIDER_SETTINGS>&lt;profile&gt; + &lt;Language id="CSS"&gt; + &lt;Rearrange&gt;false&lt;/Rearrange&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="EditorConfig"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="HTML"&gt; + &lt;Rearrange&gt;false&lt;/Rearrange&gt; + &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="HTTP Request"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="Handlebars"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="Ini"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="JSON"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="Jade"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="JavaScript"&gt; + &lt;Rearrange&gt;false&lt;/Rearrange&gt; + &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="Markdown"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="Properties"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="RELAX-NG"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="SQL"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="XML"&gt; + &lt;Rearrange&gt;false&lt;/Rearrange&gt; + &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="yaml"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;/Language&gt; +&lt;/profile&gt;</RIDER_SETTINGS><CSReorderTypeMembers>True</CSReorderTypeMembers><CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences></Profile> + + <?xml version="1.0" encoding="utf-16"?><Profile name="GitVersion"><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseVar><BehavourStyle>CAN_CHANGE_TO_IMPLICIT</BehavourStyle><LocalVariableStyle>ALWAYS_IMPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_IMPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers><JsInsertSemicolon>True</JsInsertSemicolon><JsReformatCode>True</JsReformatCode><CssReformatCode>True</CssReformatCode><CSArrangeThisQualifier>True</CSArrangeThisQualifier><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><HtmlReformatCode>True</HtmlReformatCode><CSShortenReferences>True</CSShortenReferences><CSharpFormatDocComments>True</CSharpFormatDocComments><CssAlphabetizeProperties>True</CssAlphabetizeProperties><CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><IDEA_SETTINGS>&lt;profile version="1.0"&gt; + &lt;option name="myName" value="GitVersion" /&gt; +&lt;/profile&gt;</IDEA_SETTINGS><RIDER_SETTINGS>&lt;profile&gt; + &lt;Language id=""&gt; + &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; + &lt;/Language&gt; + &lt;Language id="CMake"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="CSS"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;Rearrange&gt;true&lt;/Rearrange&gt; + &lt;/Language&gt; + &lt;Language id="EditorConfig"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="HTML"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;OptimizeImports&gt;true&lt;/OptimizeImports&gt; + &lt;Rearrange&gt;true&lt;/Rearrange&gt; + &lt;/Language&gt; + &lt;Language id="HTTP Request"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="Handlebars"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="Ini"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="JSON"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="Jade"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="JavaScript"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;OptimizeImports&gt;true&lt;/OptimizeImports&gt; + &lt;Rearrange&gt;true&lt;/Rearrange&gt; + &lt;/Language&gt; + &lt;Language id="Markdown"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="Properties"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="RELAX-NG"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="Razor"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="SQL"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="VueExpr"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; + &lt;Language id="XML"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;OptimizeImports&gt;true&lt;/OptimizeImports&gt; + &lt;Rearrange&gt;true&lt;/Rearrange&gt; + &lt;/Language&gt; + &lt;Language id="yaml"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; +&lt;/profile&gt;</RIDER_SETTINGS><UpgradedBackendToFrontendHtml>True</UpgradedBackendToFrontendHtml><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly></Profile> + Default: Reformat Code + GitVersion + False + False + ALWAYS_ADD + ALWAYS_ADD + ALWAYS_ADD + ALWAYS_ADD + ALWAYS_ADD + NEVER + False + + + CHOP_IF_LONG + False + CHOP_ALWAYS + CHOP_ALWAYS + True + True + <?xml version="1.0" encoding="utf-16"?> +<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> + <TypePattern DisplayName="COM interfaces or structs"> + <TypePattern.Match> + <Or> + <And> + <Kind Is="Interface" /> + <Or> + <HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /> + <HasAttribute Name="System.Runtime.InteropServices.ComImport" /> + </Or> + </And> + <Kind Is="Struct" /> + </Or> + </TypePattern.Match> + </TypePattern> + <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> + <TypePattern.Match> + <And> + <Kind Is="Class" /> + <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.TestCaseFixtureAttribute" Inherited="True" /> + </And> + </TypePattern.Match> + <Entry DisplayName="Setup/Teardown Methods"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <Or> + <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /> + </Or> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="All other members" /> + <Entry Priority="100" DisplayName="Test Methods"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <HasAttribute Name="NUnit.Framework.TestAttribute" /> + </And> + </Entry.Match> + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + </TypePattern> + <TypePattern DisplayName="Default Pattern"> + <Entry Priority="100" DisplayName="Public Delegates"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Delegate" /> + </And> + </Entry.Match> + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + <Entry Priority="100" DisplayName="Public Enums"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Enum" /> + </And> + </Entry.Match> + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Static Fields and Constants"> + <Entry.Match> + <Or> + <Kind Is="Constant" /> + <And> + <Kind Is="Field" /> + <Static /> + </And> + </Or> + </Entry.Match> + <Entry.SortBy> + <Kind Order="Constant Field" /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Fields"> + <Entry.Match> + <And> + <Kind Is="Field" /> + <Not> + <Static /> + </Not> + </And> + </Entry.Match> + <Entry.SortBy> + <Readonly /> + <Name /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Constructors"> + <Entry.Match> + <Kind Is="Constructor" /> + </Entry.Match> + <Entry.SortBy> + <Static /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Properties, Indexers"> + <Entry.Match> + <Or> + <Kind Is="Property" /> + <Kind Is="Indexer" /> + </Or> + </Entry.Match> + </Entry> + <Entry Priority="100" DisplayName="Interface Implementations"> + <Entry.Match> + <And> + <Kind Is="Member" /> + <ImplementsInterface /> + </And> + </Entry.Match> + <Entry.SortBy> + <ImplementsInterface Immediate="True" /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="All other members" /> + <Entry DisplayName="Nested Types"> + <Entry.Match> + <Kind Is="Type" /> + </Entry.Match> + </Entry> + </TypePattern> +</Patterns> + <?xml version="1.0" encoding="utf-8" ?> + +<!-- +I. Overall + +I.1 Each pattern can have <Match>....</Match> element. For the given type declaration, the pattern with the match, evaluated to 'true' with the largest weight, will be used +I.2 Each pattern consists of the sequence of <Entry>...</Entry> elements. Type member declarations are distributed between entries +I.3 If pattern has RemoveAllRegions="true" attribute, then all regions will be cleared prior to reordering. Otherwise, only auto-generated regions will be cleared +I.4 The contents of each entry is sorted by given keys (First key is primary, next key is secondary, etc). Then the declarations are grouped and en-regioned by given property + +II. Available match operands + +Each operand may have Weight="..." attribute. This weight will be added to the match weight if the operand is evaluated to 'true'. +The default weight is 1 + +II.1 Boolean functions: +II.1.1 <And>....</And> +II.1.2 <Or>....</Or> +II.1.3 <Not>....</Not> + +II.2 Operands +II.2.1 <Kind Is="..."/>. Kinds are: class, struct, interface, enum, delegate, type, constructor, destructor, property, indexer, method, operator, field, constant, event, member +II.2.2 <Name Is="..." [IgnoreCase="true/false"] />. The 'Is' attribute contains regular expression +II.2.3 <HasAttribute CLRName="..." [Inherit="true/false"] />. The 'CLRName' attribute contains regular expression +II.2.4 <Access Is="..."/>. The 'Is' values are: public, protected, internal, protected internal, private +II.2.5 <Static/> +II.2.6 <Abstract/> +II.2.7 <Virtual/> +II.2.8 <Override/> +II.2.9 <Sealed/> +II.2.10 <Readonly/> +II.2.11 <ImplementsInterface CLRName="..."/>. The 'CLRName' attribute contains regular expression +II.2.12 <HandlesEvent /> +--> + +<Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns"> + + <!--Do not reorder COM interfaces and structs marked by StructLayout attribute--> + <Pattern> + <Match> + <Or Weight="100"> + <And> + <Kind Is="interface"/> + <Or> + <HasAttribute CLRName="System.Runtime.InteropServices.InterfaceTypeAttribute"/> + <HasAttribute CLRName="System.Runtime.InteropServices.ComImport"/> + </Or> + </And> + <HasAttribute CLRName="System.Runtime.InteropServices.StructLayoutAttribute"/> + </Or> + </Match> + </Pattern> + + <!--Special formatting of NUnit test fixture--> + <Pattern RemoveAllRegions="true"> + <Match> + <And Weight="100"> + <Kind Is="class"/> + <HasAttribute CLRName="NUnit.Framework.TestFixtureAttribute" Inherit="true"/> + </And> + </Match> + + <!--Setup/Teardow--> + <Entry> + <Match> + <And> + <Kind Is="method"/> + <Or> + <HasAttribute CLRName="NUnit.Framework.SetUpAttribute" Inherit="true"/> + <HasAttribute CLRName="NUnit.Framework.TearDownAttribute" Inherit="true"/> + <HasAttribute CLRName="NUnit.Framework.FixtureSetUpAttribute" Inherit="true"/> + <HasAttribute CLRName="NUnit.Framework.FixtureTearDownAttribute" Inherit="true"/> + </Or> + </And> + </Match> + </Entry> + + <!--All other members--> + <Entry/> + + <!--Test methods--> + <Entry> + <Match> + <And Weight="100"> + <Kind Is="method"/> + <HasAttribute CLRName="NUnit.Framework.TestAttribute" Inherit="false"/> + </And> + </Match> + <Sort> + <Name/> + </Sort> + </Entry> + </Pattern> + + <!--Default pattern--> + <Pattern> + + <!--public delegate--> + <Entry> + <Match> + <And Weight="100"> + <Access Is="public"/> + <Kind Is="delegate"/> + </And> + </Match> + <Sort> + <Name/> + </Sort> + </Entry> + + <!--public enum--> + <Entry> + <Match> + <And Weight="100"> + <Access Is="public"/> + <Kind Is="enum"/> + </And> + </Match> + <Sort> + <Name/> + </Sort> + </Entry> + + <!--Constructors. Place static one first--> + <Entry> + <Match> + <Kind Is="constructor"/> + </Match> + <Sort> + <Static/> + </Sort> + </Entry> + + <!--properties, indexers--> + <Entry> + <Match> + <Or> + <Kind Is="property"/> + <Kind Is="indexer"/> + </Or> + </Match> + </Entry> + + <!--interface implementations--> + <Entry> + <Match> + <And Weight="100"> + <Kind Is="member"/> + <ImplementsInterface/> + </And> + </Match> + <Sort> + <ImplementsInterface Immediate="true"/> + </Sort> + </Entry> + + <!--all other members--> + <Entry/> + +<!--static fields and constants--> + <Entry> + <Match> + <Or> + <Kind Is="constant"/> + <And> + <Kind Is="field"/> + <Static/> + </And> + </Or> + </Match> + <Sort> + <Kind Order="constant field"/> + </Sort> + </Entry> + + <!--instance fields--> + <Entry> + <Match> + <And> + <Kind Is="field"/> + <Not> + <Static/> + </Not> + </And> + </Match> + <Sort> + <Readonly/> + <Name/> + </Sort> + </Entry> + + <!--nested types--> + <Entry> + <Match> + <Kind Is="type"/> + </Match> + <Sort> + <Name/> + </Sort> + </Entry> + </Pattern> + +</Patterns> + + CustomLayout + False + True + True + False + True + False + False + False + True + Automatic property + True + False + False + DB + DTC + ID + NSB + SLA + $object$_On$event$ + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Type parameters"><ElementKinds><Kind Name="TYPE_PARAMETER" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Instance fields (not private)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Local variables"><ElementKinds><Kind Name="LOCAL_VARIABLE" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Constant fields (not private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Static fields (not private)"><ElementKinds><Kind Name="FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Parameters"><ElementKinds><Kind Name="PARAMETER" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Enum members"><ElementKinds><Kind Name="ENUM_MEMBER" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Types and namespaces"><ElementKinds><Kind Name="NAMESPACE" /><Kind Name="CLASS" /><Kind Name="STRUCT" /><Kind Name="ENUM" /><Kind Name="DELEGATE" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Local constants"><ElementKinds><Kind Name="LOCAL_CONSTANT" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Interfaces"><ElementKinds><Kind Name="INTERFACE" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Static readonly fields (not private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"><ElementKinds><Kind Name="FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + $object$_On$event$ + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + True + D:\Projects\OSS\GitTools\GitVersion\src\GitVersion.sln.DotSettings + + True + 1 + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + False + <data /> + <data><IncludeFilters /><ExcludeFilters /></data> + True + True + True + True diff --git a/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs b/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs index 408941ac50..916d1aadc2 100644 --- a/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs +++ b/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs @@ -1,7 +1,7 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.OutputVariables; +using GitVersion.Tests; namespace GitVersion.App.Tests; diff --git a/src/GitVersion.App.Tests/ArgumentParserTests.cs b/src/GitVersion.App.Tests/ArgumentParserTests.cs index 390b75d760..38d1ee81d2 100644 --- a/src/GitVersion.App.Tests/ArgumentParserTests.cs +++ b/src/GitVersion.App.Tests/ArgumentParserTests.cs @@ -1,9 +1,9 @@ using System.IO.Abstractions; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.Helpers; using GitVersion.Logging; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.App.Tests; diff --git a/src/GitVersion.App.Tests/HelpWriterTests.cs b/src/GitVersion.App.Tests/HelpWriterTests.cs index 32fe2206af..a304c67152 100644 --- a/src/GitVersion.App.Tests/HelpWriterTests.cs +++ b/src/GitVersion.App.Tests/HelpWriterTests.cs @@ -1,5 +1,5 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; +using GitVersion.Tests; namespace GitVersion.App.Tests; diff --git a/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs b/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs index 38678c4987..b16bba1e7e 100644 --- a/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs +++ b/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs @@ -12,14 +12,14 @@ public override string ToString() { var arguments = new StringBuilder(); - if (!this.WorkingDirectory.IsNullOrWhiteSpace()) + if (!WorkingDirectory.IsNullOrWhiteSpace()) { - arguments.Append(" /targetpath \"").Append(this.WorkingDirectory).Append('\"'); + arguments.Append(" /targetpath \"").Append(WorkingDirectory).Append('\"'); } - if (!this.LogFile.IsNullOrWhiteSpace()) + if (!LogFile.IsNullOrWhiteSpace()) { - arguments.Append(" /l \"").Append(this.LogFile).Append('\"'); + arguments.Append(" /l \"").Append(LogFile).Append('\"'); } arguments.Append(additionalArguments); diff --git a/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs b/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs index 6e436ffc9e..11035333c4 100644 --- a/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs +++ b/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs @@ -1,6 +1,6 @@ -using GitVersion.Core.Tests; using GitVersion.Extensions; using GitVersion.OutputVariables; +using GitVersion.Tests; namespace GitVersion.App.Tests; diff --git a/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs b/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs index 305a284158..4ac9c290de 100644 --- a/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs +++ b/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs @@ -1,6 +1,6 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.Logging; +using GitVersion.Tests; namespace GitVersion.App.Tests; diff --git a/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs b/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs index d9f8f1a3ec..11c77880f5 100644 --- a/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs +++ b/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs @@ -1,7 +1,7 @@ using GitVersion.Agents; -using GitVersion.Core.Tests; using GitVersion.Helpers; using GitVersion.Testing.Extensions; +using GitVersion.Tests; namespace GitVersion.App.Tests; diff --git a/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs b/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs index c0dbf74ee0..6530705ac5 100644 --- a/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs +++ b/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs @@ -1,10 +1,10 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.Git; using GitVersion.Helpers; using GitVersion.Output; using GitVersion.Testing.Extensions; +using GitVersion.Tests; using LibGit2Sharp; namespace GitVersion.App.Tests; diff --git a/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs b/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs index a62df0f342..1264ca48b0 100644 --- a/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs +++ b/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs @@ -1,7 +1,7 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.Testing.Extensions; +using GitVersion.Tests; using LibGit2Sharp; namespace GitVersion.App.Tests; diff --git a/src/GitVersion.App.Tests/VersionWriterTests.cs b/src/GitVersion.App.Tests/VersionWriterTests.cs index 4971b05269..b267f3f62f 100644 --- a/src/GitVersion.App.Tests/VersionWriterTests.cs +++ b/src/GitVersion.App.Tests/VersionWriterTests.cs @@ -1,5 +1,5 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; +using GitVersion.Tests; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; diff --git a/src/GitVersion.App/ArgumentParser.cs b/src/GitVersion.App/ArgumentParser.cs index 569e9c47f9..8f8e172fe9 100644 --- a/src/GitVersion.App/ArgumentParser.cs +++ b/src/GitVersion.App/ArgumentParser.cs @@ -292,7 +292,7 @@ private static bool ParseSwitches(Arguments arguments, string? name, IReadOnlyLi if (name.IsSwitch("verbosity")) { - ParseVerbosity(arguments, value); + arguments.Verbosity = ParseVerbosity(value); return true; } @@ -437,13 +437,8 @@ private static void ParseOutput(Arguments arguments, IEnumerable? values } } - private static void ParseVerbosity(Arguments arguments, string? value) - { - if (!Enum.TryParse(value, true, out arguments.Verbosity)) - { - throw new WarningException($"Could not parse Verbosity value '{value}'"); - } - } + private static Verbosity ParseVerbosity(string? value) => + Enum.TryParse(value, true, out Verbosity verbosity) ? verbosity : throw new WarningException($"Could not parse Verbosity value '{value}'"); private static void ParseOverrideConfig(Arguments arguments, IReadOnlyCollection? values) { diff --git a/src/GitVersion.App/ArgumentParserExtensions.cs b/src/GitVersion.App/ArgumentParserExtensions.cs index 286849c44b..6716e633d8 100644 --- a/src/GitVersion.App/ArgumentParserExtensions.cs +++ b/src/GitVersion.App/ArgumentParserExtensions.cs @@ -1,4 +1,3 @@ -using GitVersion.Core; using GitVersion.Helpers; namespace GitVersion; diff --git a/src/GitVersion.App/Arguments.cs b/src/GitVersion.App/Arguments.cs index cd357cb803..1c00a680c1 100644 --- a/src/GitVersion.App/Arguments.cs +++ b/src/GitVersion.App/Arguments.cs @@ -5,40 +5,33 @@ namespace GitVersion; internal class Arguments { - public AuthenticationInfo Authentication = new(); - - public string? ConfigurationFile; - public IReadOnlyDictionary OverrideConfiguration = new Dictionary(); - public bool ShowConfiguration; - - public string? TargetPath; - - public string? TargetUrl; - public string? TargetBranch; - public string? CommitId; - public string? ClonePath; - - public bool Diag; - public bool IsVersion; - public bool IsHelp; - - public bool NoFetch; - public bool NoCache; - public bool NoNormalize; - public bool AllowShallow; - - public string? LogFilePath; - public string? ShowVariable; - public string? Format; - public string? OutputFile; - public ISet Output = new HashSet(); - public Verbosity Verbosity = Verbosity.Normal; - - public bool UpdateWixVersionFile; - public bool UpdateProjectFiles; - public bool UpdateAssemblyInfo; - public bool EnsureAssemblyInfo; - public ISet UpdateAssemblyInfoFileName = new HashSet(); + public AuthenticationInfo Authentication { get; set; } = new(); + public string? ConfigurationFile { get; set; } + public IReadOnlyDictionary OverrideConfiguration { get; set; } = new Dictionary(); + public bool ShowConfiguration { get; set; } + public string? TargetPath { get; set; } + public string? TargetUrl { get; set; } + public string? TargetBranch { get; set; } + public string? CommitId { get; set; } + public string? ClonePath { get; set; } + public bool Diag { get; set; } + public bool IsVersion { get; set; } + public bool IsHelp { get; set; } + public bool NoFetch { get; set; } + public bool NoCache { get; set; } + public bool NoNormalize { get; set; } + public bool AllowShallow { get; set; } + public string? LogFilePath { get; set; } + public string? ShowVariable { get; set; } + public string? Format { get; set; } + public string? OutputFile { get; set; } + public ISet Output { get; set; } = new HashSet(); + public Verbosity Verbosity { get; set; } = Verbosity.Normal; + public bool UpdateWixVersionFile { get; set; } + public bool UpdateProjectFiles { get; set; } + public bool UpdateAssemblyInfo { get; set; } + public bool EnsureAssemblyInfo { get; set; } + public ISet UpdateAssemblyInfoFileName { get; set; } = new HashSet(); public GitVersionOptions ToOptions() { @@ -54,9 +47,9 @@ public GitVersionOptions ToOptions() AuthenticationInfo = { - Username = this.Authentication.Username, - Password = this.Authentication.Password, - Token = this.Authentication.Token + Username = Authentication.Username, + Password = Authentication.Password, + Token = Authentication.Token }, ConfigurationInfo = @@ -99,7 +92,7 @@ public GitVersionOptions ToOptions() OutputFile = OutputFile }; - var workingDirectory = this.TargetPath?.TrimEnd('/', '\\'); + var workingDirectory = TargetPath?.TrimEnd('/', '\\'); if (workingDirectory != null) { gitVersionOptions.WorkingDirectory = workingDirectory; diff --git a/src/GitVersion.App/OverrideConfigurationOptionParser.cs b/src/GitVersion.App/OverrideConfigurationOptionParser.cs index 2b19243e63..9b7a3ee403 100644 --- a/src/GitVersion.App/OverrideConfigurationOptionParser.cs +++ b/src/GitVersion.App/OverrideConfigurationOptionParser.cs @@ -50,7 +50,7 @@ private static bool IsSupportedPropertyType(Type propertyType) || unwrappedType == typeof(VersionStrategies[]); } - internal void SetValue(string key, string value) => overrideConfiguration[key] = QuotedStringHelpers.UnquoteText(value); + internal void SetValue(string key, string value) => this.overrideConfiguration[key] = QuotedStringHelpers.UnquoteText(value); internal IReadOnlyDictionary GetOverrideConfiguration() => this.overrideConfiguration; } diff --git a/src/GitVersion.BuildAgents.Tests/Agents/AzurePipelinesTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/AzurePipelinesTests.cs index 3f19c02126..e63945b96e 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/AzurePipelinesTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/AzurePipelinesTests.cs @@ -1,5 +1,5 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; +using GitVersion.Tests; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/BitBucketPipelinesTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/BitBucketPipelinesTests.cs index 29912ca80f..050c961410 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/BitBucketPipelinesTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/BitBucketPipelinesTests.cs @@ -1,8 +1,8 @@ using System.IO.Abstractions; using GitVersion.Agents; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/BuildKiteTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/BuildKiteTests.cs index 3e6fa731b2..91eff468c9 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/BuildKiteTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/BuildKiteTests.cs @@ -1,5 +1,5 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; +using GitVersion.Tests; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/BuildServerBaseTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/BuildServerBaseTests.cs index 370bbff8ef..bb67c41e22 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/BuildServerBaseTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/BuildServerBaseTests.cs @@ -1,9 +1,9 @@ using System.IO.Abstractions; using GitVersion.Agents; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Logging; using GitVersion.OutputVariables; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/CodeBuildTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/CodeBuildTests.cs index eec4c9e3d8..207e591beb 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/CodeBuildTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/CodeBuildTests.cs @@ -1,8 +1,8 @@ using System.IO.Abstractions; using GitVersion.Agents; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/ContinuaCiTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/ContinuaCiTests.cs index c3d9615eb5..f01ad827be 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/ContinuaCiTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/ContinuaCiTests.cs @@ -1,5 +1,5 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; +using GitVersion.Tests; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/DroneTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/DroneTests.cs index 5fc119534a..202d8a898a 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/DroneTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/DroneTests.cs @@ -1,5 +1,5 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; +using GitVersion.Tests; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/EnvRunTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/EnvRunTests.cs index c3ed5deb7f..2d918ebe27 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/EnvRunTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/EnvRunTests.cs @@ -1,7 +1,7 @@ using System.IO.Abstractions; using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; +using GitVersion.Tests; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/GitHubActionsTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/GitHubActionsTests.cs index 21fc128e1d..8e16b89053 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/GitHubActionsTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/GitHubActionsTests.cs @@ -1,7 +1,7 @@ using System.IO.Abstractions; using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; +using GitVersion.Tests; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/GitLabCiTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/GitLabCiTests.cs index 2cfc212b6c..53ce45d385 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/GitLabCiTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/GitLabCiTests.cs @@ -1,8 +1,8 @@ using System.IO.Abstractions; using GitVersion.Agents; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/JenkinsTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/JenkinsTests.cs index a0974f5953..8b8f0c0d64 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/JenkinsTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/JenkinsTests.cs @@ -1,8 +1,8 @@ using System.IO.Abstractions; using GitVersion.Agents; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/MyGetTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/MyGetTests.cs index b6a448ebf8..ccbf85c75a 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/MyGetTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/MyGetTests.cs @@ -1,5 +1,5 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; +using GitVersion.Tests; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/SpaceAutomationTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/SpaceAutomationTests.cs index 17ae39a379..06eba79bbb 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/SpaceAutomationTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/SpaceAutomationTests.cs @@ -1,5 +1,5 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; +using GitVersion.Tests; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents.Tests/Agents/TeamCityTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/TeamCityTests.cs index 58044c0e61..c5ba3550e4 100644 --- a/src/GitVersion.BuildAgents.Tests/Agents/TeamCityTests.cs +++ b/src/GitVersion.BuildAgents.Tests/Agents/TeamCityTests.cs @@ -1,5 +1,5 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; +using GitVersion.Tests; namespace GitVersion.BuildAgents.Tests; diff --git a/src/GitVersion.BuildAgents/Agents/AppVeyor.cs b/src/GitVersion.BuildAgents/Agents/AppVeyor.cs index b9c46c8da6..27e6ab858f 100644 --- a/src/GitVersion.BuildAgents/Agents/AppVeyor.cs +++ b/src/GitVersion.BuildAgents/Agents/AppVeyor.cs @@ -13,8 +13,8 @@ internal class AppVeyor(IEnvironment environment, ILog log, IFileSystem fileSyst public override string SetBuildNumber(GitVersionVariables variables) { - var buildNumber = Environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER"); - var apiUrl = Environment.GetEnvironmentVariable("APPVEYOR_API_URL") ?? throw new Exception("APPVEYOR_API_URL environment variable not set"); + var buildNumber = this.environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER"); + var apiUrl = this.environment.GetEnvironmentVariable("APPVEYOR_API_URL") ?? throw new Exception("APPVEYOR_API_URL environment variable not set"); using var httpClient = GetHttpClient(apiUrl); @@ -40,7 +40,7 @@ public override string SetBuildNumber(GitVersionVariables variables) public override string[] SetOutputVariables(string name, string? value) { - var apiUrl = Environment.GetEnvironmentVariable("APPVEYOR_API_URL") ?? throw new Exception("APPVEYOR_API_URL environment variable not set"); + var apiUrl = this.environment.GetEnvironmentVariable("APPVEYOR_API_URL") ?? throw new Exception("APPVEYOR_API_URL environment variable not set"); var httpClient = GetHttpClient(apiUrl); var body = new @@ -66,10 +66,10 @@ public override string[] SetOutputVariables(string name, string? value) public override string? GetCurrentBranch(bool usingDynamicRepos) { - var pullRequestBranchName = Environment.GetEnvironmentVariable("APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH"); + var pullRequestBranchName = this.environment.GetEnvironmentVariable("APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH"); return !pullRequestBranchName.IsNullOrWhiteSpace() ? pullRequestBranchName - : this.Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH"); + : this.environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH"); } public override bool PreventFetch() => false; diff --git a/src/GitVersion.BuildAgents/Agents/AzurePipelines.cs b/src/GitVersion.BuildAgents/Agents/AzurePipelines.cs index d372f067b4..86dc7d4fdf 100644 --- a/src/GitVersion.BuildAgents/Agents/AzurePipelines.cs +++ b/src/GitVersion.BuildAgents/Agents/AzurePipelines.cs @@ -19,11 +19,11 @@ public override string[] SetOutputVariables(string name, string? value) => public override string? GetCurrentBranch(bool usingDynamicRepos) { - var gitBranch = Environment.GetEnvironmentVariable("GIT_BRANCH"); + var gitBranch = this.environment.GetEnvironmentVariable("GIT_BRANCH"); if (gitBranch is not null) return gitBranch; - var sourceBranch = Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH"); + var sourceBranch = this.environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH"); // https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml // BUILD_SOURCEBRANCH must be used only for "real" branches, not for tags. @@ -37,7 +37,7 @@ public override string SetBuildNumber(GitVersionVariables variables) { // For AzurePipelines, we'll get the Build Number and insert GitVersion variables where // specified - var buildNumberEnv = Environment.GetEnvironmentVariable("BUILD_BUILDNUMBER"); + var buildNumberEnv = this.environment.GetEnvironmentVariable("BUILD_BUILDNUMBER"); if (buildNumberEnv.IsNullOrWhiteSpace()) return variables.FullSemVer; diff --git a/src/GitVersion.BuildAgents/Agents/BitBucketPipelines.cs b/src/GitVersion.BuildAgents/Agents/BitBucketPipelines.cs index ec79090b94..87640f9350 100644 --- a/src/GitVersion.BuildAgents/Agents/BitBucketPipelines.cs +++ b/src/GitVersion.BuildAgents/Agents/BitBucketPipelines.cs @@ -55,13 +55,13 @@ public override void WriteIntegration(Action writer, GitVersionVariable .Select(variable => $"export GITVERSION_{variable.Key.ToUpperInvariant()}={variable.Value}") .ToList(); - this.FileSystem.File.WriteAllLines(this.propertyFile, exports); + this.fileSystem.File.WriteAllLines(this.propertyFile, exports); var psExports = variables .Select(variable => $"$GITVERSION_{variable.Key.ToUpperInvariant()} = \"{variable.Value}\"") .ToList(); - this.FileSystem.File.WriteAllLines(this.ps1File, psExports); + this.fileSystem.File.WriteAllLines(this.ps1File, psExports); } public override string? GetCurrentBranch(bool usingDynamicRepos) @@ -72,7 +72,7 @@ public override void WriteIntegration(Action writer, GitVersionVariable private string? EvaluateEnvironmentVariable(string variableName) { - var branchName = Environment.GetEnvironmentVariable(variableName); + var branchName = this.environment.GetEnvironmentVariable(variableName); this.Log.Info("Evaluating environment variable {0} : {1}", variableName, branchName ?? "(null)"); return branchName; } diff --git a/src/GitVersion.BuildAgents/Agents/BuildKite.cs b/src/GitVersion.BuildAgents/Agents/BuildKite.cs index bdf325460a..3b3bc5d844 100644 --- a/src/GitVersion.BuildAgents/Agents/BuildKite.cs +++ b/src/GitVersion.BuildAgents/Agents/BuildKite.cs @@ -10,7 +10,7 @@ internal class BuildKite(IEnvironment environment, ILog log, IFileSystem fileSys protected override string EnvironmentVariable => EnvironmentVariableName; - public override bool CanApplyToCurrentContext() => "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariable), StringComparison.OrdinalIgnoreCase); + public override bool CanApplyToCurrentContext() => "true".Equals(this.environment.GetEnvironmentVariable(EnvironmentVariable), StringComparison.OrdinalIgnoreCase); public override string SetBuildNumber(GitVersionVariables variables) => string.Empty; // There is no equivalent function in BuildKite. @@ -20,10 +20,10 @@ public override string[] SetOutputVariables(string name, string? value) => public override string? GetCurrentBranch(bool usingDynamicRepos) { - var pullRequest = Environment.GetEnvironmentVariable("BUILDKITE_PULL_REQUEST"); + var pullRequest = this.environment.GetEnvironmentVariable("BUILDKITE_PULL_REQUEST"); if (string.IsNullOrEmpty(pullRequest) || pullRequest == "false") { - return Environment.GetEnvironmentVariable("BUILDKITE_BRANCH"); + return this.environment.GetEnvironmentVariable("BUILDKITE_BRANCH"); } // For pull requests BUILDKITE_BRANCH refers to the head, so adjust the diff --git a/src/GitVersion.BuildAgents/Agents/CodeBuild.cs b/src/GitVersion.BuildAgents/Agents/CodeBuild.cs index 30b710d8c4..5cae73b79a 100644 --- a/src/GitVersion.BuildAgents/Agents/CodeBuild.cs +++ b/src/GitVersion.BuildAgents/Agents/CodeBuild.cs @@ -26,9 +26,9 @@ public override string[] SetOutputVariables(string name, string? value) => public override string? GetCurrentBranch(bool usingDynamicRepos) { - var currentBranch = Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName); + var currentBranch = this.environment.GetEnvironmentVariable(WebHookEnvironmentVariableName); - return currentBranch.IsNullOrEmpty() ? Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName) : currentBranch; + return currentBranch.IsNullOrEmpty() ? this.environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName) : currentBranch; } public override void WriteIntegration(Action writer, GitVersionVariables variables, bool updateBuildNumber = true) @@ -38,11 +38,11 @@ public override void WriteIntegration(Action writer, GitVersionVariable base.WriteIntegration(writer, variables, updateBuildNumber); writer($"Outputting variables to '{this.file}' ... "); - this.FileSystem.File.WriteAllLines(this.file, SetOutputVariables(variables)); + this.fileSystem.File.WriteAllLines(this.file, SetOutputVariables(variables)); } public override bool PreventFetch() => true; - public override bool CanApplyToCurrentContext() => !Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName).IsNullOrEmpty() - || !Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName).IsNullOrEmpty(); + public override bool CanApplyToCurrentContext() => !this.environment.GetEnvironmentVariable(WebHookEnvironmentVariableName).IsNullOrEmpty() + || !this.environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName).IsNullOrEmpty(); } diff --git a/src/GitVersion.BuildAgents/Agents/Drone.cs b/src/GitVersion.BuildAgents/Agents/Drone.cs index 5895fe791b..e03bef5aa7 100644 --- a/src/GitVersion.BuildAgents/Agents/Drone.cs +++ b/src/GitVersion.BuildAgents/Agents/Drone.cs @@ -9,7 +9,7 @@ internal class Drone(IEnvironment environment, ILog log, IFileSystem fileSystem) { public const string EnvironmentVariableName = "DRONE"; protected override string EnvironmentVariable => EnvironmentVariableName; - public override bool CanApplyToCurrentContext() => "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariable), StringComparison.OrdinalIgnoreCase); + public override bool CanApplyToCurrentContext() => "true".Equals(this.environment.GetEnvironmentVariable(EnvironmentVariable), StringComparison.OrdinalIgnoreCase); public override string SetBuildNumber(GitVersionVariables variables) => variables.FullSemVer; @@ -23,20 +23,20 @@ public override string[] SetOutputVariables(string name, string? value) => // In Drone DRONE_BRANCH variable is equal to destination branch in case of pull request // https://discourse.drone.io/t/getting-the-branch-a-pull-request-is-created-from/670 // Unfortunately, DRONE_REFSPEC isn't populated, however CI_COMMIT_REFSPEC can be used instead of. - var pullRequestNumber = Environment.GetEnvironmentVariable("DRONE_PULL_REQUEST"); - if (pullRequestNumber.IsNullOrWhiteSpace()) return this.Environment.GetEnvironmentVariable("DRONE_BRANCH"); + var pullRequestNumber = this.environment.GetEnvironmentVariable("DRONE_PULL_REQUEST"); + if (pullRequestNumber.IsNullOrWhiteSpace()) return this.environment.GetEnvironmentVariable("DRONE_BRANCH"); // DRONE_SOURCE_BRANCH is available in Drone 1.x.x version - var sourceBranch = this.Environment.GetEnvironmentVariable("DRONE_SOURCE_BRANCH"); + var sourceBranch = this.environment.GetEnvironmentVariable("DRONE_SOURCE_BRANCH"); if (!sourceBranch.IsNullOrWhiteSpace()) return sourceBranch; // In drone lower than 1.x.x source branch can be parsed from CI_COMMIT_REFSPEC // CI_COMMIT_REFSPEC - {sourceBranch}:{destinationBranch} // https://github.com/drone/drone/issues/2222 - var ciCommitRefSpec = this.Environment.GetEnvironmentVariable("CI_COMMIT_REFSPEC"); - if (ciCommitRefSpec.IsNullOrWhiteSpace()) return this.Environment.GetEnvironmentVariable("DRONE_BRANCH"); + var ciCommitRefSpec = this.environment.GetEnvironmentVariable("CI_COMMIT_REFSPEC"); + if (ciCommitRefSpec.IsNullOrWhiteSpace()) return this.environment.GetEnvironmentVariable("DRONE_BRANCH"); var colonIndex = ciCommitRefSpec.IndexOf(':'); - return colonIndex > 0 ? ciCommitRefSpec[..colonIndex] : this.Environment.GetEnvironmentVariable("DRONE_BRANCH"); + return colonIndex > 0 ? ciCommitRefSpec[..colonIndex] : this.environment.GetEnvironmentVariable("DRONE_BRANCH"); } public override bool PreventFetch() => false; diff --git a/src/GitVersion.BuildAgents/Agents/EnvRun.cs b/src/GitVersion.BuildAgents/Agents/EnvRun.cs index c74962f92b..0c90bbcece 100644 --- a/src/GitVersion.BuildAgents/Agents/EnvRun.cs +++ b/src/GitVersion.BuildAgents/Agents/EnvRun.cs @@ -11,9 +11,9 @@ internal class EnvRun(IEnvironment environment, ILog log, IFileSystem fileSystem protected override string EnvironmentVariable => EnvironmentVariableName; public override bool CanApplyToCurrentContext() { - var envRunDatabasePath = Environment.GetEnvironmentVariable(EnvironmentVariableName); + var envRunDatabasePath = this.environment.GetEnvironmentVariable(EnvironmentVariableName); if (envRunDatabasePath.IsNullOrEmpty()) return false; - if (this.FileSystem.File.Exists(envRunDatabasePath)) return true; + if (this.fileSystem.File.Exists(envRunDatabasePath)) return true; this.Log.Error($"The database file of EnvRun.exe was not found at {envRunDatabasePath}."); return false; diff --git a/src/GitVersion.BuildAgents/Agents/GitHubActions.cs b/src/GitVersion.BuildAgents/Agents/GitHubActions.cs index 7bd1515e11..3c99588773 100644 --- a/src/GitVersion.BuildAgents/Agents/GitHubActions.cs +++ b/src/GitVersion.BuildAgents/Agents/GitHubActions.cs @@ -27,12 +27,12 @@ public override void WriteIntegration(Action writer, GitVersionVariable // https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files // The outgoing environment variables must be written to a temporary file (identified by the $GITHUB_ENV environment // variable, which changes for every step in a workflow) which is then parsed. That file must also be UTF-8, or it will fail. - var gitHubSetEnvFilePath = this.Environment.GetEnvironmentVariable(GitHubSetEnvTempFileEnvironmentVariableName); + var gitHubSetEnvFilePath = this.environment.GetEnvironmentVariable(GitHubSetEnvTempFileEnvironmentVariableName); if (gitHubSetEnvFilePath != null) { writer($"Writing version variables to $GITHUB_ENV file for '{GetType().Name}'."); - using var streamWriter = this.FileSystem.File.AppendText(gitHubSetEnvFilePath); + using var streamWriter = this.fileSystem.File.AppendText(gitHubSetEnvFilePath); foreach (var (key, value) in variables) { if (!value.IsNullOrEmpty()) @@ -53,8 +53,8 @@ public override void WriteIntegration(Action writer, GitVersionVariable // GITHUB_REF must be used only for "real" branches, not for tags. // Bug fix for https://github.com/GitTools/GitVersion/issues/2838 - var refType = Environment.GetEnvironmentVariable("GITHUB_REF_TYPE") ?? ""; - return refType.Equals("tag", StringComparison.OrdinalIgnoreCase) ? null : Environment.GetEnvironmentVariable("GITHUB_REF"); + var refType = this.environment.GetEnvironmentVariable("GITHUB_REF_TYPE") ?? ""; + return refType.Equals("tag", StringComparison.OrdinalIgnoreCase) ? null : this.environment.GetEnvironmentVariable("GITHUB_REF"); } public override bool PreventFetch() => true; diff --git a/src/GitVersion.BuildAgents/Agents/GitLabCi.cs b/src/GitVersion.BuildAgents/Agents/GitLabCi.cs index 90308f1e5e..cabf2885cf 100644 --- a/src/GitVersion.BuildAgents/Agents/GitLabCi.cs +++ b/src/GitVersion.BuildAgents/Agents/GitLabCi.cs @@ -27,8 +27,8 @@ public override string[] SetOutputVariables(string name, string? value) => // CI_COMMIT_TAG is only available in tag pipelines, // so we can exit if CI_COMMIT_REF_NAME would return the tag public override string? GetCurrentBranch(bool usingDynamicRepos) => - string.IsNullOrEmpty(this.Environment.GetEnvironmentVariable("CI_COMMIT_TAG")) - ? this.Environment.GetEnvironmentVariable("CI_COMMIT_REF_NAME") + string.IsNullOrEmpty(this.environment.GetEnvironmentVariable("CI_COMMIT_TAG")) + ? this.environment.GetEnvironmentVariable("CI_COMMIT_REF_NAME") : null; public override bool PreventFetch() => true; @@ -41,6 +41,6 @@ public override void WriteIntegration(Action writer, GitVersionVariable base.WriteIntegration(writer, variables, updateBuildNumber); writer($"Outputting variables to '{this.file}' ... "); - this.FileSystem.File.WriteAllLines(this.file, SetOutputVariables(variables)); + this.fileSystem.File.WriteAllLines(this.file, SetOutputVariables(variables)); } } diff --git a/src/GitVersion.BuildAgents/Agents/Jenkins.cs b/src/GitVersion.BuildAgents/Agents/Jenkins.cs index 57c78aede1..9a50b5df46 100644 --- a/src/GitVersion.BuildAgents/Agents/Jenkins.cs +++ b/src/GitVersion.BuildAgents/Agents/Jenkins.cs @@ -23,10 +23,10 @@ public override string[] SetOutputVariables(string name, string? value) => ]; public override string? GetCurrentBranch(bool usingDynamicRepos) => IsPipelineAsCode() - ? Environment.GetEnvironmentVariable("BRANCH_NAME") - : Environment.GetEnvironmentVariable("GIT_LOCAL_BRANCH") ?? Environment.GetEnvironmentVariable("GIT_BRANCH"); + ? this.environment.GetEnvironmentVariable("BRANCH_NAME") + : this.environment.GetEnvironmentVariable("GIT_LOCAL_BRANCH") ?? this.environment.GetEnvironmentVariable("GIT_BRANCH"); - private bool IsPipelineAsCode() => !Environment.GetEnvironmentVariable("BRANCH_NAME").IsNullOrEmpty(); + private bool IsPipelineAsCode() => !this.environment.GetEnvironmentVariable("BRANCH_NAME").IsNullOrEmpty(); public override bool PreventFetch() => true; @@ -44,6 +44,6 @@ public override void WriteIntegration(Action writer, GitVersionVariable base.WriteIntegration(writer, variables, updateBuildNumber); writer($"Outputting variables to '{this.file}' ... "); - this.FileSystem.File.WriteAllLines(this.file, SetOutputVariables(variables)); + this.fileSystem.File.WriteAllLines(this.file, SetOutputVariables(variables)); } } diff --git a/src/GitVersion.BuildAgents/Agents/MyGet.cs b/src/GitVersion.BuildAgents/Agents/MyGet.cs index dad7d7feb7..587a3c625b 100644 --- a/src/GitVersion.BuildAgents/Agents/MyGet.cs +++ b/src/GitVersion.BuildAgents/Agents/MyGet.cs @@ -12,8 +12,7 @@ internal class MyGet(IEnvironment environment, ILog log, IFileSystem fileSystem) protected override string EnvironmentVariable => EnvironmentVariableName; public override bool CanApplyToCurrentContext() { - var buildRunner = Environment.GetEnvironmentVariable(EnvironmentVariable); - + var buildRunner = this.environment.GetEnvironmentVariable(EnvironmentVariable); return !buildRunner.IsNullOrEmpty() && buildRunner.Equals("MyGet", StringComparison.InvariantCultureIgnoreCase); } diff --git a/src/GitVersion.BuildAgents/Agents/SpaceAutomation.cs b/src/GitVersion.BuildAgents/Agents/SpaceAutomation.cs index 2814896e04..da79d864ce 100644 --- a/src/GitVersion.BuildAgents/Agents/SpaceAutomation.cs +++ b/src/GitVersion.BuildAgents/Agents/SpaceAutomation.cs @@ -10,7 +10,7 @@ internal class SpaceAutomation(IEnvironment environment, ILog log, IFileSystem f protected override string EnvironmentVariable => EnvironmentVariableName; - public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("JB_SPACE_GIT_BRANCH"); + public override string? GetCurrentBranch(bool usingDynamicRepos) => this.environment.GetEnvironmentVariable("JB_SPACE_GIT_BRANCH"); public override string[] SetOutputVariables(string name, string? value) => []; diff --git a/src/GitVersion.BuildAgents/Agents/TeamCity.cs b/src/GitVersion.BuildAgents/Agents/TeamCity.cs index cae3ca8ab3..3d31681f39 100644 --- a/src/GitVersion.BuildAgents/Agents/TeamCity.cs +++ b/src/GitVersion.BuildAgents/Agents/TeamCity.cs @@ -14,7 +14,7 @@ internal class TeamCity(IEnvironment environment, ILog log, IFileSystem fileSyst public override string? GetCurrentBranch(bool usingDynamicRepos) { - var branchName = Environment.GetEnvironmentVariable("Git_Branch"); + var branchName = this.environment.GetEnvironmentVariable("Git_Branch"); if (!branchName.IsNullOrEmpty()) return branchName; if (!usingDynamicRepos) @@ -32,7 +32,7 @@ TeamCity doesn't make the current branch available through environmental variabl See https://gitversion.net/docs/reference/build-servers/teamcity for more info """); - public override bool PreventFetch() => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("Git_Branch")); + public override bool PreventFetch() => !string.IsNullOrEmpty(this.environment.GetEnvironmentVariable("Git_Branch")); public override string[] SetOutputVariables(string name, string? value) => [ diff --git a/src/GitVersion.BuildAgents/Agents/TravisCI.cs b/src/GitVersion.BuildAgents/Agents/TravisCI.cs index 43eb4638c8..ecdb7c161a 100644 --- a/src/GitVersion.BuildAgents/Agents/TravisCI.cs +++ b/src/GitVersion.BuildAgents/Agents/TravisCI.cs @@ -9,7 +9,7 @@ internal class TravisCi(IEnvironment environment, ILog log, IFileSystem fileSyst public const string EnvironmentVariableName = "TRAVIS"; protected override string EnvironmentVariable => EnvironmentVariableName; - public override bool CanApplyToCurrentContext() => "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariable)) && "true".Equals(Environment.GetEnvironmentVariable("CI")); + public override bool CanApplyToCurrentContext() => "true".Equals(this.environment.GetEnvironmentVariable(EnvironmentVariable)) && "true".Equals(this.environment.GetEnvironmentVariable("CI")); public override string SetBuildNumber(GitVersionVariables variables) => variables.FullSemVer; diff --git a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationExtensionsTests.cs b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationExtensionsTests.cs index 057e72762f..8eac64ec19 100644 --- a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationExtensionsTests.cs +++ b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationExtensionsTests.cs @@ -1,5 +1,5 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Git; +using GitVersion.Tests; namespace GitVersion.Configuration.Tests; diff --git a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationFileLocatorTests.cs b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationFileLocatorTests.cs index dbe566ad12..49949d459d 100644 --- a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationFileLocatorTests.cs +++ b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationFileLocatorTests.cs @@ -1,7 +1,7 @@ using System.IO.Abstractions; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.Logging; +using GitVersion.Tests; namespace GitVersion.Configuration.Tests; @@ -21,7 +21,7 @@ public void Setup() { this.repoPath = FileSystemHelper.Path.Combine(FileSystemHelper.Path.GetTempPath(), "MyGitRepo"); this.workingPath = FileSystemHelper.Path.Combine(FileSystemHelper.Path.GetTempPath(), "MyGitRepo", "Working"); - var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath }); + var options = Options.Create(new GitVersionOptions { WorkingDirectory = this.repoPath }); var sp = ConfigureServices(services => services.AddSingleton(options)); diff --git a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs index 9e1dda3335..1cecfcfda2 100644 --- a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs +++ b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs @@ -1,9 +1,8 @@ using System.IO.Abstractions; using System.Runtime.CompilerServices; -using GitVersion.Core; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.Logging; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.Configuration.Tests; @@ -19,7 +18,7 @@ public class ConfigurationProviderTests : TestBase public void Setup() { this.repoPath = FileSystemHelper.Path.Combine(FileSystemHelper.Path.GetTempPath(), "MyGitRepo"); - var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath }); + var options = Options.Create(new GitVersionOptions { WorkingDirectory = this.repoPath }); var sp = ConfigureServices(services => services.AddSingleton(options)); this.configurationProvider = (ConfigurationProvider)sp.GetRequiredService(); this.fileSystem = sp.GetRequiredService(); @@ -283,7 +282,7 @@ public void NoWarnOnGitVersionYmlFile() var logAppender = new TestLogAppender(Action); var log = new Log(logAppender); - var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath }); + var options = Options.Create(new GitVersionOptions { WorkingDirectory = this.repoPath }); var sp = ConfigureServices(services => { services.AddSingleton(options); diff --git a/src/GitVersion.Configuration.Tests/Configuration/IgnoreConfigurationTests.cs b/src/GitVersion.Configuration.Tests/Configuration/IgnoreConfigurationTests.cs index 799a3c502f..5de8606187 100644 --- a/src/GitVersion.Configuration.Tests/Configuration/IgnoreConfigurationTests.cs +++ b/src/GitVersion.Configuration.Tests/Configuration/IgnoreConfigurationTests.cs @@ -1,5 +1,5 @@ using System.Globalization; -using GitVersion.Core.Tests.Helpers; +using GitVersion.Tests; using GitVersion.VersionCalculation; using SharpYaml; @@ -20,7 +20,7 @@ public void CanDeserialize() commits-before: 2015-10-23T12:23:15 """; - var configuration = serializer.ReadConfiguration(yaml); + var configuration = this.serializer.ReadConfiguration(yaml); configuration.ShouldNotBeNull(); configuration.Ignore.ShouldNotBeNull(); @@ -40,7 +40,7 @@ public void ShouldSupportsOtherSequenceFormat() - 6c19c7c219ecf8dbc468042baefa73a1b213e8b1 """; - var configuration = serializer.ReadConfiguration(yaml); + var configuration = this.serializer.ReadConfiguration(yaml); configuration.ShouldNotBeNull(); configuration.Ignore.ShouldNotBeNull(); @@ -53,7 +53,7 @@ public void WhenNotInConfigShouldHaveDefaults() { const string yaml = "next-version: 1.0"; - var configuration = serializer.ReadConfiguration(yaml); + var configuration = this.serializer.ReadConfiguration(yaml); configuration.ShouldNotBeNull(); configuration.Ignore.ShouldNotBeNull(); @@ -70,7 +70,7 @@ public void WhenBadDateFormatShouldFail() commits-before: bad format date """; - Should.Throw(() => serializer.ReadConfiguration(yaml)); + Should.Throw(() => this.serializer.ReadConfiguration(yaml)); } [Test] @@ -78,7 +78,7 @@ public void ShouldSupportScalarVersionStrategiesOverrideFormat() { const string yaml = "strategies: ConfiguredNextVersion, TaggedCommit"; - var configuration = serializer.ReadConfiguration(yaml); + var configuration = this.serializer.ReadConfiguration(yaml); configuration.ShouldNotBeNull(); configuration.VersionStrategy.ShouldBe(VersionStrategies.ConfiguredNextVersion | VersionStrategies.TaggedCommit); diff --git a/src/GitVersion.Configuration.Tests/Workflows/WorkflowsTests.cs b/src/GitVersion.Configuration.Tests/Workflows/WorkflowsTests.cs index 7931e1997f..f6143ef685 100644 --- a/src/GitVersion.Configuration.Tests/Workflows/WorkflowsTests.cs +++ b/src/GitVersion.Configuration.Tests/Workflows/WorkflowsTests.cs @@ -18,7 +18,7 @@ public void CheckWorkflowsAreUpdated(string workflow, IConfigurationBuilder conf { var configuration = configurationBuilder.Build(); - var serializedConfiguration = serializer.Serialize(configuration); + var serializedConfiguration = this.serializer.Serialize(configuration); var segments = workflow.Split("/"); var folderName = segments[0]; var fileName = segments[^1]; diff --git a/src/GitVersion.Configuration/Builders/BranchConfigurationBuilder.cs b/src/GitVersion.Configuration/Builders/BranchConfigurationBuilder.cs index c45a5625bd..a29fe8545f 100644 --- a/src/GitVersion.Configuration/Builders/BranchConfigurationBuilder.cs +++ b/src/GitVersion.Configuration/Builders/BranchConfigurationBuilder.cs @@ -159,24 +159,24 @@ public virtual BranchConfigurationBuilder WithConfiguration(IBranchConfiguration public IBranchConfiguration Build() => new BranchConfiguration { - DeploymentMode = deploymentMode, - Label = label, - Increment = increment, - RegularExpression = regularExpression, - TracksReleaseBranches = tracksReleaseBranches, - TrackMergeTarget = trackMergeTarget, - TrackMergeMessage = trackMergeMessage, - CommitMessageIncrementing = commitMessageIncrementing, - IsMainBranch = isMainBranch, - IsReleaseBranch = isReleaseBranch, + DeploymentMode = this.deploymentMode, + Label = this.label, + Increment = this.increment, + RegularExpression = this.regularExpression, + TracksReleaseBranches = this.tracksReleaseBranches, + TrackMergeTarget = this.trackMergeTarget, + TrackMergeMessage = this.trackMergeMessage, + CommitMessageIncrementing = this.commitMessageIncrementing, + IsMainBranch = this.isMainBranch, + IsReleaseBranch = this.isReleaseBranch, PreventIncrement = new PreventIncrementConfiguration { - OfMergedBranch = preventIncrementOfMergedBranch, - WhenBranchMerged = preventIncrementWhenBranchMerged, - WhenCurrentCommitTagged = preventIncrementWhenCurrentCommitTagged + OfMergedBranch = this.preventIncrementOfMergedBranch, + WhenBranchMerged = this.preventIncrementWhenBranchMerged, + WhenCurrentCommitTagged = this.preventIncrementWhenCurrentCommitTagged }, - PreReleaseWeight = preReleaseWeight, - SourceBranches = sourceBranches, - IsSourceBranchFor = isSourceBranchFor + PreReleaseWeight = this.preReleaseWeight, + SourceBranches = this.sourceBranches, + IsSourceBranchFor = this.isSourceBranchFor }; } diff --git a/src/GitVersion.Configuration/Builders/ConfigurationBuilderBase.cs b/src/GitVersion.Configuration/Builders/ConfigurationBuilderBase.cs index 785adf220d..6efb5fce62 100644 --- a/src/GitVersion.Configuration/Builders/ConfigurationBuilderBase.cs +++ b/src/GitVersion.Configuration/Builders/ConfigurationBuilderBase.cs @@ -1,4 +1,3 @@ -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Helpers; using GitVersion.VersionCalculation; @@ -400,7 +399,7 @@ public virtual IGitVersionConfiguration Build() CommitDateFormat = this.commitDateFormat, UpdateBuildNumber = this.updateBuildNumber, SemanticVersionFormat = this.semanticVersionFormat, - VersionStrategies = versionStrategies, + VersionStrategies = this.versionStrategies, Branches = branches, MergeMessageFormats = this.mergeMessageFormats, DeploymentMode = this.versioningMode, diff --git a/src/GitVersion.Configuration/Builders/GitFlowConfigurationBuilder.cs b/src/GitVersion.Configuration/Builders/GitFlowConfigurationBuilder.cs index b45967ac4c..9a09d93e28 100644 --- a/src/GitVersion.Configuration/Builders/GitFlowConfigurationBuilder.cs +++ b/src/GitVersion.Configuration/Builders/GitFlowConfigurationBuilder.cs @@ -1,4 +1,3 @@ -using GitVersion.Core; using GitVersion.VersionCalculation; namespace GitVersion.Configuration; @@ -42,11 +41,11 @@ private GitFlowConfigurationBuilder() IsMainBranch = false }); - WithBranch(DevelopBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.DevelopBranch.Name).WithConfiguration(new BranchConfiguration { Increment = IncrementStrategy.Minor, DeploymentMode = DeploymentMode.ContinuousDelivery, - RegularExpression = DevelopBranch.RegexPattern, + RegularExpression = this.DevelopBranch.RegexPattern, SourceBranches = [this.MainBranch.Name], Label = "alpha", PreventIncrement = new PreventIncrementConfiguration @@ -61,10 +60,10 @@ private GitFlowConfigurationBuilder() PreReleaseWeight = 0 }); - WithBranch(MainBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.MainBranch.Name).WithConfiguration(new BranchConfiguration { Increment = IncrementStrategy.Patch, - RegularExpression = MainBranch.RegexPattern, + RegularExpression = this.MainBranch.RegexPattern, SourceBranches = [], Label = string.Empty, PreventIncrement = new PreventIncrementConfiguration @@ -79,11 +78,11 @@ private GitFlowConfigurationBuilder() PreReleaseWeight = 55000 }); - WithBranch(ReleaseBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.ReleaseBranch.Name).WithConfiguration(new BranchConfiguration { Increment = IncrementStrategy.Minor, DeploymentMode = DeploymentMode.ManualDeployment, - RegularExpression = ReleaseBranch.RegexPattern, + RegularExpression = this.ReleaseBranch.RegexPattern, SourceBranches = [ this.MainBranch.Name, @@ -102,10 +101,10 @@ private GitFlowConfigurationBuilder() PreReleaseWeight = 30000 }); - WithBranch(FeatureBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.FeatureBranch.Name).WithConfiguration(new BranchConfiguration { Increment = IncrementStrategy.Inherit, - RegularExpression = FeatureBranch.RegexPattern, + RegularExpression = this.FeatureBranch.RegexPattern, DeploymentMode = DeploymentMode.ManualDeployment, SourceBranches = [ @@ -125,10 +124,10 @@ private GitFlowConfigurationBuilder() PreReleaseWeight = 30000 }); - WithBranch(PullRequestBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.PullRequestBranch.Name).WithConfiguration(new BranchConfiguration { Increment = IncrementStrategy.Inherit, - RegularExpression = PullRequestBranch.RegexPattern, + RegularExpression = this.PullRequestBranch.RegexPattern, DeploymentMode = DeploymentMode.ContinuousDelivery, SourceBranches = [ @@ -149,10 +148,10 @@ private GitFlowConfigurationBuilder() PreReleaseWeight = 30000 }); - WithBranch(HotfixBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.HotfixBranch.Name).WithConfiguration(new BranchConfiguration { Increment = IncrementStrategy.Inherit, - RegularExpression = HotfixBranch.RegexPattern, + RegularExpression = this.HotfixBranch.RegexPattern, DeploymentMode = DeploymentMode.ManualDeployment, PreventIncrement = new PreventIncrementConfiguration { @@ -169,10 +168,10 @@ private GitFlowConfigurationBuilder() PreReleaseWeight = 30000 }); - WithBranch(SupportBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.SupportBranch.Name).WithConfiguration(new BranchConfiguration { Increment = IncrementStrategy.Patch, - RegularExpression = SupportBranch.RegexPattern, + RegularExpression = this.SupportBranch.RegexPattern, SourceBranches = [this.MainBranch.Name], Label = string.Empty, PreventIncrement = new PreventIncrementConfiguration @@ -186,9 +185,9 @@ private GitFlowConfigurationBuilder() PreReleaseWeight = 55000 }); - WithBranch(UnknownBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.UnknownBranch.Name).WithConfiguration(new BranchConfiguration { - RegularExpression = UnknownBranch.RegexPattern, + RegularExpression = this.UnknownBranch.RegexPattern, DeploymentMode = DeploymentMode.ManualDeployment, Increment = IncrementStrategy.Inherit, SourceBranches = diff --git a/src/GitVersion.Configuration/Builders/GitHubFlowConfigurationBuilder.cs b/src/GitVersion.Configuration/Builders/GitHubFlowConfigurationBuilder.cs index 3a95c130d4..669e8d8cc4 100644 --- a/src/GitVersion.Configuration/Builders/GitHubFlowConfigurationBuilder.cs +++ b/src/GitVersion.Configuration/Builders/GitHubFlowConfigurationBuilder.cs @@ -1,4 +1,3 @@ -using GitVersion.Core; using GitVersion.VersionCalculation; namespace GitVersion.Configuration; @@ -42,7 +41,7 @@ private GitHubFlowConfigurationBuilder() IsMainBranch = false }); - WithBranch(MainBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.MainBranch.Name).WithConfiguration(new BranchConfiguration { Label = string.Empty, Increment = IncrementStrategy.Patch, @@ -52,7 +51,7 @@ private GitHubFlowConfigurationBuilder() }, TrackMergeTarget = false, TrackMergeMessage = true, - RegularExpression = MainBranch.RegexPattern, + RegularExpression = this.MainBranch.RegexPattern, SourceBranches = [], TracksReleaseBranches = false, IsReleaseBranch = false, @@ -60,7 +59,7 @@ private GitHubFlowConfigurationBuilder() PreReleaseWeight = 55000 }); - WithBranch(ReleaseBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.ReleaseBranch.Name).WithConfiguration(new BranchConfiguration { DeploymentMode = DeploymentMode.ManualDeployment, Label = "beta", @@ -73,7 +72,7 @@ private GitHubFlowConfigurationBuilder() }, TrackMergeTarget = false, TrackMergeMessage = true, - RegularExpression = ReleaseBranch.RegexPattern, + RegularExpression = this.ReleaseBranch.RegexPattern, SourceBranches = [ this.MainBranch.Name @@ -84,7 +83,7 @@ private GitHubFlowConfigurationBuilder() PreReleaseWeight = 30000 }); - WithBranch(FeatureBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.FeatureBranch.Name).WithConfiguration(new BranchConfiguration { DeploymentMode = DeploymentMode.ManualDeployment, Label = ConfigurationConstants.BranchNamePlaceholder, @@ -93,7 +92,7 @@ private GitHubFlowConfigurationBuilder() { WhenCurrentCommitTagged = false }, - RegularExpression = FeatureBranch.RegexPattern, + RegularExpression = this.FeatureBranch.RegexPattern, SourceBranches = [ this.MainBranch.Name, @@ -104,7 +103,7 @@ private GitHubFlowConfigurationBuilder() PreReleaseWeight = 30000 }); - WithBranch(PullRequestBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.PullRequestBranch.Name).WithConfiguration(new BranchConfiguration { DeploymentMode = DeploymentMode.ContinuousDelivery, Label = $"PullRequest{ConfigurationConstants.PullRequestNumberPlaceholder}", @@ -114,7 +113,7 @@ private GitHubFlowConfigurationBuilder() OfMergedBranch = true, WhenCurrentCommitTagged = false }, - RegularExpression = PullRequestBranch.RegexPattern, + RegularExpression = this.PullRequestBranch.RegexPattern, SourceBranches = [ this.MainBranch.Name, @@ -125,7 +124,7 @@ private GitHubFlowConfigurationBuilder() PreReleaseWeight = 30000 }); - WithBranch(UnknownBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.UnknownBranch.Name).WithConfiguration(new BranchConfiguration { DeploymentMode = DeploymentMode.ManualDeployment, Label = ConfigurationConstants.BranchNamePlaceholder, @@ -134,7 +133,7 @@ private GitHubFlowConfigurationBuilder() { WhenCurrentCommitTagged = false }, - RegularExpression = UnknownBranch.RegexPattern, + RegularExpression = this.UnknownBranch.RegexPattern, SourceBranches = [ this.MainBranch.Name, diff --git a/src/GitVersion.Configuration/Builders/IgnoreConfigurationBuilder.cs b/src/GitVersion.Configuration/Builders/IgnoreConfigurationBuilder.cs index 204a83f10e..b6cdf38578 100644 --- a/src/GitVersion.Configuration/Builders/IgnoreConfigurationBuilder.cs +++ b/src/GitVersion.Configuration/Builders/IgnoreConfigurationBuilder.cs @@ -34,7 +34,7 @@ public IgnoreConfigurationBuilder WithShas(HashSet value) public IIgnoreConfiguration Build() => new IgnoreConfiguration { - Before = before, - Shas = shas + Before = this.before, + Shas = this.shas }; } diff --git a/src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs b/src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs index 608bcc1533..295fc37c1b 100644 --- a/src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs +++ b/src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs @@ -1,4 +1,3 @@ -using GitVersion.Core; using GitVersion.VersionCalculation; namespace GitVersion.Configuration; @@ -45,7 +44,7 @@ private TrunkBasedConfigurationBuilder() IsMainBranch = false }); - WithBranch(MainBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.MainBranch.Name).WithConfiguration(new BranchConfiguration { DeploymentMode = DeploymentMode.ContinuousDeployment, Label = string.Empty, @@ -56,7 +55,7 @@ private TrunkBasedConfigurationBuilder() }, TrackMergeTarget = false, TrackMergeMessage = true, - RegularExpression = MainBranch.RegexPattern, + RegularExpression = this.MainBranch.RegexPattern, SourceBranches = [], TracksReleaseBranches = false, IsReleaseBranch = false, @@ -64,7 +63,7 @@ private TrunkBasedConfigurationBuilder() PreReleaseWeight = 55000 }); - WithBranch(FeatureBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.FeatureBranch.Name).WithConfiguration(new BranchConfiguration { DeploymentMode = DeploymentMode.ContinuousDelivery, Label = ConfigurationConstants.BranchNamePlaceholder, @@ -73,7 +72,7 @@ private TrunkBasedConfigurationBuilder() { WhenCurrentCommitTagged = false }, - RegularExpression = FeatureBranch.RegexPattern, + RegularExpression = this.FeatureBranch.RegexPattern, SourceBranches = [ this.MainBranch.Name @@ -83,7 +82,7 @@ private TrunkBasedConfigurationBuilder() PreReleaseWeight = 30000 }); - WithBranch(HotfixBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.HotfixBranch.Name).WithConfiguration(new BranchConfiguration { DeploymentMode = DeploymentMode.ContinuousDelivery, Label = ConfigurationConstants.BranchNamePlaceholder, @@ -92,7 +91,7 @@ private TrunkBasedConfigurationBuilder() { WhenCurrentCommitTagged = false }, - RegularExpression = HotfixBranch.RegexPattern, + RegularExpression = this.HotfixBranch.RegexPattern, SourceBranches = [ this.MainBranch.Name @@ -102,7 +101,7 @@ private TrunkBasedConfigurationBuilder() PreReleaseWeight = 30000 }); - WithBranch(PullRequestBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.PullRequestBranch.Name).WithConfiguration(new BranchConfiguration { DeploymentMode = DeploymentMode.ContinuousDelivery, Label = $"PullRequest{ConfigurationConstants.PullRequestNumberPlaceholder}", @@ -112,7 +111,7 @@ private TrunkBasedConfigurationBuilder() OfMergedBranch = true, WhenCurrentCommitTagged = false }, - RegularExpression = PullRequestBranch.RegexPattern, + RegularExpression = this.PullRequestBranch.RegexPattern, SourceBranches = [ this.MainBranch.Name, @@ -123,14 +122,14 @@ private TrunkBasedConfigurationBuilder() PreReleaseWeight = 30000 }); - WithBranch(UnknownBranch.Name).WithConfiguration(new BranchConfiguration + WithBranch(this.UnknownBranch.Name).WithConfiguration(new BranchConfiguration { Increment = IncrementStrategy.Patch, PreventIncrement = new PreventIncrementConfiguration { WhenCurrentCommitTagged = false }, - RegularExpression = UnknownBranch.RegexPattern, + RegularExpression = this.UnknownBranch.RegexPattern, SourceBranches = [ this.MainBranch.Name diff --git a/src/GitVersion.Configuration/ConfigurationFileLocator.cs b/src/GitVersion.Configuration/ConfigurationFileLocator.cs index 9d51bfb884..d63d1d33d6 100644 --- a/src/GitVersion.Configuration/ConfigurationFileLocator.cs +++ b/src/GitVersion.Configuration/ConfigurationFileLocator.cs @@ -28,11 +28,11 @@ internal class ConfigurationFileLocator( private readonly ILog log = log.NotNull(); private readonly IOptions options = options.NotNull(); - private string? ConfigurationFile => options.Value.ConfigurationInfo.ConfigurationFile; + private string? ConfigurationFile => this.options.Value.ConfigurationInfo.ConfigurationFile; public void Verify(string? workingDirectory, string? projectRootDirectory) { - if (FileSystemHelper.Path.IsPathRooted(this.ConfigurationFile)) return; + if (FileSystemHelper.Path.IsPathRooted(ConfigurationFile)) return; if (FileSystemHelper.Path.Equal(workingDirectory, projectRootDirectory)) return; WarnAboutAmbiguousConfigFileSelection(workingDirectory, projectRootDirectory); } @@ -46,12 +46,12 @@ public void Verify(string? workingDirectory, string? projectRootDirectory) return customConfigurationFile; } - if (string.IsNullOrWhiteSpace(directoryPath) || !fileSystem.Directory.Exists(directoryPath)) + if (string.IsNullOrWhiteSpace(directoryPath) || !this.fileSystem.Directory.Exists(directoryPath)) { return null; } - var files = fileSystem.Directory.GetFiles(directoryPath); + var files = this.fileSystem.Directory.GetFiles(directoryPath); foreach (var fileName in this.SupportedConfigFileNames) { this.log.Debug($"Trying to find configuration file {fileName} at '{directoryPath}'"); @@ -66,11 +66,11 @@ public void Verify(string? workingDirectory, string? projectRootDirectory) private string? GetCustomConfigurationFilePathIfEligable(string? directoryPath) { - if (string.IsNullOrWhiteSpace(this.ConfigurationFile)) return null; - var configurationFilePath = this.ConfigurationFile; + if (string.IsNullOrWhiteSpace(ConfigurationFile)) return null; + var configurationFilePath = ConfigurationFile; if (!string.IsNullOrWhiteSpace(directoryPath)) { - configurationFilePath = FileSystemHelper.Path.Combine(directoryPath, this.ConfigurationFile); + configurationFilePath = FileSystemHelper.Path.Combine(directoryPath, ConfigurationFile); } return this.fileSystem.File.Exists(configurationFilePath) ? configurationFilePath : null; @@ -89,10 +89,10 @@ private void WarnAboutAmbiguousConfigFileSelection(string? workingDirectory, str throw new WarningException($"Ambiguous configuration file selection from '{workingConfigFile}' and '{projectRootConfigFile}'"); } - if (hasConfigInProjectRootDirectory || hasConfigInWorkingDirectory || this.SupportedConfigFileNames.Any(entry => entry.Equals(this.ConfigurationFile, StringComparison.OrdinalIgnoreCase))) return; + if (hasConfigInProjectRootDirectory || hasConfigInWorkingDirectory || this.SupportedConfigFileNames.Any(entry => entry.Equals(ConfigurationFile, StringComparison.OrdinalIgnoreCase))) return; - workingConfigFile = FileSystemHelper.Path.Combine(workingDirectory, this.ConfigurationFile); - projectRootConfigFile = FileSystemHelper.Path.Combine(projectRootDirectory, this.ConfigurationFile); + workingConfigFile = FileSystemHelper.Path.Combine(workingDirectory, ConfigurationFile); + projectRootConfigFile = FileSystemHelper.Path.Combine(projectRootDirectory, ConfigurationFile); throw new WarningException($"The configuration file was not found at '{workingConfigFile}' or '{projectRootConfigFile}'"); } } diff --git a/src/GitVersion.Configuration/ConfigurationProvider.cs b/src/GitVersion.Configuration/ConfigurationProvider.cs index d0ce12c659..6250f0da77 100644 --- a/src/GitVersion.Configuration/ConfigurationProvider.cs +++ b/src/GitVersion.Configuration/ConfigurationProvider.cs @@ -87,8 +87,8 @@ private IGitVersionConfiguration ProvideConfiguration(string? configFile, } this.log.Info($"Using configuration file '{configFilePath}'"); - var content = fileSystem.File.ReadAllText(configFilePath); - return configurationSerializer.Deserialize>(content); + var content = this.fileSystem.File.ReadAllText(configFilePath); + return this.configurationSerializer.Deserialize>(content); } private static string? GetWorkflow(IReadOnlyDictionary? overrideConfiguration, IReadOnlyDictionary? overrideConfigurationFromFile) diff --git a/src/GitVersion.Configuration/GitVersionConfiguration.cs b/src/GitVersion.Configuration/GitVersionConfiguration.cs index 7e35964d78..075584674a 100644 --- a/src/GitVersion.Configuration/GitVersionConfiguration.cs +++ b/src/GitVersion.Configuration/GitVersionConfiguration.cs @@ -1,6 +1,5 @@ using System.Globalization; using GitVersion.Configuration.Attributes; -using GitVersion.Core; using GitVersion.VersionCalculation; using static GitVersion.Configuration.ConfigurationConstants; @@ -51,9 +50,9 @@ internal sealed record GitVersionConfiguration : BranchConfiguration, IGitVersio [JsonPropertyDescription("Allows you to bump the next version explicitly. Useful for bumping main or a feature branch with breaking changes")] public string? NextVersion { - get => nextVersion; + get => this.nextVersion; set => - nextVersion = int.TryParse(value, NumberStyles.Any, NumberFormatInfo.InvariantInfo, out var major) + this.nextVersion = int.TryParse(value, NumberStyles.Any, NumberFormatInfo.InvariantInfo, out var major) ? $"{major}.0" : value; } diff --git a/src/GitVersion.Core.Tests/CommitDateTests.cs b/src/GitVersion.Core.Tests/CommitDateTests.cs index 35c8241c8d..709a2d2686 100644 --- a/src/GitVersion.Core.Tests/CommitDateTests.cs +++ b/src/GitVersion.Core.Tests/CommitDateTests.cs @@ -1,7 +1,6 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class CommitDateTests : TestBase diff --git a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs index 44de42672e..11f2947dfa 100644 --- a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs +++ b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs @@ -1,8 +1,7 @@ using System.IO.Abstractions; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class DynamicRepositoryTests : TestBase diff --git a/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs index 9173866a28..02fe1cf961 100644 --- a/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs +++ b/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs @@ -1,7 +1,6 @@ using System.IO.Abstractions; using GitVersion.Agents; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.Git; using GitVersion.Helpers; @@ -10,7 +9,7 @@ using GitVersion.VersionCalculation.Caching; using LibGit2Sharp; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] [Parallelizable(ParallelScope.None)] @@ -69,7 +68,7 @@ public void CacheKeySameAfterReNormalizing() this.sp = GetServiceProvider(gitVersionOptions, environment: environment); - sp.DiscoverRepository(); + this.sp.DiscoverRepository(); var preparer = this.sp.GetRequiredService(); var repositoryInfo = this.sp.GetRequiredService(); @@ -126,7 +125,7 @@ public void CacheKeyForWorktree() this.sp = GetServiceProvider(gitVersionOptions); - sp.DiscoverRepository(); + this.sp.DiscoverRepository(); var preparer = this.sp.GetRequiredService(); var repositoryInfo = this.sp.GetRequiredService(); @@ -416,7 +415,7 @@ public void CalculateVersionFromWorktreeHead() // Setup this.fileSystem = new FileSystem(); using var fixture = new EmptyRepositoryFixture(); - var repoDir = fileSystem.DirectoryInfo.New(fixture.RepositoryPath); + var repoDir = this.fileSystem.DirectoryInfo.New(fixture.RepositoryPath); var worktreePath = FileSystemHelper.Path.Combine(repoDir.Parent?.FullName, $"{repoDir.Name}-v1"); fixture.Repository.MakeATaggedCommit("v1.0.0"); @@ -461,9 +460,9 @@ public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndNotTa this.sp = GetServiceProvider(gitVersionOptions, environment: environment); - sp.DiscoverRepository(); + this.sp.DiscoverRepository(); - var sut = sp.GetRequiredService(); + var sut = this.sp.GetRequiredService(); // Execute & Verify var exception = Assert.Throws(() => sut.CalculateVersionVariables()); @@ -491,9 +490,9 @@ public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndTagge this.sp = GetServiceProvider(gitVersionOptions, environment: environment); - sp.DiscoverRepository(); + this.sp.DiscoverRepository(); - var sut = sp.GetRequiredService(); + var sut = this.sp.GetRequiredService(); // Execute var version = sut.CalculateVersionVariables(); @@ -520,9 +519,9 @@ public void CalculateVersionVariables_ShallowFetch_ThrowException() this.sp = GetServiceProvider(gitVersionOptions, environment: environment); - sp.DiscoverRepository(); + this.sp.DiscoverRepository(); - var sut = sp.GetRequiredService(); + var sut = this.sp.GetRequiredService(); // Execute & Verify var exception = Assert.Throws(() => sut.CalculateVersionVariables()); @@ -548,9 +547,9 @@ public void CalculateVersionVariables_ShallowFetch_WithAllowShallow_ShouldNotThr this.sp = GetServiceProvider(gitVersionOptions, environment: environment); - sp.DiscoverRepository(); + this.sp.DiscoverRepository(); - var sut = sp.GetRequiredService(); + var sut = this.sp.GetRequiredService(); // Execute var version = sut.CalculateVersionVariables(); @@ -584,8 +583,8 @@ public void CalculateVersionVariables_WithLimitedCloneDepth_AndAllowShallowTrue_ environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true"); this.sp = GetServiceProvider(gitVersionOptions, environment: environment); - sp.DiscoverRepository(); - var sut = sp.GetRequiredService(); + this.sp.DiscoverRepository(); + var sut = this.sp.GetRequiredService(); // Execute var version = sut.CalculateVersionVariables(); @@ -625,7 +624,7 @@ private IGitVersionCalculateTool GetGitVersionCalculator(GitVersionOptions gitVe this.log = this.sp.GetRequiredService(); this.gitVersionCacheProvider = (GitVersionCacheProvider)this.sp.GetRequiredService(); - sp.DiscoverRepository(); + this.sp.DiscoverRepository(); return this.sp.GetRequiredService(); } diff --git a/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs b/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs index a2f26423ed..2c5f1fd616 100644 --- a/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs +++ b/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs @@ -1,9 +1,8 @@ using System.IO.Abstractions; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using LibGit2Sharp; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class GitVersionTaskDirectoryTests : TestBase @@ -30,7 +29,7 @@ public void FindsGitDirectory() { var exception = Assert.Catch(() => { - var options = Options.Create(new GitVersionOptions { WorkingDirectory = workDirectory, Settings = { NoFetch = true } }); + var options = Options.Create(new GitVersionOptions { WorkingDirectory = this.workDirectory, Settings = { NoFetch = true } }); var sp = ConfigureServices(services => services.AddSingleton(options)); diff --git a/src/GitVersion.Core.Tests/Core/RegexPatternTests.cs b/src/GitVersion.Core.Tests/Core/RegexPatternTests.cs index ebe0dcd89c..214a623b4a 100644 --- a/src/GitVersion.Core.Tests/Core/RegexPatternTests.cs +++ b/src/GitVersion.Core.Tests/Core/RegexPatternTests.cs @@ -1,7 +1,7 @@ using System.Text.RegularExpressions; -using static GitVersion.Core.RegexPatterns.AssemblyVersion; +using static GitVersion.RegexPatterns.AssemblyVersion; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; public class RegexPatternsTests { diff --git a/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs b/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs index 5e9addaab6..2da5b54a9f 100644 --- a/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs +++ b/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs @@ -1,7 +1,6 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Git; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class RepositoryExtensionsTests : TestBase diff --git a/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs b/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs index d6fdfeb0fd..17b7461c1d 100644 --- a/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs +++ b/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs @@ -1,9 +1,8 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Git; using GitVersion.Logging; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class RepositoryStoreTests : TestBase diff --git a/src/GitVersion.Core.Tests/DocumentationTests.cs b/src/GitVersion.Core.Tests/DocumentationTests.cs index eae8a34f56..def7fd4bd3 100644 --- a/src/GitVersion.Core.Tests/DocumentationTests.cs +++ b/src/GitVersion.Core.Tests/DocumentationTests.cs @@ -1,10 +1,9 @@ using System.IO.Abstractions; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.OutputVariables; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class DocumentationTests : TestBase @@ -62,7 +61,7 @@ private string ReadDocumentationFile(string relativeDocumentationFilePath) { var documentationFilePath = FileSystemHelper.Path.Combine(this.docsDirectory.FullName, relativeDocumentationFilePath); // Normalize path separators and such. - documentationFilePath = fileSystem.FileInfo.New(documentationFilePath).FullName; + documentationFilePath = this.fileSystem.FileInfo.New(documentationFilePath).FullName; if (!this.fileSystem.File.Exists(documentationFilePath)) { diff --git a/src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs b/src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs index 7b6171debc..2bc7efa5aa 100644 --- a/src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs +++ b/src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs @@ -1,6 +1,5 @@ using GitVersion.Agents; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.Git; using GitVersion.Helpers; @@ -9,7 +8,7 @@ using GitVersion.VersionCalculation; using LibGit2Sharp; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; public static class GitRepositoryTestingExtensions { diff --git a/src/GitVersion.Core.Tests/Extensions/GitVersionVariablesExtensions.cs b/src/GitVersion.Core.Tests/Extensions/GitVersionVariablesExtensions.cs index acfd773093..e33a8df081 100644 --- a/src/GitVersion.Core.Tests/Extensions/GitVersionVariablesExtensions.cs +++ b/src/GitVersion.Core.Tests/Extensions/GitVersionVariablesExtensions.cs @@ -1,7 +1,7 @@ using System.IO.Abstractions; using GitVersion.OutputVariables; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; public static class GitVersionVariablesExtensions { diff --git a/src/GitVersion.Core.Tests/Extensions/MockCollectionExtensions.cs b/src/GitVersion.Core.Tests/Extensions/MockCollectionExtensions.cs index 3343652479..2e47ae716c 100644 --- a/src/GitVersion.Core.Tests/Extensions/MockCollectionExtensions.cs +++ b/src/GitVersion.Core.Tests/Extensions/MockCollectionExtensions.cs @@ -1,4 +1,4 @@ -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; public static class MockCollectionExtensions { diff --git a/src/GitVersion.Core.Tests/Extensions/ShouldlyExtensions.cs b/src/GitVersion.Core.Tests/Extensions/ShouldlyExtensions.cs index 437b8a3ad0..9c7a407480 100644 --- a/src/GitVersion.Core.Tests/Extensions/ShouldlyExtensions.cs +++ b/src/GitVersion.Core.Tests/Extensions/ShouldlyExtensions.cs @@ -1,4 +1,4 @@ -namespace GitVersion.Core.Tests.Extensions; +namespace GitVersion.Tests.Extensions; public static class ShouldlyExtensions { diff --git a/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs b/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs index d8ffb55789..3e67be55a7 100644 --- a/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs +++ b/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs @@ -1,8 +1,7 @@ using System.Globalization; -using GitVersion.Core.Tests.Helpers; using GitVersion.Formatting; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class StringFormatWithExtensionTests diff --git a/src/GitVersion.Core.Tests/Formatting/DateFormatterTests.cs b/src/GitVersion.Core.Tests/Formatting/DateFormatterTests.cs index dd89018c81..417c61d6b9 100644 --- a/src/GitVersion.Core.Tests/Formatting/DateFormatterTests.cs +++ b/src/GitVersion.Core.Tests/Formatting/DateFormatterTests.cs @@ -1,7 +1,7 @@ using System.Globalization; using GitVersion.Formatting; -namespace GitVersion.Core.Tests.Formatting; +namespace GitVersion.Tests.Formatting; [TestFixture] public class DateFormatterTests diff --git a/src/GitVersion.Core.Tests/Formatting/EdgeCaseTests.cs b/src/GitVersion.Core.Tests/Formatting/EdgeCaseTests.cs index bd7e955aa2..52b2d614bb 100644 --- a/src/GitVersion.Core.Tests/Formatting/EdgeCaseTests.cs +++ b/src/GitVersion.Core.Tests/Formatting/EdgeCaseTests.cs @@ -1,7 +1,7 @@ -using GitVersion.Core.Tests.Extensions; -using GitVersion.Formatting; +using GitVersion.Formatting; +using GitVersion.Tests.Extensions; -namespace GitVersion.Core.Tests.Formatting; +namespace GitVersion.Tests.Formatting; [TestFixture] public class EdgeCaseTests diff --git a/src/GitVersion.Core.Tests/Formatting/FormattableFormatterTests.cs b/src/GitVersion.Core.Tests/Formatting/FormattableFormatterTests.cs index 8b0f75f048..1404c18b20 100644 --- a/src/GitVersion.Core.Tests/Formatting/FormattableFormatterTests.cs +++ b/src/GitVersion.Core.Tests/Formatting/FormattableFormatterTests.cs @@ -1,7 +1,7 @@ using System.Globalization; using GitVersion.Formatting; -namespace GitVersion.Core.Tests.Formatting; +namespace GitVersion.Tests.Formatting; [TestFixture] public class FormattableFormatterTests diff --git a/src/GitVersion.Core.Tests/Formatting/NumericFormatterTests.cs b/src/GitVersion.Core.Tests/Formatting/NumericFormatterTests.cs index dae044b694..04c2176e74 100644 --- a/src/GitVersion.Core.Tests/Formatting/NumericFormatterTests.cs +++ b/src/GitVersion.Core.Tests/Formatting/NumericFormatterTests.cs @@ -1,6 +1,6 @@ using GitVersion.Formatting; -namespace GitVersion.Core.Tests.Formatting; +namespace GitVersion.Tests.Formatting; [TestFixture] public class NumericFormatterTests diff --git a/src/GitVersion.Core.Tests/Formatting/SanitizeEnvVarNameTests.cs b/src/GitVersion.Core.Tests/Formatting/SanitizeEnvVarNameTests.cs index 4732fceb3e..e45e872b4e 100644 --- a/src/GitVersion.Core.Tests/Formatting/SanitizeEnvVarNameTests.cs +++ b/src/GitVersion.Core.Tests/Formatting/SanitizeEnvVarNameTests.cs @@ -1,8 +1,8 @@ using System.Diagnostics.CodeAnalysis; -using GitVersion.Core.Tests.Extensions; using GitVersion.Formatting; +using GitVersion.Tests.Extensions; -namespace GitVersion.Core.Tests.Formatting; +namespace GitVersion.Tests.Formatting; [SuppressMessage("Style", "IDE0059:Unnecessary assignment of a value")] [SuppressMessage("Style", "IDE0060:Remove unused parameter")] diff --git a/src/GitVersion.Core.Tests/Formatting/SanitizeFormatTests.cs b/src/GitVersion.Core.Tests/Formatting/SanitizeFormatTests.cs index 632bbb4a6d..67da937637 100644 --- a/src/GitVersion.Core.Tests/Formatting/SanitizeFormatTests.cs +++ b/src/GitVersion.Core.Tests/Formatting/SanitizeFormatTests.cs @@ -1,8 +1,8 @@ using System.Diagnostics.CodeAnalysis; -using GitVersion.Core.Tests.Extensions; using GitVersion.Formatting; +using GitVersion.Tests.Extensions; -namespace GitVersion.Core.Tests.Formatting; +namespace GitVersion.Tests.Formatting; [SuppressMessage("Style", "IDE0059:Unnecessary assignment of a value")] [SuppressMessage("Style", "IDE0060:Remove unused parameter")] diff --git a/src/GitVersion.Core.Tests/Formatting/SanitizeMemberNameTests.cs b/src/GitVersion.Core.Tests/Formatting/SanitizeMemberNameTests.cs index 1aae91f1b4..eebe473648 100644 --- a/src/GitVersion.Core.Tests/Formatting/SanitizeMemberNameTests.cs +++ b/src/GitVersion.Core.Tests/Formatting/SanitizeMemberNameTests.cs @@ -1,8 +1,8 @@ using System.Diagnostics.CodeAnalysis; -using GitVersion.Core.Tests.Extensions; using GitVersion.Formatting; +using GitVersion.Tests.Extensions; -namespace GitVersion.Core.Tests.Formatting; +namespace GitVersion.Tests.Formatting; [SuppressMessage("Style", "IDE0059:Unnecessary assignment of a value")] [SuppressMessage("Style", "IDE0060:Remove unused parameter")] diff --git a/src/GitVersion.Core.Tests/Formatting/StringFormatterTests.cs b/src/GitVersion.Core.Tests/Formatting/StringFormatterTests.cs index 7c9024fe79..b9f3c0a27d 100644 --- a/src/GitVersion.Core.Tests/Formatting/StringFormatterTests.cs +++ b/src/GitVersion.Core.Tests/Formatting/StringFormatterTests.cs @@ -1,6 +1,6 @@ using GitVersion.Formatting; -namespace GitVersion.Core.Tests.Formatting; +namespace GitVersion.Tests.Formatting; [TestFixture] public class StringFormatterTests diff --git a/src/GitVersion.Core.Tests/Formatting/ValueFormatterTests.cs b/src/GitVersion.Core.Tests/Formatting/ValueFormatterTests.cs index 675377215e..9950cac172 100644 --- a/src/GitVersion.Core.Tests/Formatting/ValueFormatterTests.cs +++ b/src/GitVersion.Core.Tests/Formatting/ValueFormatterTests.cs @@ -1,7 +1,7 @@ using System.Globalization; using GitVersion.Formatting; -namespace GitVersion.Core.Tests.Formatting; +namespace GitVersion.Tests.Formatting; [TestFixture] public class ValueFormatterTests diff --git a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj index 446ac51a69..7d0ca0d4df 100644 --- a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj +++ b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj @@ -4,6 +4,7 @@ full false true + GitVersion.Tests diff --git a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj.DotSettings b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj.DotSettings new file mode 100644 index 0000000000..f4f0b9072f --- /dev/null +++ b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj.DotSettings @@ -0,0 +1,3 @@ + + True + True \ No newline at end of file diff --git a/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs b/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs index b1444b2014..150b91d831 100644 --- a/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs +++ b/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs @@ -1,8 +1,7 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.Git; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; public class GitVersionContextBuilder : IDisposable { @@ -56,8 +55,8 @@ public void Build() { var repo = this.repository ?? CreateRepository(); - emptyRepositoryFixture = new(); - var options = Options.Create(new GitVersionOptions { WorkingDirectory = emptyRepositoryFixture.RepositoryPath, ConfigurationInfo = { OverrideConfiguration = this.overrideConfiguration } }); + this.emptyRepositoryFixture = new(); + var options = Options.Create(new GitVersionOptions { WorkingDirectory = this.emptyRepositoryFixture.RepositoryPath, ConfigurationInfo = { OverrideConfiguration = this.overrideConfiguration } }); this.ServicesProvider = ConfigureServices(services => { diff --git a/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs b/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs index 1c9b3773f3..757ee5b63d 100644 --- a/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs +++ b/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs @@ -5,7 +5,7 @@ using GitVersion.Logging; using GitVersion.Output; -namespace GitVersion.Core.Tests.Helpers; +namespace GitVersion.Tests; public class GitVersionCoreTestModule : IGitVersionModule { diff --git a/src/GitVersion.Core.Tests/Helpers/ParticipantSanitizerTests.cs b/src/GitVersion.Core.Tests/Helpers/ParticipantSanitizerTests.cs index ad5f854bd3..450e19c08b 100644 --- a/src/GitVersion.Core.Tests/Helpers/ParticipantSanitizerTests.cs +++ b/src/GitVersion.Core.Tests/Helpers/ParticipantSanitizerTests.cs @@ -1,6 +1,6 @@ using GitVersion.Testing.Helpers; -namespace GitVersion.Core.Tests.Helpers; +namespace GitVersion.Tests; [TestFixture] public class ParticipantSanitizerTests diff --git a/src/GitVersion.Core.Tests/Helpers/TestBase.cs b/src/GitVersion.Core.Tests/Helpers/TestBase.cs index e9b6d677ea..9bf765f5ce 100644 --- a/src/GitVersion.Core.Tests/Helpers/TestBase.cs +++ b/src/GitVersion.Core.Tests/Helpers/TestBase.cs @@ -1,7 +1,7 @@ using GitVersion.Extensions; using GitVersion.Git; -namespace GitVersion.Core.Tests.Helpers; +namespace GitVersion.Tests; public class TestBase { diff --git a/src/GitVersion.Core.Tests/Helpers/TestConsoleAdapter.cs b/src/GitVersion.Core.Tests/Helpers/TestConsoleAdapter.cs index 3ae5935b28..e9ebe1496b 100644 --- a/src/GitVersion.Core.Tests/Helpers/TestConsoleAdapter.cs +++ b/src/GitVersion.Core.Tests/Helpers/TestConsoleAdapter.cs @@ -1,7 +1,7 @@ using GitVersion.Helpers; using GitVersion.Logging; -namespace GitVersion.Core.Tests.Helpers; +namespace GitVersion.Tests; public class TestConsoleAdapter(StringBuilder sb) : IConsole { diff --git a/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs b/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs index 99eb6b2090..75762951f9 100644 --- a/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs +++ b/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs @@ -1,4 +1,4 @@ -namespace GitVersion.Core.Tests.Helpers; +namespace GitVersion.Tests; public class TestEnvironment : IEnvironment { diff --git a/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs b/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs index 5bbd6cae9d..9ad9057845 100644 --- a/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs +++ b/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs @@ -1,6 +1,6 @@ using GitVersion.Logging; -namespace GitVersion.Core.Tests.Helpers; +namespace GitVersion.Tests; public class TestLogAppender(Action logAction) : ILogAppender { diff --git a/src/GitVersion.Core.Tests/Helpers/TestableGitVersionVariables.cs b/src/GitVersion.Core.Tests/Helpers/TestableGitVersionVariables.cs index 046eb906c2..7cdc8641e9 100644 --- a/src/GitVersion.Core.Tests/Helpers/TestableGitVersionVariables.cs +++ b/src/GitVersion.Core.Tests/Helpers/TestableGitVersionVariables.cs @@ -1,6 +1,6 @@ using GitVersion.OutputVariables; -namespace GitVersion.Core.Tests.Helpers; +namespace GitVersion.Tests; internal record TestableGitVersionVariables() : GitVersionVariables( AssemblySemFileVer: "", diff --git a/src/GitVersion.Core.Tests/IntegrationTests/AlignGitFlowWithMainlineVersionStrategy.cs b/src/GitVersion.Core.Tests/IntegrationTests/AlignGitFlowWithMainlineVersionStrategy.cs index 5b7484c6b1..7f44fd0ff0 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/AlignGitFlowWithMainlineVersionStrategy.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/AlignGitFlowWithMainlineVersionStrategy.cs @@ -2,7 +2,7 @@ using GitVersion.VersionCalculation; // ReSharper disable ConvertIfStatementToConditionalTernaryExpression -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/GitVersion.Core.Tests/IntegrationTests/AlignGitHubFlowWithMainlineVersionStrategy.cs b/src/GitVersion.Core.Tests/IntegrationTests/AlignGitHubFlowWithMainlineVersionStrategy.cs index 3a9aae8822..5938d15ba8 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/AlignGitHubFlowWithMainlineVersionStrategy.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/AlignGitHubFlowWithMainlineVersionStrategy.cs @@ -2,7 +2,7 @@ using GitVersion.VersionCalculation; // ReSharper disable ConvertIfStatementToConditionalTernaryExpression -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs index d28ddad75d..7bb9ae4283 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs @@ -1,8 +1,7 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class BranchWithoutCommitScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitFlow.cs b/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitFlow.cs index ec307dd2b8..973e2e90c9 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitFlow.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitFlow.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitHubFlow.cs b/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitHubFlow.cs index 4a66feb476..c741bc996d 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitHubFlow.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/CompareTheDifferentWhenUsingMainlineVersionStrategyWithGitHubFlow.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/GitVersion.Core.Tests/IntegrationTests/ComparingTheBehaviorOfDifferentVersioningModes.cs b/src/GitVersion.Core.Tests/IntegrationTests/ComparingTheBehaviorOfDifferentVersioningModes.cs index f1d4833705..469e841ce5 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/ComparingTheBehaviorOfDifferentVersioningModes.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/ComparingTheBehaviorOfDifferentVersioningModes.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; /// /// - For mode 1 the main-releases are especially not marked with dedicated tags. diff --git a/src/GitVersion.Core.Tests/IntegrationTests/ContinuousDeliveryTestScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/ContinuousDeliveryTestScenarios.cs index fc3168c637..6dc41afbb6 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/ContinuousDeliveryTestScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/ContinuousDeliveryTestScenarios.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class ContinuousDeliveryTestScenarios @@ -115,7 +115,7 @@ public void ShouldUseTaggedVersionWhenGreaterThanConfiguredNextVersion() public void ShouldCalculateTheCorrectVersionWhenMergingFromMainToFeatureBranch() { // *94f03f8 55 minutes ago(HEAD -> main) - // |\ + // |\ // | *b1f41a4 56 minutes ago // |/ // *ec77f9c 58 minutes ago @@ -168,7 +168,7 @@ public void ShouldCalculateTheCorrectVersionWhenMergingFromMainToFeatureBranch() public void ShouldCalculateTheCorrectVersionWhenMergingFromDevelopToFeatureBranch() { // *2c475bf 55 minutes ago(HEAD -> develop) - // |\ + // |\ // | *e05365d 56 minutes ago // |/ // *67acc03 58 minutes ago(main) @@ -220,7 +220,7 @@ public void ShouldCalculateTheCorrectVersionWhenMergingFromReleaseToFeatureBranc { // *b1e5593 53 minutes ago(HEAD -> release/ 1.0.0) // *8752695 55 minutes ago - // |\ + // |\ // | *0965b88 56 minutes ago // |/ // *f63a536 58 minutes ago(main) @@ -272,7 +272,7 @@ public void ShouldCalculateTheCorrectVersionWhenMergingFromReleaseToFeatureBranc public void ShouldFallbackToTheVersionOnDevelopLikeTheReleaseWasNeverCreatedWhenReleaseHasBeenCanceled() { // *8f062c7 49 minutes ago(HEAD -> develop) - // |\ + // |\ // | *bda6ba8 52 minutes ago // | *6f5cf19 54 minutes ago // * | 3b20f15 50 minutes ago @@ -354,16 +354,16 @@ public void ShouldFallbackToTheVersionOnDevelopLikeTheReleaseWasNeverCreatedWhen public void ShouldConsiderTheMergeCommitFromMainToDevelopWhenReleaseHasBeenMergedAndTaggedOnMain() { // * 5d13120 48 minutes ago (HEAD -> develop) - // |\ + // |\ // | * 8ddd9b0 49 minutes ago (tag: 1.0.0, main) - // | |\ - // | | * 4b826b8 52 minutes ago - // | | * d4b0047 54 minutes ago - // * | | 0457671 50 minutes ago - // | |/ - // |/| - // * | 5f31f30 56 minutes ago - // |/ + // | |\ + // | | * 4b826b8 52 minutes ago + // | | * d4b0047 54 minutes ago + // * | | 0457671 50 minutes ago + // | |/ + // |/| + // * | 5f31f30 56 minutes ago + // |/ // * 252971e 58 minutes ago var configuration = GitFlowConfigurationBuilder.New diff --git a/src/GitVersion.Core.Tests/IntegrationTests/CreatingAFeatureBranchFromAReleaseBranchScenario.cs b/src/GitVersion.Core.Tests/IntegrationTests/CreatingAFeatureBranchFromAReleaseBranchScenario.cs index bf2341ea9e..ae7dec7e3c 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/CreatingAFeatureBranchFromAReleaseBranchScenario.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/CreatingAFeatureBranchFromAReleaseBranchScenario.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.Testing.Extensions; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; /// /// Version not generated correct when creating a feature branch from a release branch #3101 @@ -14,7 +14,7 @@ public void ShouldTreatTheFeatureBranchLikeTheFirstReleaseBranchWhenItHasBeenBra { // *f59b84f in the future(HEAD -> release/ 1.0.0) // *d0f4669 in the future - // |\ + // |\ // | *471acec in the future // |/ // | *266fa68 in the future(release/ 1.1.0, main) @@ -90,7 +90,7 @@ public void ShouldTreatTheFeatureBranchNotLikeTheReleaseBranchWhenItHasBeenBranc { // *19ed1e8 in the future(HEAD -> release/ 1.0.0) // *1684169 in the future - // |\ + // |\ // | *07bd75c in the future // |/ // | *ff34213 in the future(release/ 1.1.0, develop) @@ -172,7 +172,7 @@ public void ShouldTreatTheHotfixBranchLikeTheFirstReleaseBranchWhenItHasBeenBran { // *2b9c8bf 42 minutes ago(HEAD -> release/ 1.0.0) // *66cfc66 44 minutes ago - // |\ + // |\ // | *e9978b9 45 minutes ago // |/ // | *c2b96e5 47 minutes ago(release/ 1.1.0, main|develop) @@ -240,7 +240,7 @@ public void ShouldTreatTheHotfixBranchLikeTheFirstReleaseBranchWhenItHasBeenBran { // *2b9c8bf 42 minutes ago(HEAD -> release/ 1.0.0) // *66cfc66 44 minutes ago - // |\ + // |\ // | *e9978b9 45 minutes ago // |/ // | *c2b96e5 47 minutes ago(release/ 1.1.0, main|develop) @@ -309,14 +309,14 @@ public void ShouldTreatTheHotfixBranchLikeTheFirstReleaseBranchWhenItHasBeenBran public void ShouldTreatTheFeatureBranchLikeTheFirstReleaseBranchWhenItHasBeenBranchedFromFirstButNotFromTheSecondReleaseBranchFromMain() { // * 3807c66 49 minutes ago (HEAD -> release/1.0.0) - // * da32145 51 minutes ago - // |\ - // | * 6a89f35 52 minutes ago - // |/ - // * 19f2980 56 minutes ago + // * da32145 51 minutes ago + // |\ + // | * 6a89f35 52 minutes ago + // |/ + // * 19f2980 56 minutes ago // | * 2282a59 54 minutes ago (release/1.1.0, main) - // |/ - // * d7b7c5e 58 minutes ago + // |/ + // * d7b7c5e 58 minutes ago var configuration = GitFlowConfigurationBuilder.New.Build(); @@ -380,7 +380,7 @@ public void ShouldTreatTheFeatureBranchLikeTheFirstReleaseBranchWhenItHasBeenBra { // *1525ad0 38 minutes ago(HEAD -> release/ 1.0.0) // *476fc51 40 minutes ago - // |\ + // |\ // | *c8c5030 41 minutes ago // |/ // *d91061d 45 minutes ago @@ -453,7 +453,7 @@ public void ShouldTreatTheHotfixBranchLikeTheFirstReleaseBranchWhenItHasBeenBran { // *1525ad0 38 minutes ago(HEAD -> release/ 1.0.0) // *476fc51 40 minutes ago - // |\ + // |\ // | *c8c5030 41 minutes ago // |/ // *d91061d 45 minutes ago @@ -523,7 +523,7 @@ public void ShouldTreatTheHotfixBranchLikeTheFirstReleaseBranchWhenItHasBeenBran { // *1525ad0 38 minutes ago(HEAD -> release/ 1.0.0) // *476fc51 40 minutes ago - // |\ + // |\ // | *c8c5030 41 minutes ago // |/ // *d91061d 45 minutes ago @@ -596,7 +596,7 @@ public void ShouldTreatTheFeatureBranchLikeTheReleaseBranchWhenItHasBeenBranched { // *588f0de in the future(HEAD -> release/ 1.0.0) // *56f660c in the future - // |\ + // |\ // | *9450fb0 in the future // |/ // *9e557cd in the future @@ -659,7 +659,7 @@ public void ShouldTreatTheMergeFromReleaseToDevelopLikeTheReleaseBranchHasNeverB { // *809eaa7 in the future(HEAD -> develop) // *46e2cb8 in the future - // |\ + // |\ // | *08bd8ff in the future // | *9b741de in the future // * | 13206fd in the future @@ -733,9 +733,9 @@ public void ShouldTreatTheMergeFromReleaseToDevelopLikeTheReleaseBranchHasNeverB public void ShouldOnlyTrackTheCommitsOnDevelopBranchForNextReleaseWhenReleaseHasBeenShippedToProduction() { // *9afb0ca in the future(HEAD -> develop) - // |\ + // |\ // | *90c96f2 in the future(tag: 1.0.0, main) - // | |\ + // | |\ // | | *7de3d63 in the future // | | *2ccf33b in the future // * | | e050757 in the future @@ -822,9 +822,9 @@ public void ShouldOnlyTrackTheCommitsOnDevelopBranchForNextReleaseWhenReleaseHas public void ShouldNotConsiderTheMergeCommitFromReleaseToMainWhenCommitHasNotBeenTagged() { // *457e0cd in the future(HEAD -> develop) - // |\ + // |\ // | *d9da657 in the future(tag: 1.0.0, main) - // | |\ + // | |\ // | | *026a6cd in the future // | | *7f5de6e in the future // * | | 3db6e6f in the future diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs index f137a05c52..826fcdbfe6 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs @@ -1,10 +1,9 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using GitVersion.VersionCalculation; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class DevelopScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs index 92f40572c4..f12cca9ab3 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs @@ -1,7 +1,6 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class DocumentationSamples : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitFlow.cs b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitFlow.cs index fadd1a4db5..634a201ac4 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitFlow.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitFlow.cs @@ -3,7 +3,7 @@ using GitVersion.VersionCalculation; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class DocumentationSamplesForGitFlow diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitHubFlow.cs b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitHubFlow.cs index 5ce48685e8..642c68c12e 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitHubFlow.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitHubFlow.cs @@ -3,7 +3,7 @@ using GitVersion.VersionCalculation; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class DocumentationSamplesForGitHubFlow diff --git a/src/GitVersion.Core.Tests/IntegrationTests/FallbackVersionStrategyScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/FallbackVersionStrategyScenarios.cs index 9076c18b5c..2a0b999bda 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/FallbackVersionStrategyScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/FallbackVersionStrategyScenarios.cs @@ -1,8 +1,7 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class FallbackVersionStrategyScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs index c904627794..2dd69830da 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs @@ -1,10 +1,9 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using GitVersion.VersionCalculation; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class FeatureBranchScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/GitflowScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/GitflowScenarios.cs index a466855b43..ec2cdf9325 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/GitflowScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/GitflowScenarios.cs @@ -1,6 +1,4 @@ -using GitVersion.Core.Tests.Helpers; - -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class GitflowScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs index bda5d9b777..f334ced802 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs @@ -1,9 +1,8 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class HotfixBranchScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/IgnoreCommitScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/IgnoreCommitScenarios.cs index fcb1cc9b02..8fa98f7b06 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/IgnoreCommitScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/IgnoreCommitScenarios.cs @@ -1,8 +1,7 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class IgnoreCommitScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs index 1bac81dc8e..7e12383aaa 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs @@ -1,10 +1,9 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using GitVersion.VersionCalculation; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class MainScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentScenarios.cs index 087f09cd38..65063680b6 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentScenarios.cs @@ -1,9 +1,8 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; public class MainlineDevelopmentScenarios : TestBase { diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs index 52fdcb1862..f54fc69fe8 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs @@ -1,10 +1,9 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using GitVersion.VersionCalculation; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class OtherBranchScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs index eb1014596d..02bdf51742 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs @@ -1,14 +1,13 @@ using System.Globalization; using System.IO.Abstractions; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.Helpers; using GitVersion.Testing.Extensions; using GitVersion.VersionCalculation; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class OtherScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/PerformanceScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/PerformanceScenarios.cs index cb92616ac8..3fc792c54f 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/PerformanceScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/PerformanceScenarios.cs @@ -1,7 +1,6 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; public class PerformanceScenarios : TestBase { diff --git a/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs index 53d0dfb117..bdb2749544 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs @@ -1,9 +1,8 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class PullRequestScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs index 9d8bb5385e..f05a915d82 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs @@ -1,9 +1,8 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class ReleaseBranchScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs index ac92ff6710..ac1e4b4150 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs @@ -1,9 +1,8 @@ using GitVersion.Agents; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class RemoteRepositoryScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/SemVerOfAFeatureBranchStartedFromAReleaseBranchGetsDecrementedScenario.cs b/src/GitVersion.Core.Tests/IntegrationTests/SemVerOfAFeatureBranchStartedFromAReleaseBranchGetsDecrementedScenario.cs index b150e366b6..aad1785d23 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/SemVerOfAFeatureBranchStartedFromAReleaseBranchGetsDecrementedScenario.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/SemVerOfAFeatureBranchStartedFromAReleaseBranchGetsDecrementedScenario.cs @@ -1,4 +1,4 @@ -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; /// /// [Bug] SemVer of a feature branch started from a release branch gets decremented #3151 diff --git a/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs index 45c0b672e2..4ea353009f 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs @@ -1,9 +1,8 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class SupportBranchScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs index d634a722fd..71da44d23d 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs @@ -1,8 +1,7 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class SwitchingToGitFlowScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs index 9e1cdfae04..34af0e7459 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs @@ -1,7 +1,6 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class TagCheckoutScenarios diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs index aba3dff795..cb26b5441c 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs @@ -1,10 +1,9 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Testing.Extensions; using GitVersion.VersionCalculation; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class VersionBumpingScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs index 387559ff4e..bd286b7f4b 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs @@ -1,8 +1,7 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class VersionInCurrentBranchNameScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs index 975faead87..90830d7144 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs @@ -1,8 +1,7 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class VersionInMergedBranchNameScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs index f03603c417..a6fcd7b6e5 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs @@ -1,7 +1,6 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] internal class VersionInTagScenarios diff --git a/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs index 42aa6c89fc..81e4d58816 100644 --- a/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs +++ b/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs @@ -1,10 +1,9 @@ using System.IO.Abstractions; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.Testing.Extensions; using LibGit2Sharp; -namespace GitVersion.Core.Tests.IntegrationTests; +namespace GitVersion.Tests.IntegrationTests; [TestFixture] public class WorktreeScenarios : TestBase diff --git a/src/GitVersion.Core.Tests/Logging/LoggerTest.cs b/src/GitVersion.Core.Tests/Logging/LoggerTest.cs index 25fd83ab0a..567f0db4e8 100644 --- a/src/GitVersion.Core.Tests/Logging/LoggerTest.cs +++ b/src/GitVersion.Core.Tests/Logging/LoggerTest.cs @@ -1,7 +1,6 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Logging; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class LoggerTest : TestBase diff --git a/src/GitVersion.Core.Tests/Logging/LoggingTests.cs b/src/GitVersion.Core.Tests/Logging/LoggingTests.cs index 9a8b45ab8a..b2e6f32133 100644 --- a/src/GitVersion.Core.Tests/Logging/LoggingTests.cs +++ b/src/GitVersion.Core.Tests/Logging/LoggingTests.cs @@ -1,6 +1,6 @@ using GitVersion.Logging; -namespace GitVersion.Core.Tests.Logging; +namespace GitVersion.Tests.Logging; [TestFixture] public class LoggingTests diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs index 7780f7d084..b5eaf14dc0 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitFlow { @@ -24,16 +24,16 @@ public void OneTimeSetUp() // |/ // * 58 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("develop"); - fixture.MakeACommit("B"); - fixture.MergeTo("main"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("develop"); + this.fixture.MakeACommit("B"); + this.fixture.MergeTo("main"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-alpha.1+2")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, ExpectedResult = "0.0.1-alpha.1+2")] @@ -61,7 +61,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("develop", b => b.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-2+2")] @@ -90,7 +90,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("develop", b => b.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs index e45a381dac..db57dd4558 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitFlow { @@ -24,18 +24,18 @@ public void OneTimeSetUp() // |/ // * 58 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("develop"); - fixture.MakeACommit("B"); - fixture.MergeTo("main"); - fixture.ApplyTag("1.0.0"); - fixture.Checkout("develop"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("develop"); + this.fixture.MakeACommit("B"); + this.fixture.MergeTo("main"); + this.fixture.ApplyTag("1.0.0"); + this.fixture.Checkout("develop"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "1.0.0-alpha.1+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, ExpectedResult = "1.0.1-alpha.1+0")] @@ -63,7 +63,7 @@ public string GetVersionWithTrackMergeTargetOnDevelop(IncrementStrategy incremen .WithBranch("develop", b => b.WithIncrement(increment).WithTrackMergeTarget(true)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-alpha.1+1")] @@ -92,7 +92,7 @@ public string GetVersionWithNoTrackMergeTargetOnDevelop(IncrementStrategy increm .WithBranch("develop", b => b.WithIncrement(increment).WithTrackMergeTarget(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs index 842d8f19f2..aa8cd60725 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainMergedBackToMainWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitFlow { @@ -31,20 +31,20 @@ public void OneTimeSetUp() // |/ // A 58 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.Checkout("main"); - fixture.MakeACommit("C"); - fixture.Checkout("main"); - fixture.MergeTo("feature/foo"); - fixture.MergeTo("main", removeBranchAfterMerging: true); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.Checkout("main"); + this.fixture.MakeACommit("C"); + this.fixture.Checkout("main"); + this.fixture.MergeTo("feature/foo"); + this.fixture.MergeTo("main", removeBranchAfterMerging: true); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.1+3")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-foo.1+3")] @@ -136,7 +136,7 @@ public string GetVersion(IncrementStrategy increment, IncrementStrategy incremen .WithBranch("feature", b => b.WithIncrement(incrementOnFeature)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.1+3")] @@ -230,7 +230,7 @@ public string GetVersionWithPreventIncrementOfMergedBranchVersionFalseOnMain( .WithBranch("feature", b => b.WithIncrement(incrementOnFeature)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs index f7f6cd8437..a967b3dc53 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithAMergeCommitFromMainWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -27,18 +27,18 @@ public void OneTimeSetUp() // |/ // A 58 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.Checkout("main"); - fixture.MakeACommit("C"); - fixture.MergeTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.Checkout("main"); + this.fixture.MakeACommit("C"); + this.fixture.MergeTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-foo.1+2")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, ExpectedResult = "0.0.1-foo.1+2")] @@ -70,7 +70,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-foo.1+2")] @@ -103,7 +103,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-foo.3+2")] @@ -136,7 +136,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-foo.1+2")] @@ -169,7 +169,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs index 76dc7520de..927a68eca9 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+1")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -256,7 +256,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -369,7 +369,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -482,7 +482,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs index de661ff7b2..fe63aab9ba 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMajor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: major"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A +semver: major"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-2+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "1.0.1-1+1")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -258,7 +258,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -373,7 +373,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-2+1")] @@ -487,7 +487,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -602,7 +602,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -717,7 +717,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-foo.2+1")] @@ -830,7 +830,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -945,7 +945,7 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1060,7 +1060,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-bar.2+1")] @@ -1173,7 +1173,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1288,7 +1288,7 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1403,7 +1403,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs index 53f954be4a..cf1369f461 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessageMinor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: minor"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A +semver: minor"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-2+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.1.1-1+1")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -258,7 +258,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -373,7 +373,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-2+1")] @@ -487,7 +487,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -602,7 +602,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -717,7 +717,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-foo.2+1")] @@ -830,7 +830,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -945,7 +945,7 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1060,7 +1060,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-bar.2+1")] @@ -1173,7 +1173,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1288,7 +1288,7 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1403,7 +1403,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs index 0cb2b73865..aaa242751b 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitAHasBumpMessagePatch.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: patch"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A +semver: patch"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-2+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.2-1+1")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -258,7 +258,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -373,7 +373,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-2+1")] @@ -486,7 +486,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -601,7 +601,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -716,7 +716,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-foo.2+1")] @@ -829,7 +829,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -944,7 +944,7 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1059,7 +1059,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-bar.2+1")] @@ -1172,7 +1172,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1287,7 +1287,7 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1402,7 +1402,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs index 18894fe890..34020681d8 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreRelease.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) (tag 0.0.0-4) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-4"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-4"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+1")] @@ -144,7 +144,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+1")] @@ -257,7 +257,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -370,7 +370,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -483,7 +483,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs index 81054fe4a8..0e38cba6c5 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseBar.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) (tag 0.0.0-bar) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-bar"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-bar"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-bar+1")] @@ -144,7 +144,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -257,7 +257,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -370,7 +370,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+1")] @@ -483,7 +483,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs index 5455497e3d..3581922c2b 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsPreReleaseFoo.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) (tag 0.0.0-foo.4) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-foo.4"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-foo.4"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-foo.1+1")] @@ -144,7 +144,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -257,7 +257,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+1")] @@ -370,7 +370,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -483,7 +483,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs index 1f1586b34f..a07fdd6ac6 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitATaggedAsStable.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) (tag 0.0.0) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+1")] @@ -145,7 +145,7 @@ public string GetVersionWithNoLabelOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -259,7 +259,7 @@ public string GetVersionWithEmptyLabelOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -373,7 +373,7 @@ public string GetVersionWithLabelFooOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -487,7 +487,7 @@ public string GetVersionWithLabelBarOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs index 14d40e34c9..7b96180482 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMajor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B +semver: major"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B +semver: major"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-1+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "1.0.0-1+1")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -259,7 +259,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -375,7 +375,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-1+1")] @@ -488,7 +488,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -604,7 +604,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -720,7 +720,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-foo.1+1")] @@ -833,7 +833,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -949,7 +949,7 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1065,7 +1065,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-bar.1+1")] @@ -1178,7 +1178,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1294,7 +1294,7 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1410,7 +1410,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs index 51b7fe0c5b..5748b5a6ca 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessageMinor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B +semver: minor"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B +semver: minor"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-1+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.1.0-1+1")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -259,7 +259,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -375,7 +375,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-1+1")] @@ -488,7 +488,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -604,7 +604,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -720,7 +720,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-foo.1+1")] @@ -833,7 +833,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -949,7 +949,7 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1065,7 +1065,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-bar.1+1")] @@ -1178,7 +1178,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1294,7 +1294,7 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1410,7 +1410,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs index 942b0d9328..92d0406970 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBHasBumpMessagePatch.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B +semver: patch"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B +semver: patch"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-1+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+1")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -259,7 +259,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -375,7 +375,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-1+1")] @@ -488,7 +488,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -604,7 +604,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -720,7 +720,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-foo.1+1")] @@ -833,7 +833,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -949,7 +949,7 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+1")] @@ -1065,7 +1065,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-bar.1+1")] @@ -1178,7 +1178,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1294,7 +1294,7 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+1")] @@ -1410,7 +1410,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs index 84f5def54a..97f042110d 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreRelease.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) (tag 0.0.0-4) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.0.0-4"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.0.0-4"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-4")] @@ -144,7 +144,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -257,7 +257,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -370,7 +370,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -483,7 +483,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs index 4c255b3c7c..771d58b8db 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseBar.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) (tag 0.0.0-bar) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.0.0-bar"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.0.0-bar"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-bar")] @@ -144,7 +144,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -257,7 +257,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -370,7 +370,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -483,7 +483,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs index 4ebfd02892..e2b41f74e4 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsPreReleaseFoo.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) (tag 0.0.0-foo.4) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.0.0-foo.4"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.0.0-foo.4"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-foo.4")] @@ -144,7 +144,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -257,7 +257,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -370,7 +370,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -483,7 +483,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs index 2796e9bf66..6c09a2f0d1 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitBranchedFromMainWhenCommitBTaggedAsStable.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 47 minutes ago (HEAD -> feature/foo) (tag 0.0.0) // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.0.0"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.0.0"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0")] @@ -145,7 +145,7 @@ public string GetVersionWithNoLabelOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -239,7 +239,7 @@ public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTag .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -353,7 +353,7 @@ public string GetVersionWithEmptyLabelOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -447,7 +447,7 @@ public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommit .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -561,7 +561,7 @@ public string GetVersionWithLabelFooOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -655,7 +655,7 @@ public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -769,7 +769,7 @@ public string GetVersionWithLabelBarOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -863,7 +863,7 @@ public string GetVersionWithLabelBarOnMainAndPreventIncrementWhenCurrentCommitTa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs index c6682d3614..765077f7cf 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -26,16 +26,16 @@ public void OneTimeSetUp() // |/ // A 58 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.MergeTo("main"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.MergeTo("main"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+2")] @@ -148,7 +148,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -263,7 +263,7 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -377,7 +377,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -492,7 +492,7 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -606,7 +606,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -721,7 +721,7 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -835,7 +835,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -950,7 +950,7 @@ public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs index 90e957ace6..45de3d270c 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreRelease.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,7 +20,7 @@ public class GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreR [OneTimeSetUp] public void OneTimeSetUp() { - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); // * 54 minutes ago (HEAD -> main) // |\ @@ -28,15 +28,15 @@ public void OneTimeSetUp() // |/ // A 58 minutes ago - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.0.0-4"); - fixture.MergeTo("main"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.0.0-4"); + this.fixture.MergeTo("main"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-5+1")] @@ -148,7 +148,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+1")] @@ -262,7 +262,7 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+1")] @@ -375,7 +375,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+1")] @@ -490,7 +490,7 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -603,7 +603,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -717,7 +717,7 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -830,7 +830,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -944,7 +944,7 @@ public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs index 169403fd26..19b6a2d0c6 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseBar.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,7 +20,7 @@ public class GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreR [OneTimeSetUp] public void OneTimeSetUp() { - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); // * 55 minutes ago (HEAD -> main) // |\ @@ -28,15 +28,15 @@ public void OneTimeSetUp() // |/ // A 58 minutes ago - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.0.0-bar"); - fixture.MergeTo("main"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.0.0-bar"); + this.fixture.MergeTo("main"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-bar+1")] @@ -148,7 +148,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+1")] @@ -262,7 +262,7 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -375,7 +375,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -489,7 +489,7 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -602,7 +602,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -716,7 +716,7 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+1")] @@ -829,7 +829,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+1")] @@ -943,7 +943,7 @@ public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs index 9821b13fab..fe9baf0599 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreReleaseFoo.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,7 +20,7 @@ public class GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsPreR [OneTimeSetUp] public void OneTimeSetUp() { - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); // * 55 minutes ago (HEAD -> main) // |\ @@ -28,15 +28,15 @@ public void OneTimeSetUp() // |/ // A 58 minutes ago - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.0.0-foo.4"); - fixture.MergeTo("main"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.0.0-foo.4"); + this.fixture.MergeTo("main"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-foo.5+1")] @@ -148,7 +148,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+1")] @@ -262,7 +262,7 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -375,7 +375,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -489,7 +489,7 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+1")] @@ -602,7 +602,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+1")] @@ -716,7 +716,7 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -829,7 +829,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+2")] @@ -943,7 +943,7 @@ public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs index 080fa49b0a..a27137dbd9 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStable.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,7 +20,7 @@ public class GivenAFeatureBranchWithOneCommitMergedToMainWhenCommitBTaggedAsStab [OneTimeSetUp] public void OneTimeSetUp() { - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); // * 55 minutes ago (HEAD -> main) // |\ @@ -28,15 +28,15 @@ public void OneTimeSetUp() // |/ // A 58 minutes ago - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.0.0"); - fixture.MergeTo("main"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.0.0"); + this.fixture.MergeTo("main"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+1")] @@ -148,7 +148,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -262,7 +262,7 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -375,7 +375,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -489,7 +489,7 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.1+1")] @@ -602,7 +602,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.1+1")] @@ -716,7 +716,7 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.1+1")] @@ -829,7 +829,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.1+1")] @@ -943,7 +943,7 @@ public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs index ee5830cb24..bebea6721b 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitMergedToMainWithOneCommitBranchedToFeatureWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -27,20 +27,20 @@ public void OneTimeSetUp() // |/ // A 58 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.Checkout("main"); - fixture.MakeACommit("C"); - fixture.Checkout("feature/foo"); - fixture.MergeTo("main", removeBranchAfterMerging: true); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.Checkout("main"); + this.fixture.MakeACommit("C"); + this.fixture.Checkout("feature/foo"); + this.fixture.MergeTo("main", removeBranchAfterMerging: true); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.2-1+0")] @@ -153,7 +153,7 @@ public string GetVersionWithLabelNullOnMain(IncrementStrategy incrementOnMain, I .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4+0")] @@ -268,7 +268,7 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4+0")] @@ -382,7 +382,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4+0")] @@ -497,7 +497,7 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4+0")] @@ -611,7 +611,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4+0")] @@ -726,7 +726,7 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.4+0")] @@ -840,7 +840,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.4+0")] @@ -955,7 +955,7 @@ public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs index 765d132e25..605c9a5bb7 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,13 +19,13 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> feature/foo) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A"); + this.fixture.MakeACommit("A"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+1")] @@ -52,7 +52,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs index 4a1eb2c06f..65fad81307 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,13 +19,13 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> feature/foo) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A +semver: major"); + this.fixture.MakeACommit("A +semver: major"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "1.0.0-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "1.0.0-1+1")] @@ -52,7 +52,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -81,7 +81,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -110,7 +110,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs index 8fb5adb627..93aa14d723 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,13 +19,13 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> feature/foo) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A +semver: minor"); + this.fixture.MakeACommit("A +semver: minor"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.1.0-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.1.0-1+1")] @@ -52,7 +52,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -81,7 +81,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -110,7 +110,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs index 8545c8067a..3099211ba2 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,13 +19,13 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> feature/foo) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A +semver: patch"); + this.fixture.MakeACommit("A +semver: patch"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.1-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+1")] @@ -52,7 +52,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -81,7 +81,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -110,7 +110,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs index c4c9e5fe03..765b92d30c 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -21,14 +21,14 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> feature/foo) (tag 0.0.0-4) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-4"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-4"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-4")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+0")] @@ -83,7 +83,7 @@ public string GetVersionWithPreventIncrementWhenCurrentCommitTaggedFalse(Increme .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs index 837d175729..2f155fbdb2 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -21,14 +21,14 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> feature/foo) (tag 0.0.0-bar) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-bar"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-bar"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-bar")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+0")] @@ -83,7 +83,7 @@ public string GetVersionWithPreventIncrementWhenCurrentCommitTaggedFalse(Increme .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs index 8ff3cb8a67..f657e55cfd 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -21,14 +21,14 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> feature/foo) (tag 0.0.0-foo.4) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-foo.4"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-foo.4"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-foo.4")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+0")] @@ -83,7 +83,7 @@ public string GetVersionWithPreventIncrementWhenCurrentCommitTaggedFalse(Increme .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs index 0fcf8346a1..81cbe0c9f1 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithOneCommitWhenCommitTaggedAsStable.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -21,14 +21,14 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> feature/foo) (tag 0.0.0) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.0")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -83,7 +83,7 @@ public string GetVersionWithPreventIncrementWhenCurrentCommitTaggedFalse(Increme .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs index 6f3e4f71cd..558eff193a 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsBranchedFromMainWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -25,17 +25,17 @@ public void OneTimeSetUp() // B 47 minutes ago // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.MakeACommit("C"); - fixture.MakeACommit("D"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.MakeACommit("C"); + this.fixture.MakeACommit("D"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+3")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+3")] @@ -127,7 +127,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+3")] @@ -220,7 +220,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+3")] @@ -313,7 +313,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs index 897726a863..dec395e15e 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsMergedToMainWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -28,18 +28,18 @@ public void OneTimeSetUp() // |/ // A 58 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.MakeACommit("C"); - fixture.MakeACommit("D"); - fixture.MergeTo("main"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.MakeACommit("C"); + this.fixture.MakeACommit("D"); + this.fixture.MergeTo("main"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+4")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+4")] @@ -152,7 +152,7 @@ public string GetVersionWithLabelNullOnMain(IncrementStrategy incrementOnMain, I .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+4")] @@ -267,7 +267,7 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+4")] @@ -381,7 +381,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+4")] @@ -496,7 +496,7 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+4")] @@ -610,7 +610,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+4")] @@ -725,7 +725,7 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+4")] @@ -839,7 +839,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+4")] @@ -954,7 +954,7 @@ public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs index 659a552d84..20c68e6c94 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithThreeCommitsWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 58 minutes ago // A 59 minutes ago - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A"); - fixture.MakeACommit("B"); - fixture.MakeACommit("C"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B"); + this.fixture.MakeACommit("C"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+3")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+3")] @@ -58,7 +58,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs index 5bcd275e03..583414c706 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsBranchedFromMainWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -24,16 +24,16 @@ public void OneTimeSetUp() // B 47 minutes ago // A 51 minutes ago (main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.MakeACommit("C"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.MakeACommit("C"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+2")] @@ -125,7 +125,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+2")] @@ -218,7 +218,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+2")] @@ -311,7 +311,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs index 346f1fcfee..769c575a5a 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsMergedToMainWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -27,17 +27,17 @@ public void OneTimeSetUp() // |/ // A 58 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); - fixture.MakeACommit("B"); - fixture.MakeACommit("C"); - fixture.MergeTo("main"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("B"); + this.fixture.MakeACommit("C"); + this.fixture.MergeTo("main"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+3")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+3")] @@ -150,7 +150,7 @@ public string GetVersionWithLabelNullOnMain(IncrementStrategy incrementOnMain, I .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+3")] @@ -265,7 +265,7 @@ public string GetVersionWithLabelNullAndPreventIncrementOfMergedBranchVersionFal .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+3")] @@ -379,7 +379,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+3")] @@ -494,7 +494,7 @@ public string GetVersionWithEmptyLabelAndPreventIncrementOfMergedBranchVersionFa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+3")] @@ -608,7 +608,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+3")] @@ -723,7 +723,7 @@ public string GetVersionWithLabelFooAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+3")] @@ -837,7 +837,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+3")] @@ -952,7 +952,7 @@ public string GetVersionWithLabelBarAndPreventIncrementOfMergedBranchVersionFals .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs index 66277de202..4f756fe8b7 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,15 +22,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> feature/foo) // A 59 minutes ago (tag 0.0.3-4) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3-4"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3-4"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.3-5+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.3-5+1")] @@ -57,7 +57,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs index d187c7c867..3896721234 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,15 +22,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> feature/foo) // A 59 minutes ago (tag 0.0.3-bar) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3-bar"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3-bar"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.3-bar+1")] @@ -57,7 +57,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs index 56db17c002..4881852676 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAFeatureBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,15 +22,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> feature/foo) // A 59 minutes ago (tag 0.0.3-foo.4) - fixture = new EmptyRepositoryFixture("feature/foo"); + this.fixture = new EmptyRepositoryFixture("feature/foo"); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3-foo.4"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3-foo.4"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.5+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.3-foo.5+1")] @@ -57,7 +57,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs index a81a72668b..6a9f41728f 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,14 +22,14 @@ public void OneTimeSetUp() { // A 58 minutes ago (HEAD -> feature/foo, main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+0")] @@ -141,7 +141,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -255,7 +255,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -368,7 +368,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -481,7 +481,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs index 2c92353369..0a8260842a 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMajor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,14 +22,14 @@ public void OneTimeSetUp() { // A 58 minutes ago (HEAD -> feature/foo, main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: major"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A +semver: major"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-2+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "1.0.1-1+0")] @@ -141,7 +141,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -256,7 +256,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -371,7 +371,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-2+0")] @@ -485,7 +485,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -600,7 +600,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -715,7 +715,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-foo.2+0")] @@ -828,7 +828,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -943,7 +943,7 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -1058,7 +1058,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-bar.2+0")] @@ -1171,7 +1171,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1286,7 +1286,7 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1401,7 +1401,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs index 0945585a28..96417a0028 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessageMinor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,14 +22,14 @@ public void OneTimeSetUp() { // A 58 minutes ago (HEAD -> feature/foo, main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: minor"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A +semver: minor"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-2+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.1.1-1+0")] @@ -141,7 +141,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -256,7 +256,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -371,7 +371,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-2+0")] @@ -485,7 +485,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -600,7 +600,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -715,7 +715,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-foo.2+0")] @@ -828,7 +828,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -943,7 +943,7 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -1058,7 +1058,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-bar.2+0")] @@ -1171,7 +1171,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1286,7 +1286,7 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1401,7 +1401,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs index 36c93e2b98..d7afc7840b 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitHasBumpMessagePatch.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,14 +22,14 @@ public void OneTimeSetUp() { // A 58 minutes ago (HEAD -> feature/foo, main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: patch"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A +semver: patch"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-2+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.2-1+0")] @@ -141,7 +141,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -256,7 +256,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -371,7 +371,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-2+0")] @@ -484,7 +484,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -599,7 +599,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -714,7 +714,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-foo.2+0")] @@ -827,7 +827,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -942,7 +942,7 @@ public string GetVersionWithLabelFooAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -1057,7 +1057,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-bar.2+0")] @@ -1170,7 +1170,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1285,7 +1285,7 @@ public string GetVersionWithLabelBarAndDisabledMergeMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -1400,7 +1400,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs index 27dcb59c75..12ee049cd0 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreRelease.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,15 +22,15 @@ public void OneTimeSetUp() { // A 58 minutes ago (HEAD -> feature/foo, main) (tag 0.0.0-4) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-4"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-4"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-4")] @@ -142,7 +142,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+0")] @@ -256,7 +256,7 @@ public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTag .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -369,7 +369,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-5+0")] @@ -483,7 +483,7 @@ public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommit .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -596,7 +596,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -710,7 +710,7 @@ public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] @@ -823,7 +823,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -937,7 +937,7 @@ public string GetVersionWithLabelBarOnMainAndPreventIncrementWhenCurrentCommitTa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs index 07648d8455..f0221c5b10 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseBar.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,15 +22,15 @@ public void OneTimeSetUp() { // A 58 minutes ago (HEAD -> feature/foo, main) (tag 0.0.0-bar) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-bar"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-bar"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-bar")] @@ -142,7 +142,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+0")] @@ -256,7 +256,7 @@ public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTag .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -369,7 +369,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -483,7 +483,7 @@ public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommit .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -596,7 +596,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.2+0")] @@ -710,7 +710,7 @@ public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] @@ -823,7 +823,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar+0")] @@ -937,7 +937,7 @@ public string GetVersionWithLabelBarOnMainAndPreventIncrementWhenCurrentCommitTa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs index 0ab3f5a1a5..94db35d2b1 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsPreReleaseFoo.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,15 +22,15 @@ public void OneTimeSetUp() { // A 58 minutes ago (HEAD -> feature/foo, main) (tag 0.0.0-foo.4) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-foo.4"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-foo.4"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-foo.4")] @@ -142,7 +142,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+0")] @@ -256,7 +256,7 @@ public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTag .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -369,7 +369,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+0")] @@ -483,7 +483,7 @@ public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommit .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -596,7 +596,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.5+0")] @@ -710,7 +710,7 @@ public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] @@ -823,7 +823,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.2+0")] @@ -937,7 +937,7 @@ public string GetVersionWithLabelBarOnMainAndPreventIncrementWhenCurrentCommitTa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs index e2f9621354..648c010763 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitBranchedToFeatureWhenCommitTaggedAsStable.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -22,15 +22,15 @@ public void OneTimeSetUp() { // A 58 minutes ago (HEAD -> feature/foo, main) (tag 0.0.0) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.0")] @@ -142,7 +142,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -256,7 +256,7 @@ public string GetVersionWithNoLabelOnMainAndPreventIncrementWhenCurrentCommitTag .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -369,7 +369,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+0")] @@ -483,7 +483,7 @@ public string GetVersionWithEmptyLabelOnMainAndPreventIncrementWhenCurrentCommit .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -596,7 +596,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.1+0")] @@ -710,7 +710,7 @@ public string GetVersionWithLabelFooOnMainAndPreventIncrementWhenCurrentCommitTa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0")] @@ -823,7 +823,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.1+0")] @@ -937,7 +937,7 @@ public string GetVersionWithLabelBarOnMainAndPreventIncrementWhenCurrentCommitTa .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label).WithPreventIncrementWhenCurrentCommitTagged(false)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs index 3749bd3d57..1db4a02fca 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,13 +19,13 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); + this.fixture.MakeACommit("A"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+1")] @@ -52,7 +52,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs index a6351d2b33..f7fe644668 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMajor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,13 +19,13 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: major"); + this.fixture.MakeACommit("A +semver: major"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "1.0.0-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "1.0.0-1+1")] @@ -52,7 +52,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -81,7 +81,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -110,7 +110,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs index a32d8e1e37..1f7a84197e 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessageMinor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,13 +19,13 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: minor"); + this.fixture.MakeACommit("A +semver: minor"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.1.0-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.1.0-1+1")] @@ -52,7 +52,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -81,7 +81,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -110,7 +110,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs index a5a28fce8d..095d7fca39 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitHasBumpMessagePatch.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,13 +19,13 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> main) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: patch"); + this.fixture.MakeACommit("A +semver: patch"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.1-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+1")] @@ -52,7 +52,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -81,7 +81,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-1+1")] @@ -110,7 +110,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs index 09b616fd81..9ef8d7c561 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreRelease.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,14 +19,14 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> main) (tag 0.0.0-4) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-4"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-4"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-4")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-4")] @@ -53,7 +53,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs index fb208b9e36..8c50e81998 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseBar.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,14 +19,14 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> main) (tag 0.0.0-bar) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-bar"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-bar"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-bar")] @@ -53,7 +53,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs index 0a7508610d..539742c239 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsPreReleaseFoo.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,14 +19,14 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> main) (tag 0.0.0-foo.4) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0-foo.4"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0-foo.4"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.4")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.0-foo.4")] @@ -53,7 +53,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs index b02821e85e..d9dc4fe9bc 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithOneCommitWhenCommitTaggedAsStable.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -19,14 +19,14 @@ public void OneTimeSetUp() { // A 59 minutes ago (HEAD -> main) (tag 0.0.0) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.0"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.0"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.0")] @@ -53,7 +53,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs index a2bb7d135c..50c8a16464 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithThreeCommitsWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -21,15 +21,15 @@ public void OneTimeSetUp() // B 58 minutes ago // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.MakeACommit("B"); - fixture.MakeACommit("C"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B"); + this.fixture.MakeACommit("C"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.3-1+1")] @@ -56,7 +56,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs index 3e2f0d2990..e32ee19e4e 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 54 minutes ago (main) (HEAD -> feature/foo) // A 56 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.MakeACommit("B"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.1-1+0")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -256,7 +256,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -369,7 +369,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -482,7 +482,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs index f9d8386e55..f43c099d58 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMajor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 54 minutes ago (main) (HEAD -> feature/foo) // A 56 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: major"); - fixture.MakeACommit("B"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A +semver: major"); + this.fixture.MakeACommit("B"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-3+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "1.0.1-1+0")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -257,7 +257,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain(Incremen ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -371,7 +371,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain(Increme ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-3+0")] @@ -484,7 +484,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -600,7 +600,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -716,7 +716,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-foo.3+0")] @@ -829,7 +829,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -944,7 +944,7 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementModeOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -1060,7 +1060,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementModeOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "1.0.0-bar.3+0")] @@ -1173,7 +1173,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1288,7 +1288,7 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementModeOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1403,7 +1403,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementModeOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs index 5007342249..58ebfe5819 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessageMinor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 54 minutes ago (main) (HEAD -> feature/foo) // A 56 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: minor"); - fixture.MakeACommit("B"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A +semver: minor"); + this.fixture.MakeACommit("B"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-3+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.1.1-1+0")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -257,7 +257,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain(Incremen ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -371,7 +371,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain(Increme ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-3+0")] @@ -484,7 +484,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -600,7 +600,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -716,7 +716,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-foo.3+0")] @@ -829,7 +829,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -944,7 +944,7 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementModeOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -1060,7 +1060,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementModeOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.1.0-bar.3+0")] @@ -1173,7 +1173,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1288,7 +1288,7 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementModeOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1403,7 +1403,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementModeOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs index 55c8360b34..b3a89c7d14 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitHasBumpMessagePatch.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,15 +23,15 @@ public void OneTimeSetUp() // B 54 minutes ago (main) (HEAD -> feature/foo) // A 56 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: patch"); - fixture.MakeACommit("B"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A +semver: patch"); + this.fixture.MakeACommit("B"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-3+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.2-1+0")] @@ -143,7 +143,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -257,7 +257,7 @@ public string GetVersionWithNoLabelAndDisabledMessageIncrementingOnMain(Incremen ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -371,7 +371,7 @@ public string GetVersionWithNoLabelAndMergeMessageOnlyIncrementingOnMain(Increme ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-3+0")] @@ -484,7 +484,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -600,7 +600,7 @@ public string GetVersionWithEmptyLabelAndDisabledMessageIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-3+0")] @@ -716,7 +716,7 @@ public string GetVersionWithEmptyLabelAndMergeMessageOnlyIncrementingOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-foo.3+0")] @@ -829,7 +829,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -944,7 +944,7 @@ public string GetVersionWithLabelFooAndDisabledMessageIncrementModeOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-foo.3+0")] @@ -1060,7 +1060,7 @@ public string GetVersionWithLabelFooAndMergeMessageOnlyIncrementModeOnMain( .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.1-bar.3+0")] @@ -1173,7 +1173,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1288,7 +1288,7 @@ public string GetVersionWithLabelBarAndDisabledMessageIncrementModeOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.0-bar.3+0")] @@ -1403,7 +1403,7 @@ public string GetVersionWithLabelBarAndMergeMessageOnlyIncrementModeOnMain( ).WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs index 8e8b596e1e..f6a0b67a76 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreRelease.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 54 minutes ago (main) (HEAD -> feature/foo) // A 56 minutes ago (0.0.3-4) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3-4"); - fixture.MakeACommit("B"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3-4"); + this.fixture.MakeACommit("B"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-6+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.4-1+0")] @@ -144,7 +144,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-6+0")] @@ -257,7 +257,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.3+0")] @@ -370,7 +370,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar.3+0")] @@ -483,7 +483,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs index f37f78e1ce..b1876d9b9d 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseBar.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 54 minutes ago (main) (HEAD -> feature/foo) // A 56 minutes ago (0.0.3-bar) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3-bar"); - fixture.MakeACommit("B"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3-bar"); + this.fixture.MakeACommit("B"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.4-bar+0")] @@ -144,7 +144,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-3+0")] @@ -257,7 +257,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.3+0")] @@ -370,7 +370,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar+0")] @@ -483,7 +483,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs index b9dc12278e..4d820bf442 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsPreReleaseFoo.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 54 minutes ago (main) (HEAD -> feature/foo) // A 56 minutes ago (0.0.3-foo.4) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3-foo.4"); - fixture.MakeACommit("B"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3-foo.4"); + this.fixture.MakeACommit("B"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.6+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.4-foo.1+0")] @@ -144,7 +144,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-3+0")] @@ -257,7 +257,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.6+0")] @@ -370,7 +370,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar.3+0")] @@ -483,7 +483,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs index a8e9e23331..6c12f9a315 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsBranchedToFeatureWhenFirstCommitTaggedAsStable.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -23,16 +23,16 @@ public void OneTimeSetUp() // B 54 minutes ago (main) (HEAD -> feature/foo) // A 56 minutes ago (0.0.3) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3"); - fixture.MakeACommit("B"); - fixture.BranchTo("feature/foo"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3"); + this.fixture.MakeACommit("B"); + this.fixture.BranchTo("feature/foo"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-2+0")] [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, null, ExpectedResult = "0.0.4-1+0")] @@ -144,7 +144,7 @@ public string GetVersionWithNoLabelOnMain(IncrementStrategy incrementOnMain, Inc .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-2+0")] @@ -257,7 +257,7 @@ public string GetVersionWithEmptyLabelOnMain(IncrementStrategy incrementOnMain, .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.2+0")] @@ -370,7 +370,7 @@ public string GetVersionWithLabelFooOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar.2+0")] @@ -483,7 +483,7 @@ public string GetVersionWithLabelBarOnMain(IncrementStrategy incrementOnMain, In .WithBranch("feature", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs index a12147ad13..c6cfb92147 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhen.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,14 +20,14 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.2-1+1")] @@ -54,7 +54,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs index 62cf8f596c..ed79997963 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMajor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,14 +20,14 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: major"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A +semver: major"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "1.0.0-2+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "1.0.1-1+1")] @@ -54,7 +54,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -83,7 +83,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -112,7 +112,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs index f3c203bffc..52d0f82df3 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessageMinor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,14 +20,14 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: minor"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A +semver: minor"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.1.0-2+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.1.1-1+1")] @@ -54,7 +54,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -83,7 +83,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -112,7 +112,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs index 7e5dab7025..9d8c5cb5e4 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitHasBumpMessagePatch.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,14 +20,14 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A +semver: patch"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A +semver: patch"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.1-2+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.2-1+1")] @@ -54,7 +54,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -83,7 +83,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -112,7 +112,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs index 9b3d7e0678..fe8f1372da 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreRelease.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,15 +20,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago (tag 0.0.3-4) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3-4"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3-4"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.3-5+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.4-1+1")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs index c1fdc78f51..27a59e7ea3 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseBar.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,15 +20,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago (tag 0.0.3-bar) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3-bar"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3-bar"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.3-bar+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.4-bar+1")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs index 878ca59750..32e03f49ab 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsPreReleaseFoo.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,15 +20,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago (tag 0.0.3-foo.4) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3-foo.4"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3-foo.4"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.3-foo.5+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.4-foo.1+1")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs index 8e6608c1ef..02767d57f0 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenFirstCommitTaggedAsStable.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,15 +20,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago (tag 0.0.3) - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.ApplyTag("0.0.3"); - fixture.MakeACommit("B"); + this.fixture.MakeACommit("A"); + this.fixture.ApplyTag("0.0.3"); + this.fixture.MakeACommit("B"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.3-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.4-1+1")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs index 77464e7a95..e0585a602c 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMajor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,14 +20,14 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.MakeACommit("B +semver: major"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B +semver: major"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "1.0.0-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "1.0.0-1+1")] @@ -54,7 +54,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -83,7 +83,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -112,7 +112,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs index 06b4a776c9..426887aaa1 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessageMinor.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,14 +20,14 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.MakeACommit("B +semver: minor"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B +semver: minor"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.1.0-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.1.0-1+1")] @@ -54,7 +54,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -83,7 +83,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -112,7 +112,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs index d1c8aab464..9d75d815c6 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitHasBumpMessagePatch.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,14 +20,14 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.MakeACommit("B +semver: patch"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B +semver: patch"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.1-1+1")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.0.2-1+1")] @@ -54,7 +54,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -83,7 +83,7 @@ public string GetVersionWithDisabledMessageIncrementing(IncrementStrategy increm .WithCommitMessageIncrementing(CommitMessageIncrementMode.Disabled) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.0.0-2+1")] @@ -112,7 +112,7 @@ public string GetVersionWithMergeMessageOnlyIncrementing(IncrementStrategy incre .WithCommitMessageIncrementing(CommitMessageIncrementMode.MergeMessageOnly) ).Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs index 9b43116068..8034031997 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreRelease.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,15 +20,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) (tag 0.2.0-4) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.2.0-4"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.2.0-4"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.2.0-4")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.2.0-4")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs index 57bf37457d..cc3a49943c 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseBar.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,15 +20,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) (tag 0.2.0-bar) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.2.0-bar"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.2.0-bar"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.2.0-bar")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.2.0-bar")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs index 60d93e059f..76c3365db9 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsPreReleaseFoo.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,15 +20,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) (tag 0.2.0-foo.4) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.2.0-foo.4"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.2.0-foo.4"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.2.0-foo.4")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.2.0-foo.4")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs index 7f96a45d2a..fbec5045c5 100644 --- a/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs +++ b/src/GitVersion.Core.Tests/Mainline/MainlineScenariosWithAGitHubFlow+GivenAMainBranchWithTwoCommitsWhenSecondCommitTaggedAsStable.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.Mainline; +namespace GitVersion.Tests.Mainline; internal partial class MainlineScenariosWithAGitHubFlow { @@ -20,15 +20,15 @@ public void OneTimeSetUp() // B 58 minutes ago (HEAD -> main) (tag 0.2.0) // A 59 minutes ago - fixture = new EmptyRepositoryFixture(); + this.fixture = new EmptyRepositoryFixture(); - fixture.MakeACommit("A"); - fixture.MakeACommit("B"); - fixture.ApplyTag("0.2.0"); + this.fixture.MakeACommit("A"); + this.fixture.MakeACommit("B"); + this.fixture.ApplyTag("0.2.0"); } [OneTimeTearDown] - public void OneTimeTearDown() => fixture?.Dispose(); + public void OneTimeTearDown() => this.fixture?.Dispose(); [TestCase(IncrementStrategy.None, null, ExpectedResult = "0.2.0")] [TestCase(IncrementStrategy.Patch, null, ExpectedResult = "0.2.0")] @@ -55,7 +55,7 @@ public string GetVersion(IncrementStrategy increment, string? label) .WithBranch("main", b => b.WithIncrement(increment).WithLabel(label)) .Build(); - return fixture!.GetVersion(mainline).FullSemVer; + return this.fixture!.GetVersion(mainline).FullSemVer; } } } diff --git a/src/GitVersion.Core.Tests/MergeMessageTests.cs b/src/GitVersion.Core.Tests/MergeMessageTests.cs index 5f452e9f87..c071e76c6e 100644 --- a/src/GitVersion.Core.Tests/MergeMessageTests.cs +++ b/src/GitVersion.Core.Tests/MergeMessageTests.cs @@ -1,7 +1,6 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class MergeMessageTests : TestBase diff --git a/src/GitVersion.Core.Tests/VersionCalculation/EffectiveBranchConfigurationFinderTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/EffectiveBranchConfigurationFinderTests.cs index ba682c3543..bcb18b4694 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/EffectiveBranchConfigurationFinderTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/EffectiveBranchConfigurationFinderTests.cs @@ -1,10 +1,9 @@ -using GitVersion.Common; using GitVersion.Configuration; using GitVersion.Git; using GitVersion.Logging; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.VersionCalculation; +namespace GitVersion.Tests.VersionCalculation; [TestFixture] public class EffectiveBranchConfigurationFinderTests diff --git a/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs index aa80aec5bc..d81f84a5ee 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs @@ -1,9 +1,8 @@ using System.Globalization; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class JsonVersionBuilderTests : TestBase diff --git a/src/GitVersion.Core.Tests/VersionCalculation/MainlineIterationTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/MainlineIterationTests.cs index cb1abcf6c5..966e7a73e8 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/MainlineIterationTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/MainlineIterationTests.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.VersionCalculation.Mainline; -namespace GitVersion.Core.Tests.VersionCalculation; +namespace GitVersion.Tests.VersionCalculation; [TestFixture] public class MainlineIterationTests diff --git a/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs index 909c77e094..facf4ab722 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs @@ -1,7 +1,6 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class MinDateVersionFilterTests : TestBase diff --git a/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs index 64422c2da3..949999cc7e 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs @@ -1,9 +1,8 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.VersionCalculation; using LibGit2Sharp; -namespace GitVersion.Core.Tests.VersionCalculation; +namespace GitVersion.Tests.VersionCalculation; public class NextVersionCalculatorTests : TestBase { diff --git a/src/GitVersion.Core.Tests/VersionCalculation/PathFilterTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/PathFilterTests.cs index efffb84e18..75d118c221 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/PathFilterTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/PathFilterTests.cs @@ -1,7 +1,6 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class PathFilterTests : TestBase diff --git a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs index 2d0279a15c..6e0432b5e2 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs @@ -1,6 +1,4 @@ -using GitVersion.Core.Tests.Helpers; - -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class SemanticVersionTests : TestBase diff --git a/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs index e4d4b219f1..5a6a0a0af7 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs @@ -1,7 +1,6 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class ShaVersionFilterTests : TestBase diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfiguredNextVersionVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfiguredNextVersionVersionStrategyTests.cs index 819bcdb19c..053d09f7ef 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfiguredNextVersionVersionStrategyTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfiguredNextVersionVersionStrategyTests.cs @@ -1,9 +1,8 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.VersionCalculation.Strategies; +namespace GitVersion.Tests.VersionCalculation.Strategies; [TestFixture] public class ConfiguredNextVersionVersionStrategyTests : TestBase diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs index 48009baf1d..69588f6e53 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs @@ -1,10 +1,9 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.Git; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.VersionCalculation.Strategies; +namespace GitVersion.Tests.VersionCalculation.Strategies; [TestFixture] public class MergeMessageBaseVersionStrategyTests : TestBase diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs index 868baca593..1b66fed42b 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs @@ -1,10 +1,9 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; using GitVersion.Git; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests.VersionCalculation.Strategies; +namespace GitVersion.Tests.VersionCalculation.Strategies; [TestFixture] public class VersionInBranchNameBaseVersionStrategyTests : TestBase diff --git a/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs index 7d3ef2770f..f46fb3af8a 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs @@ -1,11 +1,10 @@ using System.Globalization; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Git; using GitVersion.Logging; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class VariableProviderTests : TestBase diff --git a/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs index bf97221b8f..f78d87089b 100644 --- a/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs +++ b/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs @@ -1,8 +1,7 @@ -using GitVersion.Core.Tests.Helpers; using GitVersion.Git; using GitVersion.VersionCalculation; -namespace GitVersion.Core.Tests; +namespace GitVersion.Tests; [TestFixture] public class VersionSourceTests : TestBase diff --git a/src/GitVersion.Core/Agents/BuildAgentBase.cs b/src/GitVersion.Core/Agents/BuildAgentBase.cs index 776e1f4efc..05fd1d0ad3 100644 --- a/src/GitVersion.Core/Agents/BuildAgentBase.cs +++ b/src/GitVersion.Core/Agents/BuildAgentBase.cs @@ -8,15 +8,15 @@ namespace GitVersion.Agents; internal abstract class BuildAgentBase(IEnvironment environment, ILog log, IFileSystem fileSystem) : ICurrentBuildAgent { protected readonly ILog Log = log.NotNull(); - protected readonly IEnvironment Environment = environment.NotNull(); - protected readonly IFileSystem FileSystem = fileSystem.NotNull(); + protected readonly IEnvironment environment = environment.NotNull(); + protected readonly IFileSystem fileSystem = fileSystem.NotNull(); protected abstract string EnvironmentVariable { get; } public abstract string? SetBuildNumber(GitVersionVariables variables); public abstract string[] SetOutputVariables(string name, string? value); - public virtual bool CanApplyToCurrentContext() => !Environment.GetEnvironmentVariable(EnvironmentVariable).IsNullOrEmpty(); + public virtual bool CanApplyToCurrentContext() => !this.environment.GetEnvironmentVariable(EnvironmentVariable).IsNullOrEmpty(); public virtual string? GetCurrentBranch(bool usingDynamicRepos) => null; diff --git a/src/GitVersion.Core/Configuration/IBranchConfiguration.cs b/src/GitVersion.Core/Configuration/IBranchConfiguration.cs index 11957c1900..fb16bc580a 100644 --- a/src/GitVersion.Core/Configuration/IBranchConfiguration.cs +++ b/src/GitVersion.Core/Configuration/IBranchConfiguration.cs @@ -1,5 +1,4 @@ using System.Diagnostics.CodeAnalysis; -using GitVersion.Core; using GitVersion.VersionCalculation; namespace GitVersion.Configuration; diff --git a/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs b/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs index a781f0a403..5e897e1f93 100644 --- a/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs +++ b/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.Git; -namespace GitVersion.Common; +namespace GitVersion; /// Provides high-level read access to a Git repository, exposing the objects and queries needed for version calculation. public interface IRepositoryStore diff --git a/src/GitVersion.Core/Core/BranchRepository.cs b/src/GitVersion.Core/Core/BranchRepository.cs index 6d54eafe53..9f467f63a9 100644 --- a/src/GitVersion.Core/Core/BranchRepository.cs +++ b/src/GitVersion.Core/Core/BranchRepository.cs @@ -1,9 +1,8 @@ -using GitVersion.Common; using GitVersion.Configuration; using GitVersion.Extensions; using GitVersion.Git; -namespace GitVersion.Core; +namespace GitVersion; internal sealed class BranchRepository(IRepositoryStore repositoryStore) : IBranchRepository { diff --git a/src/GitVersion.Core/Core/BranchesContainingCommitFinder.cs b/src/GitVersion.Core/Core/BranchesContainingCommitFinder.cs index d078714e98..07997c99e1 100644 --- a/src/GitVersion.Core/Core/BranchesContainingCommitFinder.cs +++ b/src/GitVersion.Core/Core/BranchesContainingCommitFinder.cs @@ -1,4 +1,3 @@ -using GitVersion.Common; using GitVersion.Extensions; using GitVersion.Git; using GitVersion.Logging; @@ -23,16 +22,16 @@ public IEnumerable GetBranchesContainingCommit(ICommit commit, IEnumera private IEnumerable InnerGetBranchesContainingCommit(ICommit commit, IEnumerable branches, bool onlyTrackedBranches) { - using (log.IndentLog($"Getting branches containing the commit '{commit.Id}'.")) + using (this.log.IndentLog($"Getting branches containing the commit '{commit.Id}'.")) { var directBranchHasBeenFound = false; - log.Info("Trying to find direct branches."); + this.log.Info("Trying to find direct branches."); // TODO: It looks wasteful looping through the branches twice. Can't these loops be merged somehow? @asbjornu var branchList = branches.ToList(); foreach (var branch in branchList.Where(branch => BranchTipIsNullOrCommit(branch, commit) && !IncludeTrackedBranches(branch, onlyTrackedBranches))) { directBranchHasBeenFound = true; - log.Info($"Direct branch found: '{branch}'."); + this.log.Info($"Direct branch found: '{branch}'."); yield return branch; } @@ -41,20 +40,20 @@ private IEnumerable InnerGetBranchesContainingCommit(ICommit commit, IE yield break; } - log.Info($"No direct branches found, searching through {(onlyTrackedBranches ? "tracked" : "all")} branches."); + this.log.Info($"No direct branches found, searching through {(onlyTrackedBranches ? "tracked" : "all")} branches."); foreach (var branch in branchList.Where(b => IncludeTrackedBranches(b, onlyTrackedBranches))) { - log.Info($"Searching for commits reachable from '{branch}'."); + this.log.Info($"Searching for commits reachable from '{branch}'."); var commits = this.repositoryStore.GetCommitsReacheableFrom(commit, branch); if (!commits.Any()) { - log.Info($"The branch '{branch}' has no matching commits."); + this.log.Info($"The branch '{branch}' has no matching commits."); continue; } - log.Info($"The branch '{branch}' has a matching commit."); + this.log.Info($"The branch '{branch}' has a matching commit."); yield return branch; } } diff --git a/src/GitVersion.Core/Core/GitVersionContextFactory.cs b/src/GitVersion.Core/Core/GitVersionContextFactory.cs index a315d33092..acf1e4ba16 100644 --- a/src/GitVersion.Core/Core/GitVersionContextFactory.cs +++ b/src/GitVersion.Core/Core/GitVersionContextFactory.cs @@ -1,6 +1,4 @@ -using GitVersion.Common; using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; namespace GitVersion; diff --git a/src/GitVersion.Core/Core/IBranchRepository.cs b/src/GitVersion.Core/Core/IBranchRepository.cs index a58e603988..7a4e94213f 100644 --- a/src/GitVersion.Core/Core/IBranchRepository.cs +++ b/src/GitVersion.Core/Core/IBranchRepository.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.Git; -namespace GitVersion.Core; +namespace GitVersion; internal interface IBranchRepository { diff --git a/src/GitVersion.Core/Core/ITaggedSemanticVersionRepository.cs b/src/GitVersion.Core/Core/ITaggedSemanticVersionRepository.cs index 8177f1600d..5fc65d6eeb 100644 --- a/src/GitVersion.Core/Core/ITaggedSemanticVersionRepository.cs +++ b/src/GitVersion.Core/Core/ITaggedSemanticVersionRepository.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.Git; -namespace GitVersion.Core; +namespace GitVersion; internal interface ITaggedSemanticVersionRepository { diff --git a/src/GitVersion.Core/Core/ITaggedSemanticVersionService.cs b/src/GitVersion.Core/Core/ITaggedSemanticVersionService.cs index 8c476cc7f5..acf190d2a9 100644 --- a/src/GitVersion.Core/Core/ITaggedSemanticVersionService.cs +++ b/src/GitVersion.Core/Core/ITaggedSemanticVersionService.cs @@ -1,7 +1,7 @@ using GitVersion.Configuration; using GitVersion.Git; -namespace GitVersion.Core; +namespace GitVersion; internal interface ITaggedSemanticVersionService { diff --git a/src/GitVersion.Core/Core/MergeBaseFinder.cs b/src/GitVersion.Core/Core/MergeBaseFinder.cs index a281a01ce7..7eb525fedc 100644 --- a/src/GitVersion.Core/Core/MergeBaseFinder.cs +++ b/src/GitVersion.Core/Core/MergeBaseFinder.cs @@ -1,4 +1,3 @@ -using GitVersion.Common; using GitVersion.Extensions; using GitVersion.Git; using GitVersion.Logging; diff --git a/src/GitVersion.Core/Core/MergeCommitFinder.cs b/src/GitVersion.Core/Core/MergeCommitFinder.cs index c38da050af..4291a2c0a5 100644 --- a/src/GitVersion.Core/Core/MergeCommitFinder.cs +++ b/src/GitVersion.Core/Core/MergeCommitFinder.cs @@ -1,4 +1,3 @@ -using GitVersion.Common; using GitVersion.Configuration; using GitVersion.Extensions; using GitVersion.Git; diff --git a/src/GitVersion.Core/Core/RegexPatterns.cs b/src/GitVersion.Core/Core/RegexPatterns.cs index 3b6ae834dd..ff33947144 100644 --- a/src/GitVersion.Core/Core/RegexPatterns.cs +++ b/src/GitVersion.Core/Core/RegexPatterns.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Text.RegularExpressions; -namespace GitVersion.Core; +namespace GitVersion; internal static partial class RegexPatterns { diff --git a/src/GitVersion.Core/Core/RepositoryStore.cs b/src/GitVersion.Core/Core/RepositoryStore.cs index 50b5512a07..033f74795f 100644 --- a/src/GitVersion.Core/Core/RepositoryStore.cs +++ b/src/GitVersion.Core/Core/RepositoryStore.cs @@ -1,4 +1,3 @@ -using GitVersion.Common; using GitVersion.Configuration; using GitVersion.Extensions; using GitVersion.Git; @@ -25,7 +24,7 @@ internal class RepositoryStore(ILog log, IGitRepository repository) : IRepositor /// public ICommit? FindMergeBase(IBranch? branch, IBranch? otherBranch) { - var mergeBaseFinder = new MergeBaseFinder(this, log); + var mergeBaseFinder = new MergeBaseFinder(this, this.log); return mergeBaseFinder.FindMergeBaseOf(branch, otherBranch); } diff --git a/src/GitVersion.Core/Core/SourceBranchFinder.cs b/src/GitVersion.Core/Core/SourceBranchFinder.cs index 5d8b4095d3..98b7ea01d0 100644 --- a/src/GitVersion.Core/Core/SourceBranchFinder.cs +++ b/src/GitVersion.Core/Core/SourceBranchFinder.cs @@ -1,6 +1,5 @@ using System.Text.RegularExpressions; using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Git; diff --git a/src/GitVersion.Core/Core/TaggedSemanticVersionRepository.cs b/src/GitVersion.Core/Core/TaggedSemanticVersionRepository.cs index 60bf291f6b..6d40fe390e 100644 --- a/src/GitVersion.Core/Core/TaggedSemanticVersionRepository.cs +++ b/src/GitVersion.Core/Core/TaggedSemanticVersionRepository.cs @@ -1,11 +1,10 @@ using System.Collections.Concurrent; -using GitVersion.Common; using GitVersion.Configuration; using GitVersion.Extensions; using GitVersion.Git; using GitVersion.Logging; -namespace GitVersion.Core; +namespace GitVersion; internal sealed class TaggedSemanticVersionRepository(ILog log, IRepositoryStore repositoryStore) : ITaggedSemanticVersionRepository { @@ -26,7 +25,7 @@ public ILookup GetTaggedSemanticVersionsOfBranc tagPrefix ??= string.Empty; var isCached = true; - var result = taggedSemanticVersionsOfBranchCache.GetOrAdd(new(branch, tagPrefix, format), _ => + var result = this.taggedSemanticVersionsOfBranchCache.GetOrAdd(new(branch, tagPrefix, format), _ => { isCached = false; return [.. GetElements().Distinct().OrderByDescending(element => element.Tag.Commit.When)]; @@ -67,7 +66,7 @@ public ILookup GetTaggedSemanticVersionsOfMerge tagPrefix ??= string.Empty; var isCached = true; - var result = taggedSemanticVersionsOfMergeTargetCache.GetOrAdd(new(branch, tagPrefix, format), _ => + var result = this.taggedSemanticVersionsOfMergeTargetCache.GetOrAdd(new(branch, tagPrefix, format), _ => { isCached = false; return [.. GetElements().Distinct().OrderByDescending(element => element.Key.When)]; @@ -107,7 +106,7 @@ public ILookup GetTaggedSemanticVersions( tagPrefix ??= string.Empty; var isCached = true; - var result = taggedSemanticVersionsCache.GetOrAdd(new(tagPrefix, format), _ => + var result = this.taggedSemanticVersionsCache.GetOrAdd(new(tagPrefix, format), _ => { isCached = false; return [.. GetElements().OrderByDescending(element => element.Tag.Commit.When)]; diff --git a/src/GitVersion.Core/Core/TaggedSemanticVersionService.cs b/src/GitVersion.Core/Core/TaggedSemanticVersionService.cs index 2c4f966e6e..d8b9e59e1c 100644 --- a/src/GitVersion.Core/Core/TaggedSemanticVersionService.cs +++ b/src/GitVersion.Core/Core/TaggedSemanticVersionService.cs @@ -1,10 +1,9 @@ using GitVersion.Configuration; using GitVersion.Extensions; using GitVersion.Git; - using CommitSemanticVersion = (GitVersion.Git.ICommit Commit, GitVersion.SemanticVersionWithTag SemanticVersion); -namespace GitVersion.Core; +namespace GitVersion; internal sealed class TaggedSemanticVersionService( ITaggedSemanticVersionRepository repository, IBranchRepository branchRepository) diff --git a/src/GitVersion.Core/Core/TaggedSemanticVersions.cs b/src/GitVersion.Core/Core/TaggedSemanticVersions.cs index 898a70bd79..bc40982341 100644 --- a/src/GitVersion.Core/Core/TaggedSemanticVersions.cs +++ b/src/GitVersion.Core/Core/TaggedSemanticVersions.cs @@ -1,4 +1,4 @@ -namespace GitVersion.Core; +namespace GitVersion; [Flags] internal enum TaggedSemanticVersions diff --git a/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs b/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs index e79fcca522..49880d8e06 100644 --- a/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs +++ b/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs @@ -1,4 +1,3 @@ -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Formatting; using GitVersion.Git; diff --git a/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs b/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs index 84254303a0..c272c9232a 100644 --- a/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs +++ b/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs @@ -1,4 +1,3 @@ -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Git; using SemanticVersionResult = (GitVersion.SemanticVersion Value, string? Name); diff --git a/src/GitVersion.Core/Extensions/StringExtensions.cs b/src/GitVersion.Core/Extensions/StringExtensions.cs index 998a158092..5c8b0f4fb8 100644 --- a/src/GitVersion.Core/Extensions/StringExtensions.cs +++ b/src/GitVersion.Core/Extensions/StringExtensions.cs @@ -1,6 +1,5 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; -using GitVersion.Core; namespace GitVersion.Extensions; diff --git a/src/GitVersion.Core/Formatting/InputSanitizer.cs b/src/GitVersion.Core/Formatting/InputSanitizer.cs index f0f043c05b..8312657776 100644 --- a/src/GitVersion.Core/Formatting/InputSanitizer.cs +++ b/src/GitVersion.Core/Formatting/InputSanitizer.cs @@ -1,4 +1,3 @@ -using GitVersion.Core; namespace GitVersion.Formatting; diff --git a/src/GitVersion.Core/Formatting/StringFormatWithExtension.cs b/src/GitVersion.Core/Formatting/StringFormatWithExtension.cs index 341c9096f0..df34cb3f2e 100644 --- a/src/GitVersion.Core/Formatting/StringFormatWithExtension.cs +++ b/src/GitVersion.Core/Formatting/StringFormatWithExtension.cs @@ -1,5 +1,4 @@ using System.Text.RegularExpressions; -using GitVersion.Core; namespace GitVersion.Formatting; diff --git a/src/GitVersion.Core/Formatting/ValueFormatter.cs b/src/GitVersion.Core/Formatting/ValueFormatter.cs index 0e0be49645..633a2afb61 100644 --- a/src/GitVersion.Core/Formatting/ValueFormatter.cs +++ b/src/GitVersion.Core/Formatting/ValueFormatter.cs @@ -11,7 +11,7 @@ internal class ValueFormatter : InvariantFormatter, IValueFormatterCombiner public int Priority => 0; internal ValueFormatter() - => formatters = + => this.formatters = [ new StringFormatter(), new FormattableFormatter(), @@ -27,7 +27,7 @@ public override bool TryFormat(object? value, string format, CultureInfo culture return false; } - foreach (var formatter in formatters.OrderBy(f => f.Priority)) + foreach (var formatter in this.formatters.OrderBy(f => f.Priority)) { if (formatter.TryFormat(value, format, out result)) return true; @@ -36,7 +36,7 @@ public override bool TryFormat(object? value, string format, CultureInfo culture return false; } - void IValueFormatterCombiner.RegisterFormatter(IValueFormatter formatter) => formatters.Add(formatter); + void IValueFormatterCombiner.RegisterFormatter(IValueFormatter formatter) => this.formatters.Add(formatter); - void IValueFormatterCombiner.RemoveFormatter() => formatters.RemoveAll(f => f is T); + void IValueFormatterCombiner.RemoveFormatter() => this.formatters.RemoveAll(f => f is T); } diff --git a/src/GitVersion.Core/GitVersion.Core.csproj.DotSettings b/src/GitVersion.Core/GitVersion.Core.csproj.DotSettings new file mode 100644 index 0000000000..b542948fc7 --- /dev/null +++ b/src/GitVersion.Core/GitVersion.Core.csproj.DotSettings @@ -0,0 +1,4 @@ + + True + True + True \ No newline at end of file diff --git a/src/GitVersion.Core/GitVersionCoreModule.cs b/src/GitVersion.Core/GitVersionCoreModule.cs index 815d97e1f0..3af3941871 100644 --- a/src/GitVersion.Core/GitVersionCoreModule.cs +++ b/src/GitVersion.Core/GitVersionCoreModule.cs @@ -1,5 +1,3 @@ -using GitVersion.Common; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.VersionCalculation; using GitVersion.VersionCalculation.Caching; diff --git a/src/GitVersion.Core/Logging/Log.cs b/src/GitVersion.Core/Logging/Log.cs index e18eef1453..37b8654184 100644 --- a/src/GitVersion.Core/Logging/Log.cs +++ b/src/GitVersion.Core/Logging/Log.cs @@ -1,5 +1,4 @@ using System.Globalization; -using GitVersion.Core; using GitVersion.Helpers; namespace GitVersion.Logging; diff --git a/src/GitVersion.Core/MergeMessage.cs b/src/GitVersion.Core/MergeMessage.cs index c3576aa57c..1cb869c275 100644 --- a/src/GitVersion.Core/MergeMessage.cs +++ b/src/GitVersion.Core/MergeMessage.cs @@ -1,7 +1,6 @@ using System.Diagnostics.CodeAnalysis; using System.Text.RegularExpressions; using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Git; diff --git a/src/GitVersion.Core/PublicAPI.Shipped.txt b/src/GitVersion.Core/PublicAPI.Shipped.txt index fb75cf4a4b..5ce0a125bc 100644 --- a/src/GitVersion.Core/PublicAPI.Shipped.txt +++ b/src/GitVersion.Core/PublicAPI.Shipped.txt @@ -19,26 +19,26 @@ GitVersion.BugException GitVersion.BugException.BugException() -> void GitVersion.BugException.BugException(string! message) -> void GitVersion.BugException.BugException(string? message, System.Exception? innerException) -> void -GitVersion.Common.IRepositoryStore -GitVersion.Common.IRepositoryStore.Branches.get -> GitVersion.Git.IBranchCollection! -GitVersion.Common.IRepositoryStore.ExcludingBranches(System.Collections.Generic.IEnumerable! branchesToExclude) -> System.Collections.Generic.IEnumerable! -GitVersion.Common.IRepositoryStore.FindBranch(GitVersion.Git.ReferenceName! branchName) -> GitVersion.Git.IBranch? -GitVersion.Common.IRepositoryStore.FindCommitBranchesBranchedFrom(GitVersion.Git.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, params GitVersion.Git.IBranch![]! excludedBranches) -> System.Collections.Generic.IEnumerable! -GitVersion.Common.IRepositoryStore.FindMergeBase(GitVersion.Git.IBranch? branch, GitVersion.Git.IBranch? otherBranch) -> GitVersion.Git.ICommit? -GitVersion.Common.IRepositoryStore.FindMergeBase(GitVersion.Git.ICommit! commit, GitVersion.Git.ICommit! mainlineTip) -> GitVersion.Git.ICommit? -GitVersion.Common.IRepositoryStore.GetBranchesContainingCommit(GitVersion.Git.ICommit! commit, System.Collections.Generic.IEnumerable? branches = null, bool onlyTrackedBranches = false) -> System.Collections.Generic.IEnumerable! -GitVersion.Common.IRepositoryStore.GetCommitLog(GitVersion.Git.ICommit? baseVersionSource, GitVersion.Git.ICommit! currentCommit, GitVersion.Configuration.IIgnoreConfiguration! ignore) -> System.Collections.Generic.IReadOnlyList! -GitVersion.Common.IRepositoryStore.GetCommitsReacheableFrom(GitVersion.Git.ICommit! commit, GitVersion.Git.IBranch! branch) -> System.Collections.Generic.IReadOnlyList! -GitVersion.Common.IRepositoryStore.GetCommitsReacheableFromHead(GitVersion.Git.ICommit? headCommit, GitVersion.Configuration.IIgnoreConfiguration! ignore) -> System.Collections.Generic.IReadOnlyList! -GitVersion.Common.IRepositoryStore.GetCurrentCommit(GitVersion.Git.IBranch! currentBranch, string? commitId, GitVersion.Configuration.IIgnoreConfiguration! ignore) -> GitVersion.Git.ICommit? -GitVersion.Common.IRepositoryStore.GetForwardMerge(GitVersion.Git.ICommit? commitToFindCommonBase, GitVersion.Git.ICommit? findMergeBase) -> GitVersion.Git.ICommit? -GitVersion.Common.IRepositoryStore.GetSourceBranches(GitVersion.Git.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, params GitVersion.Git.IBranch![]! excludedBranches) -> System.Collections.Generic.IEnumerable! -GitVersion.Common.IRepositoryStore.GetSourceBranches(GitVersion.Git.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, System.Collections.Generic.IEnumerable! excludedBranches) -> System.Collections.Generic.IEnumerable! -GitVersion.Common.IRepositoryStore.GetTargetBranch(string? targetBranchName) -> GitVersion.Git.IBranch! -GitVersion.Common.IRepositoryStore.Head.get -> GitVersion.Git.IBranch! -GitVersion.Common.IRepositoryStore.IsCommitOnBranch(GitVersion.Git.ICommit? baseVersionSource, GitVersion.Git.IBranch! branch, GitVersion.Git.ICommit! firstMatchingCommit) -> bool -GitVersion.Common.IRepositoryStore.Tags.get -> GitVersion.Git.ITagCollection! -GitVersion.Common.IRepositoryStore.UncommittedChangesCount.get -> int +GitVersion.IRepositoryStore +GitVersion.IRepositoryStore.Branches.get -> GitVersion.Git.IBranchCollection! +GitVersion.IRepositoryStore.ExcludingBranches(System.Collections.Generic.IEnumerable! branchesToExclude) -> System.Collections.Generic.IEnumerable! +GitVersion.IRepositoryStore.FindBranch(GitVersion.Git.ReferenceName! branchName) -> GitVersion.Git.IBranch? +GitVersion.IRepositoryStore.FindCommitBranchesBranchedFrom(GitVersion.Git.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, params GitVersion.Git.IBranch![]! excludedBranches) -> System.Collections.Generic.IEnumerable! +GitVersion.IRepositoryStore.FindMergeBase(GitVersion.Git.IBranch? branch, GitVersion.Git.IBranch? otherBranch) -> GitVersion.Git.ICommit? +GitVersion.IRepositoryStore.FindMergeBase(GitVersion.Git.ICommit! commit, GitVersion.Git.ICommit! mainlineTip) -> GitVersion.Git.ICommit? +GitVersion.IRepositoryStore.GetBranchesContainingCommit(GitVersion.Git.ICommit! commit, System.Collections.Generic.IEnumerable? branches = null, bool onlyTrackedBranches = false) -> System.Collections.Generic.IEnumerable! +GitVersion.IRepositoryStore.GetCommitLog(GitVersion.Git.ICommit? baseVersionSource, GitVersion.Git.ICommit! currentCommit, GitVersion.Configuration.IIgnoreConfiguration! ignore) -> System.Collections.Generic.IReadOnlyList! +GitVersion.IRepositoryStore.GetCommitsReacheableFrom(GitVersion.Git.ICommit! commit, GitVersion.Git.IBranch! branch) -> System.Collections.Generic.IReadOnlyList! +GitVersion.IRepositoryStore.GetCommitsReacheableFromHead(GitVersion.Git.ICommit? headCommit, GitVersion.Configuration.IIgnoreConfiguration! ignore) -> System.Collections.Generic.IReadOnlyList! +GitVersion.IRepositoryStore.GetCurrentCommit(GitVersion.Git.IBranch! currentBranch, string? commitId, GitVersion.Configuration.IIgnoreConfiguration! ignore) -> GitVersion.Git.ICommit? +GitVersion.IRepositoryStore.GetForwardMerge(GitVersion.Git.ICommit? commitToFindCommonBase, GitVersion.Git.ICommit? findMergeBase) -> GitVersion.Git.ICommit? +GitVersion.IRepositoryStore.GetSourceBranches(GitVersion.Git.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, params GitVersion.Git.IBranch![]! excludedBranches) -> System.Collections.Generic.IEnumerable! +GitVersion.IRepositoryStore.GetSourceBranches(GitVersion.Git.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, System.Collections.Generic.IEnumerable! excludedBranches) -> System.Collections.Generic.IEnumerable! +GitVersion.IRepositoryStore.GetTargetBranch(string? targetBranchName) -> GitVersion.Git.IBranch! +GitVersion.IRepositoryStore.Head.get -> GitVersion.Git.IBranch! +GitVersion.IRepositoryStore.IsCommitOnBranch(GitVersion.Git.ICommit? baseVersionSource, GitVersion.Git.IBranch! branch, GitVersion.Git.ICommit! firstMatchingCommit) -> bool +GitVersion.IRepositoryStore.Tags.get -> GitVersion.Git.ITagCollection! +GitVersion.IRepositoryStore.UncommittedChangesCount.get -> int GitVersion.Configuration.AssemblyFileVersioningScheme GitVersion.Configuration.AssemblyFileVersioningScheme.Major = 3 -> GitVersion.Configuration.AssemblyFileVersioningScheme GitVersion.Configuration.AssemblyFileVersioningScheme.MajorMinor = 2 -> GitVersion.Configuration.AssemblyFileVersioningScheme diff --git a/src/GitVersion.Core/SemVer/SemanticVersion.cs b/src/GitVersion.Core/SemVer/SemanticVersion.cs index fa7d17dade..0d93afa4ba 100644 --- a/src/GitVersion.Core/SemVer/SemanticVersion.cs +++ b/src/GitVersion.Core/SemVer/SemanticVersion.cs @@ -1,6 +1,5 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; -using GitVersion.Core; using GitVersion.Extensions; namespace GitVersion; @@ -39,11 +38,11 @@ public bool IsMatchForBranchSpecificLabel(string? value) /// Initializes a new semantic version with the given major, minor, and patch values. public SemanticVersion(long major = 0, long minor = 0, long patch = 0) { - this.Major = major; - this.Minor = minor; - this.Patch = patch; - this.PreReleaseTag = SemanticVersionPreReleaseTag.Empty; - this.BuildMetaData = SemanticVersionBuildMetaData.Empty; + Major = major; + Minor = minor; + Patch = patch; + PreReleaseTag = SemanticVersionPreReleaseTag.Empty; + BuildMetaData = SemanticVersionBuildMetaData.Empty; } /// Initializes a new semantic version as a copy of . @@ -51,12 +50,12 @@ public SemanticVersion(SemanticVersion semanticVersion) { semanticVersion.NotNull(); - this.Major = semanticVersion.Major; - this.Minor = semanticVersion.Minor; - this.Patch = semanticVersion.Patch; + Major = semanticVersion.Major; + Minor = semanticVersion.Minor; + Patch = semanticVersion.Patch; - this.PreReleaseTag = semanticVersion.PreReleaseTag; - this.BuildMetaData = semanticVersion.BuildMetaData; + PreReleaseTag = semanticVersion.PreReleaseTag; + BuildMetaData = semanticVersion.BuildMetaData; } /// Returns when this version is equal to . @@ -66,11 +65,11 @@ public bool Equals(SemanticVersion? obj) { return false; } - return this.Major == obj.Major - && this.Minor == obj.Minor - && this.Patch == obj.Patch - && this.PreReleaseTag == obj.PreReleaseTag - && this.BuildMetaData == obj.BuildMetaData; + return Major == obj.Major + && Minor == obj.Minor + && Patch == obj.Patch + && PreReleaseTag == obj.PreReleaseTag + && BuildMetaData == obj.BuildMetaData; } /// Returns when this instance equals . @@ -255,33 +254,33 @@ public int CompareTo(SemanticVersion? value, bool includePreRelease) { return 1; } - if (this.Major != value.Major) + if (Major != value.Major) { - if (this.Major > value.Major) + if (Major > value.Major) { return 1; } return -1; } - if (this.Minor != value.Minor) + if (Minor != value.Minor) { - if (this.Minor > value.Minor) + if (Minor > value.Minor) { return 1; } return -1; } - if (this.Patch != value.Patch) + if (Patch != value.Patch) { - if (this.Patch > value.Patch) + if (Patch > value.Patch) { return 1; } return -1; } - if (!includePreRelease || this.PreReleaseTag == value.PreReleaseTag) return 0; - if (this.PreReleaseTag > value.PreReleaseTag) + if (!includePreRelease || PreReleaseTag == value.PreReleaseTag) return 0; + if (PreReleaseTag > value.PreReleaseTag) { return 1; } @@ -314,20 +313,20 @@ public string ToString(string? format, IFormatProvider? formatProvider) switch (format) { case "j": - return $"{this.Major}.{this.Minor}.{this.Patch}"; + return $"{Major}.{Minor}.{Patch}"; case "s": - return this.PreReleaseTag.HasTag() ? $"{ToString("j")}-{this.PreReleaseTag}" : ToString("j"); + return PreReleaseTag.HasTag() ? $"{ToString("j")}-{PreReleaseTag}" : ToString("j"); case "t": - return this.PreReleaseTag.HasTag() ? $"{ToString("j")}-{this.PreReleaseTag:t}" : ToString("j"); + return PreReleaseTag.HasTag() ? $"{ToString("j")}-{PreReleaseTag:t}" : ToString("j"); case "f": { - var buildMetadata = this.BuildMetaData.ToString(); + var buildMetadata = BuildMetaData.ToString(); return !buildMetadata.IsNullOrEmpty() ? $"{ToString("s")}+{buildMetadata}" : ToString("s"); } case "i": { - var buildMetadata = this.BuildMetaData.ToString("f"); + var buildMetadata = BuildMetaData.ToString("f"); return !buildMetadata.IsNullOrEmpty() ? $"{ToString("s")}+{buildMetadata}" : ToString("s"); } diff --git a/src/GitVersion.Core/SemVer/SemanticVersionBuildMetaData.cs b/src/GitVersion.Core/SemVer/SemanticVersionBuildMetaData.cs index 98f1b98f62..2c7366b071 100644 --- a/src/GitVersion.Core/SemVer/SemanticVersionBuildMetaData.cs +++ b/src/GitVersion.Core/SemVer/SemanticVersionBuildMetaData.cs @@ -1,5 +1,4 @@ using System.Globalization; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Helpers; @@ -68,17 +67,17 @@ public SemanticVersionBuildMetaData( VersionField versionSourceIncrement, string? otherMetadata = null) { - this.Sha = commitSha; - this.ShortSha = commitShortSha; - this.CommitsSinceTag = commitsSinceTag; - this.Branch = branch; - this.CommitDate = commitDate; - this.OtherMetaData = otherMetadata; - this.VersionSourceIncrement = versionSourceIncrement; - this.VersionSourceSemVer = versionSourceSemVer; - this.VersionSourceSha = versionSourceSha; - this.VersionSourceDistance = commitsSinceTag ?? 0; - this.UncommittedChanges = numberOfUnCommittedChanges; + Sha = commitSha; + ShortSha = commitShortSha; + CommitsSinceTag = commitsSinceTag; + Branch = branch; + CommitDate = commitDate; + OtherMetaData = otherMetadata; + VersionSourceIncrement = versionSourceIncrement; + VersionSourceSemVer = versionSourceSemVer; + VersionSourceSha = versionSourceSha; + VersionSourceDistance = commitsSinceTag ?? 0; + UncommittedChanges = numberOfUnCommittedChanges; } /// Initializes a new build metadata instance as a copy of . @@ -86,17 +85,17 @@ public SemanticVersionBuildMetaData(SemanticVersionBuildMetaData buildMetaData) { buildMetaData.NotNull(); - this.Sha = buildMetaData.Sha; - this.ShortSha = buildMetaData.ShortSha; - this.CommitsSinceTag = buildMetaData.CommitsSinceTag; - this.Branch = buildMetaData.Branch; - this.CommitDate = buildMetaData.CommitDate; - this.OtherMetaData = buildMetaData.OtherMetaData; - this.VersionSourceSemVer = buildMetaData.VersionSourceSemVer; - this.VersionSourceSha = buildMetaData.VersionSourceSha; - this.VersionSourceDistance = buildMetaData.VersionSourceDistance; - this.UncommittedChanges = buildMetaData.UncommittedChanges; - this.VersionSourceIncrement = buildMetaData.VersionSourceIncrement; + Sha = buildMetaData.Sha; + ShortSha = buildMetaData.ShortSha; + CommitsSinceTag = buildMetaData.CommitsSinceTag; + Branch = buildMetaData.Branch; + CommitDate = buildMetaData.CommitDate; + OtherMetaData = buildMetaData.OtherMetaData; + VersionSourceSemVer = buildMetaData.VersionSourceSemVer; + VersionSourceSha = buildMetaData.VersionSourceSha; + VersionSourceDistance = buildMetaData.VersionSourceDistance; + UncommittedChanges = buildMetaData.UncommittedChanges; + VersionSourceIncrement = buildMetaData.VersionSourceIncrement; } /// Returns when is a equal to this instance. @@ -130,9 +129,9 @@ public string ToString(string? format, IFormatProvider? formatProvider) format = format.ToLower(); return format.ToLower() switch { - "b" => $"{this.CommitsSinceTag}", - "s" => $"{this.CommitsSinceTag}{(this.Sha.IsNullOrEmpty() ? null : ".Sha." + this.Sha)}".TrimStart('.'), - "f" => $"{this.CommitsSinceTag}{(this.Branch.IsNullOrEmpty() ? null : ".Branch." + FormatMetaDataPart(this.Branch))}{(this.Sha.IsNullOrEmpty() ? null : ".Sha." + this.Sha)}{(this.OtherMetaData.IsNullOrEmpty() ? null : "." + FormatMetaDataPart(this.OtherMetaData))}".TrimStart('.'), + "b" => $"{CommitsSinceTag}", + "s" => $"{CommitsSinceTag}{(Sha.IsNullOrEmpty() ? null : ".Sha." + Sha)}".TrimStart('.'), + "f" => $"{CommitsSinceTag}{(Branch.IsNullOrEmpty() ? null : ".Branch." + FormatMetaDataPart(Branch))}{(Sha.IsNullOrEmpty() ? null : ".Sha." + Sha)}{(OtherMetaData.IsNullOrEmpty() ? null : "." + FormatMetaDataPart(OtherMetaData))}".TrimStart('.'), _ => throw new FormatException($"Unknown format '{format}'.") }; } diff --git a/src/GitVersion.Core/SemVer/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/SemVer/SemanticVersionPreReleaseTag.cs index 5a5933f373..87de99ebbe 100644 --- a/src/GitVersion.Core/SemVer/SemanticVersionPreReleaseTag.cs +++ b/src/GitVersion.Core/SemVer/SemanticVersionPreReleaseTag.cs @@ -1,5 +1,4 @@ using System.Globalization; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Helpers; diff --git a/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs b/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs index c684467ff3..d39b8c8ddb 100644 --- a/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs +++ b/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs @@ -1,6 +1,5 @@ using System.IO.Abstractions; using System.Security.Cryptography; -using GitVersion.Common; using GitVersion.Configuration; using GitVersion.Extensions; using GitVersion.Git; @@ -159,7 +158,7 @@ private string GetOverrideConfigHash(IReadOnlyDictionary? overr // Doesn't depend on command line representation and // includes possible changes in default values of Config per se. - var configContent = configurationSerializer.Serialize(overrideConfiguration); + var configContent = this.configurationSerializer.Serialize(overrideConfiguration); return GetHash(configContent); } diff --git a/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheProvider.cs b/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheProvider.cs index 904833a85b..d82ab6470f 100644 --- a/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheProvider.cs +++ b/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheProvider.cs @@ -31,7 +31,7 @@ public void WriteVariablesToDiskCache(GitVersionVariables versionVariables) { try { - serializer.ToFile(versionVariables, cacheFileName); + this.serializer.ToFile(versionVariables, cacheFileName); } catch (Exception ex) { @@ -54,7 +54,7 @@ public void WriteVariablesToDiskCache(GitVersionVariables versionVariables) try { - var loadedVariables = serializer.FromFile(cacheFileName); + var loadedVariables = this.serializer.FromFile(cacheFileName); return loadedVariables; } catch (Exception ex) @@ -99,7 +99,7 @@ private string PrepareCacheDirectory() private GitVersionCacheKey GetCacheKey() { - var cacheKey = this.cacheKeyFactory.Create(options.Value.ConfigurationInfo.OverrideConfiguration); + var cacheKey = this.cacheKeyFactory.Create(this.options.Value.ConfigurationInfo.OverrideConfiguration); return cacheKey; } diff --git a/src/GitVersion.Core/VersionCalculation/EffectiveBranchConfigurationFinder.cs b/src/GitVersion.Core/VersionCalculation/EffectiveBranchConfigurationFinder.cs index 7d9fc16476..66ebe69afb 100644 --- a/src/GitVersion.Core/VersionCalculation/EffectiveBranchConfigurationFinder.cs +++ b/src/GitVersion.Core/VersionCalculation/EffectiveBranchConfigurationFinder.cs @@ -1,4 +1,3 @@ -using GitVersion.Common; using GitVersion.Configuration; using GitVersion.Extensions; using GitVersion.Git; diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs index 1a2b0bf32b..0b106168c0 100644 --- a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs +++ b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs @@ -1,7 +1,5 @@ using System.Text.RegularExpressions; -using GitVersion.Common; using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Git; @@ -100,7 +98,7 @@ private Dictionary.ValueCollection GetCommitHistory(string? tag ICommit? baseVersionSource, ICommit currentCommit, string? label, IIgnoreConfiguration ignore) { var targetShas = new Lazy>(() => - [.. taggedSemanticVersionRepository + [.. this.taggedSemanticVersionRepository .GetTaggedSemanticVersions(tagPrefix, semanticVersionFormat, ignore) .SelectMany(versionWithTags => versionWithTags) .Where(versionWithTag => versionWithTag.Value.IsMatchForBranchSpecificLabel(label)) diff --git a/src/GitVersion.Core/VersionCalculation/Mainline/MainlineCommit.cs b/src/GitVersion.Core/VersionCalculation/Mainline/MainlineCommit.cs index 2340fa42f6..6b3c75fb00 100644 --- a/src/GitVersion.Core/VersionCalculation/Mainline/MainlineCommit.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/MainlineCommit.cs @@ -50,7 +50,7 @@ public bool IsPredecessorTheLastCommitOnTrunk(IGitVersionConfiguration configura [MemberNotNullWhen(true, nameof(ParentIteration), nameof(ParentCommit))] private bool HasParentIteration => Iteration.ParentIteration is not null && Iteration.ParentCommit is not null; - public IReadOnlyCollection SemanticVersions => semanticVersions; + public IReadOnlyCollection SemanticVersions => this.semanticVersions; private readonly HashSet semanticVersions = []; @@ -58,7 +58,7 @@ public bool IsPredecessorTheLastCommitOnTrunk(IGitVersionConfiguration configura public EffectiveConfiguration GetEffectiveConfiguration(IGitVersionConfiguration configuration) { - if (effectiveConfiguration is not null) return effectiveConfiguration; + if (this.effectiveConfiguration is not null) return this.effectiveConfiguration; var branchConfiguration = Configuration; @@ -81,7 +81,7 @@ public EffectiveConfiguration GetEffectiveConfiguration(IGitVersionConfiguration var parentConfiguration = ParentCommit.GetEffectiveConfiguration(configuration); branchConfiguration = branchConfiguration.Inherit(parentConfiguration); - return effectiveConfiguration = new EffectiveConfiguration(configuration, branchConfiguration); + return this.effectiveConfiguration = new EffectiveConfiguration(configuration, branchConfiguration); } public VersionField GetIncrementForcedByBranch(IGitVersionConfiguration configuration) @@ -97,7 +97,7 @@ public void AddSemanticVersions(IEnumerable values) { foreach (var semanticVersion in values.NotNull()) { - semanticVersions.Add(semanticVersion); + this.semanticVersions.Add(semanticVersion); } } diff --git a/src/GitVersion.Core/VersionCalculation/Mainline/MainlineIteration.cs b/src/GitVersion.Core/VersionCalculation/Mainline/MainlineIteration.cs index e9032754e6..4cbac8a4bb 100644 --- a/src/GitVersion.Core/VersionCalculation/Mainline/MainlineIteration.cs +++ b/src/GitVersion.Core/VersionCalculation/Mainline/MainlineIteration.cs @@ -44,9 +44,9 @@ public EffectiveConfiguration GetEffectiveConfiguration(IGitVersionConfiguration public int Depth { get; } - public int NumberOfCommits => commits.Count; + public int NumberOfCommits => this.commits.Count; - public IReadOnlyCollection Commits => commits; + public IReadOnlyCollection Commits => this.commits; private readonly Stack commits = new(); private readonly Dictionary commitLookup = []; @@ -68,11 +68,11 @@ public MainlineCommit CreateCommit( var commit = this.commits.Count != 0 ? this.commits.Peek().Append(value, branchName, configuration) : new MainlineCommit(this, value, branchName, configuration); - commits.Push(commit); + this.commits.Push(commit); if (value is not null) { - commitLookup.Add(value, commit); + this.commitLookup.Add(value, commit); } return commit; @@ -82,7 +82,7 @@ public MainlineCommit CreateCommit( { commit.NotNull(); - commitLookup.TryGetValue(commit, out var result); + this.commitLookup.TryGetValue(commit, out var result); return result; } } diff --git a/src/GitVersion.Core/VersionCalculation/PathFilter.cs b/src/GitVersion.Core/VersionCalculation/PathFilter.cs index 75c93fbf13..aa724ecb58 100644 --- a/src/GitVersion.Core/VersionCalculation/PathFilter.cs +++ b/src/GitVersion.Core/VersionCalculation/PathFilter.cs @@ -24,10 +24,10 @@ public bool Exclude(IBaseVersion baseVersion, [NotNullWhen(true)] out string? re private bool IsMatch(string path) { - if (!pathMatchCache.TryGetValue(path, out var isMatch)) + if (!this.pathMatchCache.TryGetValue(path, out var isMatch)) { isMatch = this.pathsRegexes.Any(regex => regex.IsMatch(path)); - pathMatchCache[path] = isMatch; + this.pathMatchCache[path] = isMatch; } return isMatch; } @@ -44,7 +44,7 @@ public bool Exclude(ICommit? commit, [NotNullWhen(true)] out string? reason) { case PathFilterMode.Inclusive: { - if (commit.DiffPaths.All(this.IsMatch)) + if (commit.DiffPaths.All(IsMatch)) { reason = "Source was ignored due to all commit paths matching ignore regex"; return true; diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs index 3943b84ab5..d4b70d031e 100644 --- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs +++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs @@ -1,6 +1,5 @@ using System.Globalization; using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; namespace GitVersion; @@ -21,13 +20,13 @@ public class SemanticVersionFormatValues(SemanticVersion semver, IGitVersionConf public string PreReleaseTag => semver.PreReleaseTag.ToString(); /// Gets the pre-release tag prefixed with a dash (e.g. -beta.1), or empty string when there is no tag. - public string PreReleaseTagWithDash => this.PreReleaseTag.WithPrefixIfNotNullOrEmpty("-"); + public string PreReleaseTagWithDash => PreReleaseTag.WithPrefixIfNotNullOrEmpty("-"); /// Gets the pre-release label without the numeric identifier (e.g. beta). public string PreReleaseLabel => semver.PreReleaseTag.Name; /// Gets the pre-release label prefixed with a dash (e.g. -beta), or empty string when there is no label. - public string PreReleaseLabelWithDash => this.PreReleaseLabel.WithPrefixIfNotNullOrEmpty("-"); + public string PreReleaseLabelWithDash => PreReleaseLabel.WithPrefixIfNotNullOrEmpty("-"); /// Gets the numeric pre-release identifier as a string, or empty string when absent. public string PreReleaseNumber => semver.PreReleaseTag.Number?.ToString() ?? string.Empty; diff --git a/src/GitVersion.Core/VersionCalculation/VariableProvider.cs b/src/GitVersion.Core/VersionCalculation/VariableProvider.cs index 3451f6a514..656b6b0f12 100644 --- a/src/GitVersion.Core/VersionCalculation/VariableProvider.cs +++ b/src/GitVersion.Core/VersionCalculation/VariableProvider.cs @@ -1,5 +1,4 @@ using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Formatting; using GitVersion.OutputVariables; diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeliveryVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeliveryVersionCalculator.cs index 865ec5d917..69b298b183 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeliveryVersionCalculator.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeliveryVersionCalculator.cs @@ -1,4 +1,3 @@ -using GitVersion.Common; using GitVersion.Logging; namespace GitVersion.VersionCalculation; diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeploymentVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeploymentVersionCalculator.cs index deeb94fe9a..f917e9454a 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeploymentVersionCalculator.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeploymentVersionCalculator.cs @@ -1,4 +1,3 @@ -using GitVersion.Common; using GitVersion.Logging; namespace GitVersion.VersionCalculation; diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/ManualDeploymentVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/ManualDeploymentVersionCalculator.cs index d13b586c3e..ddb64e7243 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionCalculators/ManualDeploymentVersionCalculator.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionCalculators/ManualDeploymentVersionCalculator.cs @@ -1,4 +1,3 @@ -using GitVersion.Common; using GitVersion.Logging; namespace GitVersion.VersionCalculation; diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs index 67d34935cb..8d2852cf93 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs @@ -1,7 +1,6 @@ using System.ComponentModel; using System.Diagnostics.CodeAnalysis; using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Git; using GitVersion.Logging; @@ -157,7 +156,7 @@ private SemanticVersion CalculateSemanticVersion( private NextVersion CalculateNextVersion(IBranch branch, IGitVersionConfiguration configuration) { var nextVersions = GetNextVersions(branch, configuration); - log.Separator(); + this.log.Separator(); var maxVersion = nextVersions.Max() ?? throw new GitVersionException("No base versions determined on the current branch."); @@ -174,7 +173,7 @@ private NextVersion CalculateNextVersion(IBranch branch, IGitVersionConfiguratio var latestVersion = matchingVersionsOnceIncremented.Aggregate(CompareVersions); latestBaseVersionSource = latestVersion.BaseVersion.BaseVersionSource; maxVersion = latestVersion; - log.Info( + this.log.Info( $"Found multiple base versions which will produce the same SemVer ({maxVersion.IncrementedVersion}), " + $"taking latest source for commit counting ({latestVersion.BaseVersion.Source})"); } @@ -211,8 +210,8 @@ private NextVersion CalculateNextVersion(IBranch branch, IGitVersionConfiguratio } }; - log.Info($"Base version used: {calculatedBase}"); - log.Separator(); + this.log.Info($"Base version used: {calculatedBase}"); + this.log.Separator(); return new(maxVersion.IncrementedVersion, calculatedBase, maxVersion.BranchConfiguration); } @@ -232,7 +231,7 @@ private static NextVersion CompareVersions(NextVersion version1, NextVersion ver private List GetNextVersions(IBranch branch, IGitVersionConfiguration configuration) { - using (log.IndentLog("Fetching the base versions for version calculation...")) + using (this.log.IndentLog("Fetching the base versions for version calculation...")) { if (branch.Tip == null) throw new GitVersionException("No commits found on the current branch."); @@ -264,7 +263,7 @@ IEnumerable GetNextVersionsInternal() { foreach (var baseVersion in versionStrategy.GetBaseVersions(effectiveBranchConfiguration)) { - log.Info(baseVersion.ToString()); + this.log.Info(baseVersion.ToString()); if (!IncludeVersion(baseVersion, configuration.Ignore)) continue; atLeastOneBaseVersionReturned = true; diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/VersionCalculatorBase.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/VersionCalculatorBase.cs index 9670425e5c..e25da432d5 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionCalculators/VersionCalculatorBase.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionCalculators/VersionCalculatorBase.cs @@ -1,4 +1,3 @@ -using GitVersion.Common; using GitVersion.Extensions; using GitVersion.Logging; diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/ConfiguredNextVersionVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/ConfiguredNextVersionVersionStrategy.cs index eee9b78d8f..2c02b9821b 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/ConfiguredNextVersionVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/ConfiguredNextVersionVersionStrategy.cs @@ -13,7 +13,7 @@ internal sealed class ConfiguredNextVersionVersionStrategy(Lazy contextLazy = contextLazy.NotNull(); private readonly IEnvironment environment = environment.NotNull(); - private GitVersionContext Context => contextLazy.Value; + private GitVersionContext Context => this.contextLazy.Value; public IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) { @@ -27,7 +27,7 @@ public IEnumerable GetBaseVersions(EffectiveBranchConfiguration con var semanticVersion = SemanticVersion.Parse( nextVersion, Context.Configuration.TagPrefixPattern, Context.Configuration.SemanticVersionFormat ); - var label = configuration.Value.GetBranchSpecificLabel(Context.CurrentBranch.Name, null, environment); + var label = configuration.Value.GetBranchSpecificLabel(Context.CurrentBranch.Name, null, this.environment); if (!semanticVersion.IsMatchForBranchSpecificLabel(label)) yield break; BaseVersionOperator? operation = null; diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/FallbacktVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/FallbacktVersionStrategy.cs index 019852e035..a5a1beb51d 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/FallbacktVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/FallbacktVersionStrategy.cs @@ -1,5 +1,4 @@ using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; namespace GitVersion.VersionCalculation; @@ -21,7 +20,7 @@ internal sealed class FallbackVersionStrategy( private readonly ITaggedSemanticVersionService taggedSemanticVersionService = taggedSemanticVersionService.NotNull(); private readonly IEnvironment environment = environment.NotNull(); - private GitVersionContext Context => contextLazy.Value; + private GitVersionContext Context => this.contextLazy.Value; public IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) => GetBaseVersionsInternal(configuration); @@ -35,7 +34,7 @@ private IEnumerable GetBaseVersionsInternal(EffectiveBranchConfigur var label = configuration.Value.GetBranchSpecificLabel(Context.CurrentBranch.Name, null, this.environment); - var baseVersionSource = taggedSemanticVersionService.GetTaggedSemanticVersions( + var baseVersionSource = this.taggedSemanticVersionService.GetTaggedSemanticVersions( branch: Context.CurrentBranch, configuration: Context.Configuration, label: label, @@ -43,7 +42,7 @@ private IEnumerable GetBaseVersionsInternal(EffectiveBranchConfigur taggedSemanticVersion: configuration.Value.GetTaggedSemanticVersion() ).Select(element => element.Key).FirstOrDefault(); - var increment = incrementStrategyFinder.DetermineIncrementedField( + var increment = this.incrementStrategyFinder.DetermineIncrementedField( currentCommit: Context.CurrentCommit, baseVersionSource: baseVersionSource, shouldIncrement: true, diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs index 0bcf15667e..03c45abc5a 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs @@ -1,6 +1,4 @@ -using GitVersion.Common; using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Git; using GitVersion.VersionCalculation.Mainline; @@ -25,7 +23,7 @@ internal sealed class MainlineVersionStrategy( private readonly IEnvironment environment = environment.NotNull(); private readonly Dictionary>> commitsWasBranchedFromCache = new(); - private GitVersionContext Context => contextLazy.Value; + private GitVersionContext Context => this.contextLazy.Value; private static readonly IReadOnlyCollection TrunkContextPreEnricherCollection = [ @@ -97,7 +95,7 @@ public IEnumerable GetBaseVersions(EffectiveBranchConfiguration con { taggedSemanticVersion |= TaggedSemanticVersions.OfMainBranches; } - var taggedSemanticVersions = taggedSemanticVersionService.GetTaggedSemanticVersions( + var taggedSemanticVersions = this.taggedSemanticVersionService.GetTaggedSemanticVersions( branch: Context.CurrentBranch, configuration: Context.Configuration, label: null, @@ -113,14 +111,14 @@ public IEnumerable GetBaseVersions(EffectiveBranchConfiguration con taggedSemanticVersions: taggedSemanticVersions ); - yield return DetermineBaseVersion(iteration, targetLabel, incrementStrategyFinder, Context.Configuration, this.environment); + yield return DetermineBaseVersion(iteration, targetLabel, this.incrementStrategyFinder, Context.Configuration, this.environment); } private MainlineIteration CreateIteration( ReferenceName branchName, IBranchConfiguration configuration, MainlineIteration? parentIteration = null, MainlineCommit? parentCommit = null) { - var iterationCount = Interlocked.Increment(ref iterationCounter); + var iterationCount = Interlocked.Increment(ref this.iterationCounter); return new MainlineIteration( id: $"#{iterationCount}", branchName: branchName, @@ -140,7 +138,7 @@ private bool IterateOverCommitsRecursive( var configuration = iteration.Configuration; var branchName = iteration.BranchName; - var branch = repositoryStore.FindBranch(branchName); + var branch = this.repositoryStore.FindBranch(branchName); var currentBranch = branch; Lazy>> commitsWasBranchedFromLazy = new( @@ -167,7 +165,7 @@ private bool IterateOverCommitsRecursive( configuration = effectiveConfigurationWasBranchedFrom.Value; branchName = effectiveConfigurationWasBranchedFrom.Branch.Name; - branch = repositoryStore.FindBranch(branchName); + branch = this.repositoryStore.FindBranch(branchName); var branchPointer = branch; commitsWasBranchedFromLazy = new Lazy>> @@ -188,7 +186,7 @@ private bool IterateOverCommitsRecursive( { taggedSemanticVersion |= TaggedSemanticVersions.OfMainBranches; } - taggedSemanticVersions = taggedSemanticVersionService.GetTaggedSemanticVersions( + taggedSemanticVersions = this.taggedSemanticVersionService.GetTaggedSemanticVersions( branch: effectiveConfigurationWasBranchedFrom.Branch, configuration: Context.Configuration, label: null, @@ -291,7 +289,7 @@ private bool IterateOverCommitsRecursive( Dictionary> result = []; - var branchCommits = repositoryStore.FindCommitBranchesBranchedFrom( + var branchCommits = this.repositoryStore.FindCommitBranchesBranchedFrom( branch, Context.Configuration, excludedBranches: excludedBranches ).ToList(); diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs index ae39de3386..d90485bb18 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs @@ -1,4 +1,3 @@ -using GitVersion.Common; using GitVersion.Configuration; using GitVersion.Extensions; using GitVersion.Logging; @@ -20,7 +19,7 @@ internal sealed class MergeMessageVersionStrategy(ILog log, Lazy contextLazy.Value; + private GitVersionContext Context => this.contextLazy.Value; public IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) => GetBaseVersionsInternal(configuration).Take(5); diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TaggedCommitVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TaggedCommitVersionStrategy.cs index 1b3445e9d9..6ec001bca8 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TaggedCommitVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TaggedCommitVersionStrategy.cs @@ -1,5 +1,4 @@ using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Logging; @@ -24,7 +23,7 @@ internal sealed class TaggedCommitVersionStrategy( private readonly IIncrementStrategyFinder incrementStrategyFinder = incrementStrategyFinder.NotNull(); private readonly IEnvironment environment = environment.NotNull(); - private GitVersionContext Context => contextLazy.Value; + private GitVersionContext Context => this.contextLazy.Value; public IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) => GetBaseVersionsInternal(configuration); @@ -36,7 +35,7 @@ private IEnumerable GetBaseVersionsInternal(EffectiveBranchConfigur if (!Context.Configuration.VersionStrategy.HasFlag(VersionStrategies.TaggedCommit)) yield break; - var taggedSemanticVersions = taggedSemanticVersionService.GetTaggedSemanticVersions( + var taggedSemanticVersions = this.taggedSemanticVersionService.GetTaggedSemanticVersions( branch: Context.CurrentBranch, configuration: Context.Configuration, label: null, @@ -70,7 +69,7 @@ private IEnumerable GetBaseVersionsInternal(EffectiveBranchConfigur } var baseVersionSource = semanticVersion.Tag.Commit; - var increment = incrementStrategyFinder.DetermineIncrementedField( + var increment = this.incrementStrategyFinder.DetermineIncrementedField( currentCommit: Context.CurrentCommit, baseVersionSource: baseVersionSource, shouldIncrement: true, diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrackReleaseBranchesVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrackReleaseBranchesVersionStrategy.cs index 4250ef2ad2..7ee57f9abc 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrackReleaseBranchesVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrackReleaseBranchesVersionStrategy.cs @@ -1,7 +1,5 @@ using System.Diagnostics.CodeAnalysis; -using GitVersion.Common; using GitVersion.Configuration; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Git; @@ -22,7 +20,7 @@ internal sealed class TrackReleaseBranchesVersionStrategy( private readonly IEnvironment environment = environment.NotNull(); private readonly VersionInBranchNameVersionStrategy releaseVersionStrategy = new(contextLazy, environment); - private GitVersionContext Context => contextLazy.Value; + private GitVersionContext Context => this.contextLazy.Value; public IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) { diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs index 08886ecb59..5584345a53 100644 --- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs +++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs @@ -14,7 +14,7 @@ internal sealed class VersionInBranchNameVersionStrategy(Lazy private readonly Lazy contextLazy = contextLazy.NotNull(); private readonly IEnvironment environment = environment.NotNull(); - private GitVersionContext Context => contextLazy.Value; + private GitVersionContext Context => this.contextLazy.Value; public IEnumerable GetBaseVersions(EffectiveBranchConfiguration configuration) { diff --git a/src/GitVersion.LibGit2Sharp/Git/Commit.cs b/src/GitVersion.LibGit2Sharp/Git/Commit.cs index 950fbf5a2a..15286b54fd 100644 --- a/src/GitVersion.LibGit2Sharp/Git/Commit.cs +++ b/src/GitVersion.LibGit2Sharp/Git/Commit.cs @@ -39,10 +39,10 @@ public IReadOnlyList DiffPaths { get { - if (!pathsCache.TryGetValue(this.Sha, out var paths)) + if (!pathsCache.TryGetValue(Sha, out var paths)) { - paths = this.CommitChanges.Paths; - pathsCache[this.Sha] = paths; + paths = CommitChanges.Paths; + pathsCache[Sha] = paths; } return paths; } diff --git a/src/GitVersion.LibGit2Sharp/Git/GitRepositoryCache.cs b/src/GitVersion.LibGit2Sharp/Git/GitRepositoryCache.cs index 8d8eba006b..01fe95c837 100644 --- a/src/GitVersion.LibGit2Sharp/Git/GitRepositoryCache.cs +++ b/src/GitVersion.LibGit2Sharp/Git/GitRepositoryCache.cs @@ -17,21 +17,21 @@ public Branch GetOrWrap(LibGit2Sharp.Branch innerBranch, Diff repoDiff) var cacheKey = innerBranch.Tip is null ? $"{innerBranch.RemoteName}/{innerBranch.CanonicalName}" : $"{innerBranch.RemoteName}/{innerBranch.CanonicalName}@{innerBranch.Tip.Sha}"; - return cachedBranches.GetOrAdd(cacheKey, _ => new Branch(innerBranch, repoDiff, this)); + return this.cachedBranches.GetOrAdd(cacheKey, _ => new Branch(innerBranch, repoDiff, this)); } public Commit GetOrWrap(LibGit2Sharp.Commit innerCommit, Diff repoDiff) - => cachedCommits.GetOrAdd(innerCommit.Sha, _ => new Commit(innerCommit, repoDiff, this)); + => this.cachedCommits.GetOrAdd(innerCommit.Sha, _ => new Commit(innerCommit, repoDiff, this)); public Tag GetOrWrap(LibGit2Sharp.Tag innerTag, Diff repoDiff) - => cachedTags.GetOrAdd(innerTag.CanonicalName, _ => new Tag(innerTag, repoDiff, this)); + => this.cachedTags.GetOrAdd(innerTag.CanonicalName, _ => new Tag(innerTag, repoDiff, this)); public Remote GetOrWrap(LibGit2Sharp.Remote innerRemote) - => cachedRemotes.GetOrAdd(innerRemote.Name, _ => new Remote(innerRemote, this)); + => this.cachedRemotes.GetOrAdd(innerRemote.Name, _ => new Remote(innerRemote, this)); public Reference GetOrWrap(LibGit2Sharp.Reference innerReference) - => cachedReferences.GetOrAdd(innerReference.CanonicalName, _ => new Reference(innerReference)); + => this.cachedReferences.GetOrAdd(innerReference.CanonicalName, _ => new Reference(innerReference)); public RefSpec GetOrWrap(LibGit2Sharp.RefSpec innerRefSpec) - => cachedRefSpecs.GetOrAdd(innerRefSpec.Specification, _ => new RefSpec(innerRefSpec)); + => this.cachedRefSpecs.GetOrAdd(innerRefSpec.Specification, _ => new RefSpec(innerRefSpec)); } diff --git a/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs b/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs index 3ed170beb0..756951afcf 100644 --- a/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs +++ b/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs @@ -33,7 +33,7 @@ public GitRepositoryInfo(IFileSystem fileSystem, IOptions opt private string? GetDynamicGitRepositoryPath() { - var repositoryInfo = gitVersionOptions.RepositoryInfo; + var repositoryInfo = this.gitVersionOptions.RepositoryInfo; if (repositoryInfo.TargetUrl.IsNullOrWhiteSpace()) return null; var targetUrl = repositoryInfo.TargetUrl; @@ -64,7 +64,7 @@ public GitRepositoryInfo(IFileSystem fileSystem, IOptions opt { var gitDirectory = !DynamicGitRepositoryPath.IsNullOrWhiteSpace() ? DynamicGitRepositoryPath - : Repository.Discover(gitVersionOptions.WorkingDirectory); + : Repository.Discover(this.gitVersionOptions.WorkingDirectory); gitDirectory = gitDirectory?.TrimEnd('/', '\\'); if (gitDirectory.IsNullOrEmpty()) @@ -80,10 +80,10 @@ private string GetProjectRootDirectory() { if (!DynamicGitRepositoryPath.IsNullOrWhiteSpace()) { - return gitVersionOptions.WorkingDirectory; + return this.gitVersionOptions.WorkingDirectory; } - var gitDirectory = Repository.Discover(gitVersionOptions.WorkingDirectory); + var gitDirectory = Repository.Discover(this.gitVersionOptions.WorkingDirectory); if (gitDirectory.IsNullOrEmpty()) throw new DirectoryNotFoundException("Cannot find the .git directory"); diff --git a/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs b/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs index 5e0b795cd3..6eed74bf4d 100644 --- a/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs +++ b/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs @@ -50,5 +50,5 @@ public void UpdateTarget(IReference directRef, IObjectId targetId) => }); private void InitializeReferencesLazy() - => this.references = new Lazy>(() => [.. this.innerCollection.Select(repositoryCache.GetOrWrap)]); + => this.references = new Lazy>(() => [.. this.innerCollection.Select(this.repositoryCache.GetOrWrap)]); } diff --git a/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs b/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs index c63f135823..01c9f2fbb9 100644 --- a/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs +++ b/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs @@ -43,5 +43,5 @@ public void Update(string remoteName, string refSpec) => }); private void InitializeRemotesLazy() - => this.remotes = new Lazy>(() => [.. this.innerCollection.Select(repositoryCache.GetOrWrap)]); + => this.remotes = new Lazy>(() => [.. this.innerCollection.Select(this.repositoryCache.GetOrWrap)]); } diff --git a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs index 1d1c138d8c..98c4ae310d 100644 --- a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs +++ b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs @@ -1,7 +1,7 @@ using Buildalyzer; using Buildalyzer.Environment; -using GitVersion.Core.Tests; using GitVersion.Helpers; +using GitVersion.Tests; using Microsoft.Build.Framework; using Microsoft.Build.Logging; using Microsoft.Build.Utilities.ProjectCreation; @@ -18,13 +18,13 @@ public class MsBuildExeFixture public const string OutputTarget = "GitVersionOutput"; private readonly AnalyzerManager manager = new(); - private readonly string ProjectPath; + private readonly string projectPath; public MsBuildExeFixture(RepositoryFixtureBase fixture, string workingDirectory = "", string language = "C#") { var projectExtension = AssemblyInfoFileHelper.GetProjectExtension(language); this.fixture = fixture; - this.ProjectPath = FileSystemHelper.Path.Combine(workingDirectory, $"app.{projectExtension}"); + this.projectPath = FileSystemHelper.Path.Combine(workingDirectory, $"app.{projectExtension}"); var versionFile = FileSystemHelper.Path.Combine(workingDirectory, "gitversion.json"); @@ -33,7 +33,7 @@ public MsBuildExeFixture(RepositoryFixtureBase fixture, string workingDirectory public MsBuildExeFixtureResult Execute() { - var analyzer = this.manager.GetProject(this.ProjectPath); + var analyzer = this.manager.GetProject(this.projectPath); var output = new StringWriter(); analyzer.AddBuildLogger(new ConsoleLogger(LoggerVerbosity.Normal, output.Write, null, null)); @@ -54,7 +54,7 @@ public MsBuildExeFixtureResult Execute() return new MsBuildExeFixtureResult(this.fixture) { - ProjectPath = ProjectPath, + ProjectPath = this.projectPath, Output = output.ToString(), MsBuild = results }; @@ -62,7 +62,7 @@ public MsBuildExeFixtureResult Execute() public void CreateTestProject(Action extendProject) { - var project = ProjectCreator.Templates.SdkCsproj(this.ProjectPath); + var project = ProjectCreator.Templates.SdkCsproj(this.projectPath); extendProject(project); project.Save(); diff --git a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs index a6e1224e06..73eea23c4a 100644 --- a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs +++ b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs @@ -1,8 +1,8 @@ using GitVersion.Agents; -using GitVersion.Core.Tests; using GitVersion.Helpers; using GitVersion.MsBuild.Tasks; using GitVersion.MsBuild.Tests.Mocks; +using GitVersion.Tests; namespace GitVersion.MsBuild.Tests.Helpers; diff --git a/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs b/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs index 169416e7f5..6555304558 100644 --- a/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs +++ b/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs @@ -1,7 +1,7 @@ using System.IO.Abstractions; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.MsBuild.Tests.Mocks; +using GitVersion.Tests; namespace GitVersion.MsBuild.Tests; diff --git a/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs b/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs index c16fc5b1cb..494ef739b6 100644 --- a/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs +++ b/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs @@ -1,12 +1,11 @@ using System.IO.Abstractions; using GitVersion.Agents; using GitVersion.Configuration; -using GitVersion.Core.Tests; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.MsBuild.Tasks; using GitVersion.MsBuild.Tests.Helpers; using GitVersion.Testing.Extensions; +using GitVersion.Tests; using LibGit2Sharp; using Microsoft.Build.Utilities.ProjectCreation; diff --git a/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs b/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs index ac43593d01..06f53ee930 100644 --- a/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs +++ b/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs @@ -39,7 +39,7 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task) if (!string.IsNullOrEmpty(task.IntermediateOutputPath)) { // Ensure provided output path exists first. Fixes issue #2815. - fileSystem.Directory.CreateDirectory(task.IntermediateOutputPath); + this.fileSystem.Directory.CreateDirectory(task.IntermediateOutputPath); } var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "AssemblyInfo"); @@ -55,7 +55,7 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task) gitVersionOptions.AssemblySettingsInfo.EnsureAssemblyInfo = true; gitVersionOptions.AssemblySettingsInfo.Files.Add(fileWriteInfo.FileName); - gitVersionOutputTool.UpdateAssemblyInfo(versionVariables); + this.gitVersionOutputTool.UpdateAssemblyInfo(versionVariables); } public void GenerateGitVersionInformation(GenerateGitVersionInformation task) @@ -65,7 +65,7 @@ public void GenerateGitVersionInformation(GenerateGitVersionInformation task) if (!string.IsNullOrEmpty(task.IntermediateOutputPath)) { // Ensure provided output path exists first. Fixes issue #2815. - fileSystem.Directory.CreateDirectory(task.IntermediateOutputPath); + this.fileSystem.Directory.CreateDirectory(task.IntermediateOutputPath); } var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "GitVersionInformation"); @@ -78,7 +78,7 @@ public void GenerateGitVersionInformation(GenerateGitVersionInformation task) var gitVersionOptions = this.options.Value; gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory; var targetNamespace = GetTargetNamespace(task); - gitVersionOutputTool.GenerateGitVersionInformation(versionVariables, fileWriteInfo, targetNamespace); + this.gitVersionOutputTool.GenerateGitVersionInformation(versionVariables, fileWriteInfo, targetNamespace); return; static string? GetTargetNamespace(GenerateGitVersionInformation task) @@ -102,8 +102,8 @@ public void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task) var gitVersionOptions = this.options.Value; var configuration = this.configurationProvider.Provide(gitVersionOptions.ConfigurationInfo.OverrideConfiguration); - gitVersionOutputTool.OutputVariables(versionVariables, configuration.UpdateBuildNumber); + this.gitVersionOutputTool.OutputVariables(versionVariables, configuration.UpdateBuildNumber); } - private GitVersionVariables GitVersionVariables(GitVersionTaskBase task) => serializer.FromFile(task.VersionFile); + private GitVersionVariables GitVersionVariables(GitVersionTaskBase task) => this.serializer.FromFile(task.VersionFile); } diff --git a/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs b/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs index ae53770b68..1aaecdee67 100644 --- a/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs +++ b/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs @@ -3,7 +3,7 @@ using GitVersion.Helpers; using Microsoft.Build.Framework; -using static GitVersion.Core.RegexPatterns.AssemblyVersion; +using static GitVersion.RegexPatterns.AssemblyVersion; namespace GitVersion.MsBuild; diff --git a/src/GitVersion.Output.Tests/Output/AssemblyFileVersionTests.cs b/src/GitVersion.Output.Tests/Output/AssemblyFileVersionTests.cs index b3a44c07e0..c2df5a2bdd 100644 --- a/src/GitVersion.Output.Tests/Output/AssemblyFileVersionTests.cs +++ b/src/GitVersion.Output.Tests/Output/AssemblyFileVersionTests.cs @@ -1,6 +1,6 @@ using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Extensions; +using GitVersion.Tests; namespace GitVersion.Output.Tests; diff --git a/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs b/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs index 548c6ef238..3551a56d69 100644 --- a/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs +++ b/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs @@ -1,11 +1,10 @@ using System.IO.Abstractions; using GitVersion.Configuration; -using GitVersion.Core; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.Logging; using GitVersion.Output.AssemblyInfo; using GitVersion.OutputVariables; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.Output.Tests; @@ -20,10 +19,10 @@ public class AssemblyInfoFileUpdaterTests : TestBase private string workingDir = null!; [OneTimeSetUp] - public void OneTimeSetUp() => workingDir = FileSystemHelper.Path.Combine(FileSystemHelper.Path.GetTempPath(), nameof(AssemblyInfoFileUpdaterTests)); + public void OneTimeSetUp() => this.workingDir = FileSystemHelper.Path.Combine(FileSystemHelper.Path.GetTempPath(), nameof(AssemblyInfoFileUpdaterTests)); [OneTimeTearDown] - public void OneTimeTearDown() => FileSystemHelper.Directory.DeleteDirectory(workingDir); + public void OneTimeTearDown() => FileSystemHelper.Directory.DeleteDirectory(this.workingDir); [SetUp] public void Setup() @@ -43,13 +42,13 @@ public void Setup() public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(string fileExtension) { var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension; - var fullPath = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fullPath = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); var variables = this.variableProvider.GetVariablesFor( SemanticVersion.Parse("1.0.0", RegexPatterns.Configuration.DefaultTagPrefixRegexPattern), EmptyConfigurationBuilder.New.Build(), 0); using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, true, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, true, assemblyInfoFile)); this.fileSystem.File.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(FileSystemHelper.Path.Combine("Approved", fileExtension))); } @@ -60,13 +59,13 @@ public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(strin public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo(string fileExtension) { var assemblyInfoFile = FileSystemHelper.Path.Combine("src", "Project", "Properties", $"VersionAssemblyInfo.{fileExtension}"); - var fullPath = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fullPath = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); var variables = this.variableProvider.GetVariablesFor( SemanticVersion.Parse("1.0.0", RegexPatterns.Configuration.DefaultTagPrefixRegexPattern), EmptyConfigurationBuilder.New.Build(), 0 ); using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, true, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, true, assemblyInfoFile)); this.fileSystem.File.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(FileSystemHelper.Path.Combine("Approved", fileExtension))); } @@ -80,11 +79,11 @@ public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInf var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", RegexPatterns.Configuration.DefaultTagPrefixRegexPattern), EmptyConfigurationBuilder.New.Build(), 0); using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, true, [.. assemblyInfoFiles])); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, true, [.. assemblyInfoFiles])); foreach (var item in assemblyInfoFiles) { - var fullPath = FileSystemHelper.Path.Combine(workingDir, item); + var fullPath = FileSystemHelper.Path.Combine(this.workingDir, item); this.fileSystem.File.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(FileSystemHelper.Path.Combine("Approved", fileExtension))); } } @@ -95,13 +94,13 @@ public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInf public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo(string fileExtension) { var assemblyInfoFile = "NoVersionAssemblyInfo." + fileExtension; - var fullPath = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fullPath = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); var variables = this.variableProvider.GetVariablesFor( SemanticVersion.Parse("1.0.0", RegexPatterns.Configuration.DefaultTagPrefixRegexPattern), EmptyConfigurationBuilder.New.Build(), 0 ); using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); this.fileSystem.File.Exists(fullPath).ShouldBeFalse(); } @@ -112,13 +111,13 @@ public void ShouldNotCreateAssemblyInfoFileForUnknownSourceCodeAndEnsureAssembly this.fileSystem = Substitute.For(); const string assemblyInfoFile = "VersionAssemblyInfo.js"; - var fullPath = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fullPath = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); var variables = this.variableProvider.GetVariablesFor( SemanticVersion.Parse("1.0.0", RegexPatterns.Configuration.DefaultTagPrefixRegexPattern), EmptyConfigurationBuilder.New.Build(), 0 ); using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, true, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, true, assemblyInfoFile)); this.fileSystem.Received(1).File.WriteAllText(fullPath, Arg.Any()); } @@ -134,9 +133,9 @@ public void ShouldStartSearchFromWorkingDirectory() ); using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, [.. assemblyInfoFiles])); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, [.. assemblyInfoFiles])); - this.fileSystem.Received(1).Directory.EnumerateFiles(Arg.Is(workingDir), Arg.Any(), Arg.Any()); + this.fileSystem.Received(1).Directory.EnumerateFiles(Arg.Is(this.workingDir), Arg.Any(), Arg.Any()); } [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")] @@ -145,12 +144,12 @@ public void ShouldStartSearchFromWorkingDirectory() public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = "AssemblyInfo." + fileExtension; - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); fs.Received().File.WriteAllText(fileName, Arg.Is(s => s.Contains("""AssemblyVersion("2.3.0.0")""") && @@ -165,12 +164,12 @@ public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFi public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = "AssemblyInfo." + fileExtension; - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); assemblyFileContent = fs.File.ReadAllText(fileName); assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(FileSystemHelper.Path.Combine("Approved", fileExtension))); @@ -183,12 +182,12 @@ public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileEx public void ShouldReplaceAssemblyVersionInRelativePath(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = FileSystemHelper.Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension); - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); fs.Received().File.WriteAllText(fileName, Arg.Is(s => s.Contains("""AssemblyVersion("2.3.0.0")""") && @@ -203,12 +202,12 @@ public void ShouldReplaceAssemblyVersionInRelativePath(string fileExtension, str public void ShouldReplaceAssemblyVersionInRelativePathWithWhiteSpace(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = FileSystemHelper.Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension); - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); fs.Received().File.WriteAllText(fileName, Arg.Is(s => s.Contains("""AssemblyVersion("2.3.0.0")""") && @@ -223,12 +222,12 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithWhiteSpace(string file public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = "AssemblyInfo." + fileExtension; - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); fs.Received().File.WriteAllText(fileName, Arg.Is(s => s.Contains("""AssemblyVersion("2.3.0.0")""") && @@ -243,12 +242,12 @@ public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string as public void ShouldReplaceAssemblyVersionWithAttributeSuffix(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = "AssemblyInfo." + fileExtension; - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); fs.Received().File.WriteAllText(fileName, Arg.Is(s => !s.Contains("""AssemblyVersionAttribute("1.0.0.0")""") && @@ -266,12 +265,12 @@ public void ShouldReplaceAssemblyVersionWithAttributeSuffix(string fileExtension public void ShouldAddAssemblyVersionIfMissingFromInfoFile(string fileExtension) { var assemblyInfoFile = "AssemblyInfo." + fileExtension; - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile("", fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); fs.Received().File.WriteAllText(fileName, Arg.Is(s => s.Contains("""AssemblyVersion("2.3.0.0")""") && @@ -286,12 +285,12 @@ public void ShouldAddAssemblyVersionIfMissingFromInfoFile(string fileExtension) public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = "AssemblyInfo." + fileExtension; - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); fs.Received().File.WriteAllText(fileName, Arg.Is(s => s.Contains("""AssemblyVersion("2.3.0.0")""") && @@ -306,12 +305,12 @@ public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string a public void ShouldReplaceAssemblyVersionWhenCreatingAssemblyVersionFileAndEnsureAssemblyInfo(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = "AssemblyInfo." + fileExtension; - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); fs.Received().File.WriteAllText(fileName, Arg.Is(s => s.Contains("""AssemblyVersion("2.3.1.0")""") && @@ -326,12 +325,12 @@ public void ShouldReplaceAssemblyVersionWhenCreatingAssemblyVersionFileAndEnsure public void ShouldReplaceAssemblyVersionInRelativePathWithVariables(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = FileSystemHelper.Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension); - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); fs.Received().File.WriteAllText(fileName, Arg.Is(s => s.Contains("""AssemblyVersion("2.3.0.0")""") && @@ -346,12 +345,12 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariables(string fileE public void ShouldReplaceAssemblyVersionInRelativePathWithVariablesAndWhiteSpace(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = FileSystemHelper.Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension); - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); fs.Received().File.WriteAllText(fileName, Arg.Is(s => s.Contains("""AssemblyVersion("2.3.0.0")""") && @@ -366,12 +365,12 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariablesAndWhiteSpace public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = "AssemblyInfo." + fileExtension; - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); assemblyFileContent = fs.File.ReadAllText(fileName); assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(FileSystemHelper.Path.Combine("Approved", fileExtension))); @@ -384,12 +383,12 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile public void Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = "AssemblyInfo." + fileExtension; - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); assemblyFileContent = fs.File.ReadAllText(fileName); assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(FileSystemHelper.Path.Combine("Approved", fileExtension))); @@ -402,12 +401,12 @@ public void Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttri public void ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent) { var assemblyInfoFile = "AssemblyInfo." + fileExtension; - var fileName = FileSystemHelper.Path.Combine(workingDir, assemblyInfoFile); + var fileName = FileSystemHelper.Path.Combine(this.workingDir, assemblyInfoFile); VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, (fs, variables) => { using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs); - assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile)); + assemblyInfoFileUpdater.Execute(variables, new(this.workingDir, false, assemblyInfoFile)); assemblyFileContent = fs.File.ReadAllText(fileName); assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(FileSystemHelper.Path.Combine("Approved", fileExtension))); diff --git a/src/GitVersion.Output.Tests/Output/FormatArgumentTests.cs b/src/GitVersion.Output.Tests/Output/FormatArgumentTests.cs index e2ca58dc82..549d4093d3 100644 --- a/src/GitVersion.Output.Tests/Output/FormatArgumentTests.cs +++ b/src/GitVersion.Output.Tests/Output/FormatArgumentTests.cs @@ -1,8 +1,7 @@ -using GitVersion.Core.Tests; -using GitVersion.Core.Tests.Helpers; using GitVersion.Logging; using GitVersion.Output.OutputGenerator; using GitVersion.Testing.Extensions; +using GitVersion.Tests; using LibGit2Sharp; namespace GitVersion.Output.Tests; diff --git a/src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs b/src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs index 5e28c9421d..3dcebb1892 100644 --- a/src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs +++ b/src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs @@ -1,9 +1,9 @@ using System.Globalization; using System.IO.Abstractions; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.Output.GitVersionInfo; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.Output.Tests; diff --git a/src/GitVersion.Output.Tests/Output/InformationalVersionBuilderTests.cs b/src/GitVersion.Output.Tests/Output/InformationalVersionBuilderTests.cs index 6e81fea383..2f5bd51147 100644 --- a/src/GitVersion.Output.Tests/Output/InformationalVersionBuilderTests.cs +++ b/src/GitVersion.Output.Tests/Output/InformationalVersionBuilderTests.cs @@ -1,4 +1,4 @@ -using GitVersion.Core.Tests.Helpers; +using GitVersion.Tests; namespace GitVersion.Output.Tests; diff --git a/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs b/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs index a9ba775480..c2f919f79d 100644 --- a/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs +++ b/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs @@ -1,12 +1,11 @@ using System.IO.Abstractions; using System.Xml.Linq; using GitVersion.Configuration; -using GitVersion.Core; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.Logging; using GitVersion.Output.AssemblyInfo; using GitVersion.OutputVariables; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.Output.Tests; @@ -56,10 +55,10 @@ public void CanUpdateProjectFileWithSdkProjectFileXml(string sdk) """; - var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml)); + var canUpdate = this.projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml)); canUpdate.ShouldBe(true); - logMessages.ShouldBeEmpty(); + this.logMessages.ShouldBeEmpty(); } [TestCase($""" @@ -72,13 +71,13 @@ public void CanUpdateProjectFileWithSdkProjectFileXml(string sdk) """)] public void CannotUpdateProjectFileWithIncorrectProjectSdk(string xml) { - var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml)); + var canUpdate = this.projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml)); canUpdate.ShouldBe(false); - logMessages.ShouldNotBeEmpty(); - logMessages.Count.ShouldBe(1); - logMessages[0].ShouldContain("Specified project file Sdk (SomeOtherProject.Sdk) is not supported, please ensure the project sdk starts with 'Microsoft.NET.Sdk' or 'Microsoft.Build.Sql'"); + this.logMessages.ShouldNotBeEmpty(); + this.logMessages.Count.ShouldBe(1); + this.logMessages[0].ShouldContain("Specified project file Sdk (SomeOtherProject.Sdk) is not supported, please ensure the project sdk starts with 'Microsoft.NET.Sdk' or 'Microsoft.Build.Sql'"); } [TestCase($""" @@ -91,13 +90,13 @@ public void CannotUpdateProjectFileWithIncorrectProjectSdk(string xml) """)] public void CannotUpdateProjectFileWithMissingProjectSdk(string xml) { - var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml)); + var canUpdate = this.projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml)); canUpdate.ShouldBe(false); - logMessages.ShouldNotBeEmpty(); - logMessages.Count.ShouldBe(1); - logMessages[0].ShouldContain("Specified project file Sdk () is not supported, please ensure the project sdk starts with 'Microsoft.NET.Sdk' or 'Microsoft.Build.Sql'"); + this.logMessages.ShouldNotBeEmpty(); + this.logMessages.Count.ShouldBe(1); + this.logMessages[0].ShouldContain("Specified project file Sdk () is not supported, please ensure the project sdk starts with 'Microsoft.NET.Sdk' or 'Microsoft.Build.Sql'"); } [TestCase($""" @@ -111,13 +110,13 @@ public void CannotUpdateProjectFileWithMissingProjectSdk(string xml) """)] public void CannotUpdateProjectFileWithoutAssemblyInfoGeneration(string xml) { - var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml)); + var canUpdate = this.projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml)); canUpdate.ShouldBe(false); - logMessages.ShouldNotBeEmpty(); - logMessages.Count.ShouldBe(1); - logMessages[0].ShouldContain("Project file specifies false: versions set in this project file will not affect the output artifacts"); + this.logMessages.ShouldNotBeEmpty(); + this.logMessages.Count.ShouldBe(1); + this.logMessages[0].ShouldContain("Project file specifies false: versions set in this project file will not affect the output artifacts"); } [TestCase(""" @@ -126,13 +125,13 @@ public void CannotUpdateProjectFileWithoutAssemblyInfoGeneration(string xml) """)] public void CannotUpdateProjectFileWithoutAPropertyGroup(string xml) { - var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml)); + var canUpdate = this.projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml)); canUpdate.ShouldBe(false); - logMessages.ShouldNotBeEmpty(); - logMessages.Count.ShouldBe(1); - logMessages[0].ShouldContain("Unable to locate any elements in specified project file. Are you sure it is in a correct format?"); + this.logMessages.ShouldNotBeEmpty(); + this.logMessages.Count.ShouldBe(1); + this.logMessages[0].ShouldContain("Unable to locate any elements in specified project file. Are you sure it is in a correct format?"); } [TestCase($""" diff --git a/src/GitVersion.Output.Tests/Output/WixFileTests.cs b/src/GitVersion.Output.Tests/Output/WixFileTests.cs index 3c8a1901de..76ded1fd8c 100644 --- a/src/GitVersion.Output.Tests/Output/WixFileTests.cs +++ b/src/GitVersion.Output.Tests/Output/WixFileTests.cs @@ -1,9 +1,9 @@ using System.IO.Abstractions; using GitVersion.Configuration; -using GitVersion.Core.Tests.Helpers; using GitVersion.Helpers; using GitVersion.Logging; using GitVersion.Output.WixUpdater; +using GitVersion.Tests; using GitVersion.VersionCalculation; namespace GitVersion.Output.Tests; @@ -15,10 +15,10 @@ internal class WixFileTests : TestBase private string workingDir = null!; [OneTimeSetUp] - public void OneTimeSetUp() => workingDir = FileSystemHelper.Path.Combine(FileSystemHelper.Path.GetTempPath(), "WixFileTests"); + public void OneTimeSetUp() => this.workingDir = FileSystemHelper.Path.Combine(FileSystemHelper.Path.GetTempPath(), "WixFileTests"); [OneTimeTearDown] - public void OneTimeTearDown() => FileSystemHelper.Directory.DeleteDirectory(workingDir); + public void OneTimeTearDown() => FileSystemHelper.Directory.DeleteDirectory(this.workingDir); [SetUp] public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute(); @@ -53,9 +53,9 @@ public void UpdateWixVersionFile() using var wixVersionFileUpdater = sp.GetRequiredService(); - wixVersionFileUpdater.Execute(versionVariables, new(workingDir)); + wixVersionFileUpdater.Execute(versionVariables, new(this.workingDir)); - var file = FileSystemHelper.Path.Combine(workingDir, WixVersionFileUpdater.WixVersionFileName); + var file = FileSystemHelper.Path.Combine(this.workingDir, WixVersionFileUpdater.WixVersionFileName); fileSystem .File.ReadAllText(file) .ShouldMatchApproved(c => c.SubFolder(FileSystemHelper.Path.Combine("Approved"))); @@ -95,14 +95,14 @@ public void UpdateWixVersionFileWhenFileAlreadyExists() using var wixVersionFileUpdater = sp.GetRequiredService(); // fake an already existing file - var file = FileSystemHelper.Path.Combine(workingDir, WixVersionFileUpdater.WixVersionFileName); - if (!fileSystem.Directory.Exists(workingDir)) + var file = FileSystemHelper.Path.Combine(this.workingDir, WixVersionFileUpdater.WixVersionFileName); + if (!fileSystem.Directory.Exists(this.workingDir)) { - fileSystem.Directory.CreateDirectory(workingDir); + fileSystem.Directory.CreateDirectory(this.workingDir); } fileSystem.File.WriteAllText(file, new('x', 1024 * 1024)); - wixVersionFileUpdater.Execute(versionVariables, new(workingDir)); + wixVersionFileUpdater.Execute(versionVariables, new(this.workingDir)); fileSystem .File.ReadAllText(file) diff --git a/src/GitVersion.Output/AssemblyInfo/AssemblyInfoFileUpdater.cs b/src/GitVersion.Output/AssemblyInfo/AssemblyInfoFileUpdater.cs index bfb0166d5d..a5fad2179e 100644 --- a/src/GitVersion.Output/AssemblyInfo/AssemblyInfoFileUpdater.cs +++ b/src/GitVersion.Output/AssemblyInfo/AssemblyInfoFileUpdater.cs @@ -1,6 +1,5 @@ using System.IO.Abstractions; using System.Text.RegularExpressions; -using GitVersion.Core; using GitVersion.Extensions; using GitVersion.Helpers; using GitVersion.Logging; diff --git a/src/GitVersion.Output/GitVersionOutputTool.cs b/src/GitVersion.Output/GitVersionOutputTool.cs index c792d00c81..a3c77598a3 100644 --- a/src/GitVersion.Output/GitVersionOutputTool.cs +++ b/src/GitVersion.Output/GitVersionOutputTool.cs @@ -27,22 +27,22 @@ public void OutputVariables(GitVersionVariables variables, bool updateBuildNumbe { using (this.outputGenerator) { - this.outputGenerator.Execute(variables, new OutputContext(gitVersionOptions.OutputFile, updateBuildNumber)); + this.outputGenerator.Execute(variables, new OutputContext(this.gitVersionOptions.OutputFile, updateBuildNumber)); } } public void UpdateAssemblyInfo(GitVersionVariables variables) { - var assemblyInfoContext = new AssemblyInfoContext(gitVersionOptions.WorkingDirectory, gitVersionOptions.AssemblySettingsInfo.EnsureAssemblyInfo, [.. gitVersionOptions.AssemblySettingsInfo.Files]); + var assemblyInfoContext = new AssemblyInfoContext(this.gitVersionOptions.WorkingDirectory, this.gitVersionOptions.AssemblySettingsInfo.EnsureAssemblyInfo, [.. this.gitVersionOptions.AssemblySettingsInfo.Files]); - if (gitVersionOptions.AssemblySettingsInfo.UpdateProjectFiles) + if (this.gitVersionOptions.AssemblySettingsInfo.UpdateProjectFiles) { using (this.projectFileUpdater) { this.projectFileUpdater.Execute(variables, assemblyInfoContext); } } - else if (gitVersionOptions.AssemblySettingsInfo.UpdateAssemblyInfo) + else if (this.gitVersionOptions.AssemblySettingsInfo.UpdateAssemblyInfo) { using (this.assemblyInfoFileUpdater) { @@ -64,7 +64,7 @@ public void GenerateGitVersionInformation(GitVersionVariables variables, FileWri { using (this.gitVersionInfoGenerator) { - this.gitVersionInfoGenerator.Execute(variables, new GitVersionInfoContext(gitVersionOptions.WorkingDirectory, fileWriteInfo.FileName, targetNamespace)); + this.gitVersionInfoGenerator.Execute(variables, new GitVersionInfoContext(this.gitVersionOptions.WorkingDirectory, fileWriteInfo.FileName, targetNamespace)); } } } diff --git a/src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs b/src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs index 805281f62e..297f1617c2 100644 --- a/src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs +++ b/src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs @@ -61,10 +61,10 @@ protected virtual void Dispose(bool disposing) // throw; } - this.SequenceDiagram.End(); + SequenceDiagram.End(); Console.WriteLine("**Visualisation of test:**"); Console.WriteLine(string.Empty); - Console.WriteLine(this.SequenceDiagram.GetDiagram()); + Console.WriteLine(SequenceDiagram.GetDiagram()); } public void Checkout(string branch) => Commands.Checkout(Repository, branch); @@ -86,26 +86,26 @@ public string MakeATaggedCommit(string tag) public void ApplyTag(string tag) { - this.SequenceDiagram.ApplyTag(tag, Repository.Head.FriendlyName); + SequenceDiagram.ApplyTag(tag, Repository.Head.FriendlyName); Repository.ApplyTag(tag); } public void CreateBranch(string branchName, string? @as = null) { - this.SequenceDiagram.BranchTo(branchName, Repository.Head.FriendlyName, @as); + SequenceDiagram.BranchTo(branchName, Repository.Head.FriendlyName, @as); Repository.CreateBranch(branchName); } public void BranchTo(string branchName, string? @as = null) { - this.SequenceDiagram.BranchTo(branchName, Repository.Head.FriendlyName, @as); + SequenceDiagram.BranchTo(branchName, Repository.Head.FriendlyName, @as); var branch = Repository.CreateBranch(branchName); Commands.Checkout(Repository, branch); } public void BranchToFromTag(string branchName, string fromTag, string onBranch, string? @as = null) { - this.SequenceDiagram.BranchToFromTag(branchName, fromTag, onBranch, @as); + SequenceDiagram.BranchToFromTag(branchName, fromTag, onBranch, @as); var branch = Repository.CreateBranch(branchName); Commands.Checkout(Repository, branch); } @@ -113,7 +113,7 @@ public void BranchToFromTag(string branchName, string fromTag, string onBranch, public string MakeACommit() { var to = Repository.Head.FriendlyName; - this.SequenceDiagram.MakeACommit(to); + SequenceDiagram.MakeACommit(to); var commit = Repository.MakeACommit(); return commit.Sha; } @@ -139,7 +139,7 @@ public void MakeACommit(string commitMsg) /// public void MergeNoFF(string mergeSource) { - this.SequenceDiagram.Merge(mergeSource, Repository.Head.FriendlyName); + SequenceDiagram.Merge(mergeSource, Repository.Head.FriendlyName); Repository.MergeNoFF(mergeSource, Generate.SignatureNow()); } diff --git a/src/GitVersion.Testing/Fixtures/SequenceDiagram.cs b/src/GitVersion.Testing/Fixtures/SequenceDiagram.cs index d56e7688e8..4e3fdb44ee 100644 --- a/src/GitVersion.Testing/Fixtures/SequenceDiagram.cs +++ b/src/GitVersion.Testing/Fixtures/SequenceDiagram.cs @@ -15,8 +15,8 @@ public class SequenceDiagram /// public SequenceDiagram() { - this.DiagramBuilder = new StringBuilder(); - this.DiagramBuilder.AppendLine("@startuml"); + DiagramBuilder = new StringBuilder(); + DiagramBuilder.AppendLine("@startuml"); } public StringBuilder DiagramBuilder { get; } @@ -24,17 +24,17 @@ public SequenceDiagram() /// /// Activates a branch/participant in the sequence diagram /// - public void Activate(string branch) => this.DiagramBuilder.AppendLineFormat("activate {0}", GetParticipant(branch)); + public void Activate(string branch) => DiagramBuilder.AppendLineFormat("activate {0}", GetParticipant(branch)); /// /// Deactivates a branch/participant in the sequence diagram /// - public void Deactivate(string branch) => this.DiagramBuilder.AppendLineFormat("deactivate {0}", GetParticipant(branch)); + public void Deactivate(string branch) => DiagramBuilder.AppendLineFormat("deactivate {0}", GetParticipant(branch)); /// /// Destroys a branch/participant in the sequence diagram /// - public void Destroy(string branch) => this.DiagramBuilder.AppendLineFormat("destroy {0}", GetParticipant(branch)); + public void Destroy(string branch) => DiagramBuilder.AppendLineFormat("destroy {0}", GetParticipant(branch)); /// /// Creates a participant in the sequence diagram @@ -44,21 +44,21 @@ public void Participant(string participant, string? @as = null) var cleanParticipant = ParticipantSanitizer.SanitizeParticipant(@as ?? participant); this.participants.Add(participant, cleanParticipant); if (participant == cleanParticipant) - this.DiagramBuilder.AppendLineFormat("participant {0}", participant); + DiagramBuilder.AppendLineFormat("participant {0}", participant); else - this.DiagramBuilder.AppendLineFormat("participant \"{0}\" as {1}", participant, cleanParticipant); + DiagramBuilder.AppendLineFormat("participant \"{0}\" as {1}", participant, cleanParticipant); } /// /// Appends a divider with specified text to the sequence diagram /// - public void Divider(string text) => this.DiagramBuilder.AppendLineFormat("== {0} ==", text); + public void Divider(string text) => DiagramBuilder.AppendLineFormat("== {0} ==", text); /// /// Appends a note over one or many participants to the sequence diagram /// public void NoteOver(string noteText, string startParticipant, string? endParticipant = null, string? prefix = null, string? color = null) => - this.DiagramBuilder.AppendLineFormat( + DiagramBuilder.AppendLineFormat( prefix + """ note over {0}{1}{2} {3} @@ -72,7 +72,7 @@ end note /// /// Appends applying a tag to the specified branch/participant to the sequence diagram /// - public void ApplyTag(string tag, string toBranch) => this.DiagramBuilder.AppendLineFormat("{0} -> {0}: tag {1}", GetParticipant(toBranch), tag); + public void ApplyTag(string tag, string toBranch) => DiagramBuilder.AppendLineFormat("{0} -> {0}: tag {1}", GetParticipant(toBranch), tag); /// /// Appends branching from a branch to another branch, @as can override the participant name @@ -81,11 +81,11 @@ public void BranchTo(string branchName, string currentName, string? @as) { if (!this.participants.ContainsKey(branchName)) { - this.DiagramBuilder.Append("create "); + DiagramBuilder.Append("create "); Participant(branchName, @as); } - this.DiagramBuilder.AppendLineFormat( + DiagramBuilder.AppendLineFormat( "{0} -> {1}: branch from {2}", GetParticipant(currentName), GetParticipant(branchName), currentName); @@ -98,32 +98,32 @@ public void BranchToFromTag(string branchName, string fromTag, string onBranch, { if (!this.participants.ContainsKey(branchName)) { - this.DiagramBuilder.Append("create "); + DiagramBuilder.Append("create "); Participant(branchName, @as); } - this.DiagramBuilder.AppendLineFormat("{0} -> {1}: branch from tag ({2})", GetParticipant(onBranch), GetParticipant(branchName), fromTag); + DiagramBuilder.AppendLineFormat("{0} -> {1}: branch from tag ({2})", GetParticipant(onBranch), GetParticipant(branchName), fromTag); } /// /// Appends a commit on the target participant/branch to the sequence diagram /// - public void MakeACommit(string toParticipant) => this.DiagramBuilder.AppendLineFormat("{0} -> {0}: commit", GetParticipant(toParticipant)); + public void MakeACommit(string toParticipant) => DiagramBuilder.AppendLineFormat("{0} -> {0}: commit", GetParticipant(toParticipant)); /// /// Append a merge to the sequence diagram /// - public void Merge(string from, string to) => this.DiagramBuilder.AppendLineFormat("{0} -> {1}: merge", GetParticipant(from), GetParticipant(to)); + public void Merge(string from, string to) => DiagramBuilder.AppendLineFormat("{0} -> {1}: merge", GetParticipant(from), GetParticipant(to)); public string GetParticipant(string branch) => this.participants.GetValueOrDefault(branch, branch); /// /// Ends the sequence diagram /// - public void End() => this.DiagramBuilder.AppendLine("@enduml"); + public void End() => DiagramBuilder.AppendLine("@enduml"); /// /// returns the plantUML representation of the Sequence Diagram /// - public string GetDiagram() => this.DiagramBuilder.ToString(); + public string GetDiagram() => DiagramBuilder.ToString(); } diff --git a/src/GitVersion.Testing/Helpers/ParticipantSanitizer.cs b/src/GitVersion.Testing/Helpers/ParticipantSanitizer.cs index d22f2f9d73..7708226d49 100644 --- a/src/GitVersion.Testing/Helpers/ParticipantSanitizer.cs +++ b/src/GitVersion.Testing/Helpers/ParticipantSanitizer.cs @@ -1,4 +1,3 @@ -using GitVersion.Core; namespace GitVersion.Testing.Helpers; diff --git a/src/GitVersion.sln.DotSettings b/src/GitVersion.sln.DotSettings index 7f21c9ff09..c6c94efeb5 100644 --- a/src/GitVersion.sln.DotSettings +++ b/src/GitVersion.sln.DotSettings @@ -1,4 +1,4 @@ - + True @@ -196,17 +196,23 @@ <?xml version="1.0" encoding="utf-16"?><Profile name="GitVersion"><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseVar><BehavourStyle>CAN_CHANGE_TO_IMPLICIT</BehavourStyle><LocalVariableStyle>ALWAYS_IMPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_IMPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers><JsInsertSemicolon>True</JsInsertSemicolon><JsReformatCode>True</JsReformatCode><CssReformatCode>True</CssReformatCode><CSArrangeThisQualifier>True</CSArrangeThisQualifier><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><HtmlReformatCode>True</HtmlReformatCode><CSShortenReferences>True</CSShortenReferences><CSharpFormatDocComments>True</CSharpFormatDocComments><CssAlphabetizeProperties>True</CssAlphabetizeProperties><CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><IDEA_SETTINGS>&lt;profile version="1.0"&gt; &lt;option name="myName" value="GitVersion" /&gt; &lt;/profile&gt;</IDEA_SETTINGS><RIDER_SETTINGS>&lt;profile&gt; + &lt;Language id=""&gt; + &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; + &lt;/Language&gt; + &lt;Language id="CMake"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; &lt;Language id="CSS"&gt; - &lt;Rearrange&gt;true&lt;/Rearrange&gt; &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;Rearrange&gt;true&lt;/Rearrange&gt; &lt;/Language&gt; &lt;Language id="EditorConfig"&gt; &lt;Reformat&gt;true&lt;/Reformat&gt; &lt;/Language&gt; &lt;Language id="HTML"&gt; - &lt;Rearrange&gt;true&lt;/Rearrange&gt; - &lt;OptimizeImports&gt;true&lt;/OptimizeImports&gt; &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;OptimizeImports&gt;true&lt;/OptimizeImports&gt; + &lt;Rearrange&gt;true&lt;/Rearrange&gt; &lt;/Language&gt; &lt;Language id="HTTP Request"&gt; &lt;Reformat&gt;true&lt;/Reformat&gt; @@ -224,9 +230,9 @@ &lt;Reformat&gt;true&lt;/Reformat&gt; &lt;/Language&gt; &lt;Language id="JavaScript"&gt; - &lt;Rearrange&gt;true&lt;/Rearrange&gt; - &lt;OptimizeImports&gt;true&lt;/OptimizeImports&gt; &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;OptimizeImports&gt;true&lt;/OptimizeImports&gt; + &lt;Rearrange&gt;true&lt;/Rearrange&gt; &lt;/Language&gt; &lt;Language id="Markdown"&gt; &lt;Reformat&gt;true&lt;/Reformat&gt; @@ -237,18 +243,24 @@ &lt;Language id="RELAX-NG"&gt; &lt;Reformat&gt;true&lt;/Reformat&gt; &lt;/Language&gt; + &lt;Language id="Razor"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; &lt;Language id="SQL"&gt; &lt;Reformat&gt;true&lt;/Reformat&gt; &lt;/Language&gt; + &lt;Language id="VueExpr"&gt; + &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;/Language&gt; &lt;Language id="XML"&gt; - &lt;Rearrange&gt;true&lt;/Rearrange&gt; - &lt;OptimizeImports&gt;true&lt;/OptimizeImports&gt; &lt;Reformat&gt;true&lt;/Reformat&gt; + &lt;OptimizeImports&gt;true&lt;/OptimizeImports&gt; + &lt;Rearrange&gt;true&lt;/Rearrange&gt; &lt;/Language&gt; &lt;Language id="yaml"&gt; &lt;Reformat&gt;true&lt;/Reformat&gt; &lt;/Language&gt; -&lt;/profile&gt;</RIDER_SETTINGS></Profile> +&lt;/profile&gt;</RIDER_SETTINGS><UpgradedBackendToFrontendHtml>True</UpgradedBackendToFrontendHtml><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly></Profile> Default: Reformat Code GitVersion False