wip

Author: arturcic

.editorconfig

@@ -154,13 +154,13 @@ csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_square_brackets = false
 
-csharp_use_roslyn_logic_for_evident_types = true
+resharper_csharp_use_roslyn_logic_for_evident_types = true
 
 # Alignment
-align_multiline_parameter = true
+resharper_csharp_align_multiline_parameter = true
 
 # Qualify fields with "this."
-csharp_instance_members_qualify_members = field
+resharper_csharp_instance_members_qualify_members = field
 
 # IDE0011: Add braces
 dotnet_diagnostic.IDE0011.severity = none
@@ -197,4 +197,8 @@ dotnet_diagnostic.RCS1036.severity = error
 
 xml_space_before_self_closing = true
 
-resharper_arrange_object_creation_when_type_not_evident_highlighting = none
+resharper_arrange_object_creation_when_type_not_evident_highlighting = none
+
+resharper_unused_auto_property_accessor_global_highlighting = none
+
+resharper_unused_method_return_value_global_highlighting = none

src/GitVersion.App.Tests/HelpWriterTests.cs

@@ -51,7 +51,7 @@ public void AllArgsAreInHelp()
             .ShouldBeEmpty();
     }
 
-    private static bool IsNotInHelp(IReadOnlyDictionary<string, string> lookup, string propertyName, string helpText)
+    private static bool IsNotInHelp(Dictionary<string, string> lookup, string propertyName, string helpText)
     {
         if (lookup.TryGetValue(propertyName, out var value))
             return !helpText.Contains(value);

src/GitVersion.App.Tests/Helpers/ProgramFixture.cs

@@ -49,7 +49,7 @@ public void WithEnv(params KeyValuePair<string, string>[] envs)
 
     public Task<ExecutionResults> Run(string arg)
     {
-        var args = arg.Split([' '], StringSplitOptions.RemoveEmptyEntries).ToArray();
+        var args = arg.Split([' '], StringSplitOptions.RemoveEmptyEntries);
         return Run(args);
     }
 

src/GitVersion.App/ArgumentParser.cs

@@ -562,14 +562,14 @@ private static void EnsureArgumentValueCount(IReadOnlyList<string>? values)
         }
     }
 
-    private static NameValueCollection CollectSwitchesAndValuesFromArguments(IList<string> namedArguments, out bool firstArgumentIsSwitch)
+    private static NameValueCollection CollectSwitchesAndValuesFromArguments(string[] namedArguments, out bool firstArgumentIsSwitch)
     {
         firstArgumentIsSwitch = true;
         var switchesAndValues = new NameValueCollection();
         string? currentKey = null;
         var argumentRequiresValue = false;
 
-        for (var i = 0; i < namedArguments.Count; ++i)
+        for (var i = 0; i < namedArguments.Length; ++i)
         {
             var arg = namedArguments[i];
 

src/GitVersion.App/QuotedStringHelpers.cs

@@ -52,7 +52,7 @@ public static string[] SplitUnquoted(string? input, char splitChar)
 
         split.Add(input[startIndex..]);
 
-        return split.Where(argument => !argument.IsNullOrEmpty()).ToArray();
+        return [.. split.Where(argument => !argument.IsNullOrEmpty())];
     }
 
     /// <summary>

src/GitVersion.BuildAgents/Agents/MyGet.cs

@@ -28,7 +28,7 @@ public override string[] SetOutputVariables(string name, string? value)
         return [.. messages];
     }
 
-    public override string? SetBuildNumber(GitVersionVariables variables) =>
+    public override string SetBuildNumber(GitVersionVariables variables) =>
         $"##myget[buildNumber '{ServiceMessageEscapeHelper.EscapeValue(variables.FullSemVer)}']";
 
     public override bool PreventFetch() => false;

src/GitVersion.Configuration/Builders/BranchConfigurationBuilder.cs

@@ -89,7 +89,7 @@ public virtual BranchConfigurationBuilder WithRegularExpression(string? value)
 
     public virtual BranchConfigurationBuilder WithSourceBranches(IEnumerable<string> values)
     {
-        WithSourceBranches(values.ToArray());
+        WithSourceBranches([.. values]);
         return this;
     }
 
@@ -101,7 +101,7 @@ public virtual BranchConfigurationBuilder WithSourceBranches(params string[] val
 
     public virtual BranchConfigurationBuilder WithIsSourceBranchFor(IEnumerable<string> values)
     {
-        WithIsSourceBranchFor(values.ToArray());
+        WithIsSourceBranchFor([.. values]);
         return this;
     }
 

src/GitVersion.Configuration/Builders/ConfigurationBuilderBase.cs

@@ -100,232 +100,230 @@ protected ConfigurationBuilderBase()
         }
     }
 
-    public virtual TConfigurationBuilder WithAssemblyVersioningScheme(AssemblyVersioningScheme? value)
+    public TConfigurationBuilder WithAssemblyVersioningScheme(AssemblyVersioningScheme? value)
     {
         this.assemblyVersioningScheme = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithAssemblyFileVersioningScheme(AssemblyFileVersioningScheme? value)
+    public TConfigurationBuilder WithAssemblyFileVersioningScheme(AssemblyFileVersioningScheme? value)
     {
         this.assemblyFileVersioningScheme = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithAssemblyInformationalFormat(string? value)
+    public TConfigurationBuilder WithAssemblyInformationalFormat(string? value)
     {
         this.assemblyInformationalFormat = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithAssemblyVersioningFormat(string? value)
+    public TConfigurationBuilder WithAssemblyVersioningFormat(string? value)
     {
         this.assemblyVersioningFormat = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithAssemblyFileVersioningFormat(string? value)
+    public TConfigurationBuilder WithAssemblyFileVersioningFormat(string? value)
     {
         this.assemblyFileVersioningFormat = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithTagPrefixPattern(string? value)
+    public TConfigurationBuilder WithTagPrefixPattern(string? value)
     {
         this.tagPrefix = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithVersionInBranchPattern(string? value)
+    public TConfigurationBuilder WithVersionInBranchPattern(string? value)
     {
         this.versionInBranchPattern = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithNextVersion(string? value)
+    public TConfigurationBuilder WithNextVersion(string? value)
     {
         this.nextVersion = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithMajorVersionBumpMessage(string? value)
+    public TConfigurationBuilder WithMajorVersionBumpMessage(string? value)
     {
         this.majorVersionBumpMessage = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithMinorVersionBumpMessage(string? value)
+    public TConfigurationBuilder WithMinorVersionBumpMessage(string? value)
     {
         this.minorVersionBumpMessage = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithPatchVersionBumpMessage(string? value)
+    public TConfigurationBuilder WithPatchVersionBumpMessage(string? value)
     {
         this.patchVersionBumpMessage = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithNoBumpMessage(string? value)
+    public TConfigurationBuilder WithNoBumpMessage(string? value)
     {
         this.noBumpMessage = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithTagPreReleaseWeight(int? value)
+    public TConfigurationBuilder WithTagPreReleaseWeight(int? value)
     {
         this.tagPreReleaseWeight = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithIgnoreConfiguration(IIgnoreConfiguration value)
+    public TConfigurationBuilder WithIgnoreConfiguration(IIgnoreConfiguration value)
     {
         this.ignore = (IgnoreConfiguration)value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithCommitDateFormat(string? value)
+    public TConfigurationBuilder WithCommitDateFormat(string? value)
     {
         this.commitDateFormat = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithUpdateBuildNumber(bool value)
+    public TConfigurationBuilder WithUpdateBuildNumber(bool value)
     {
         this.updateBuildNumber = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithSemanticVersionFormat(SemanticVersionFormat value)
+    public TConfigurationBuilder WithSemanticVersionFormat(SemanticVersionFormat value)
     {
         this.semanticVersionFormat = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithVersionStrategy(VersionStrategies value)
+    public TConfigurationBuilder WithVersionStrategy(VersionStrategies value)
     {
-        this.versionStrategies = Enum.GetValues<VersionStrategies>()
-            .Where(element => element != VersionStrategies.None && value.HasFlag(element))
-            .ToArray();
+        this.versionStrategies = [.. Enum.GetValues<VersionStrategies>().Where(element => element != VersionStrategies.None && value.HasFlag(element))];
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithVersionStrategies(params VersionStrategies[] values)
+    public TConfigurationBuilder WithVersionStrategies(params VersionStrategies[] values)
     {
         this.versionStrategies = values;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithMergeMessageFormats(IReadOnlyDictionary<string, string> value)
+    public TConfigurationBuilder WithMergeMessageFormats(IReadOnlyDictionary<string, string> value)
     {
         this.mergeMessageFormats = new(value);
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithoutBranches()
+    public TConfigurationBuilder WithoutBranches()
     {
         this.branchConfigurationBuilders.Clear();
         return (TConfigurationBuilder)this;
     }
 
-    public virtual BranchConfigurationBuilder WithBranch(string value)
+    public BranchConfigurationBuilder WithBranch(string value)
         => this.branchConfigurationBuilders.GetOrAdd(value, () => BranchConfigurationBuilder.New);
 
-    public virtual BranchConfigurationBuilder WithBranch(string value, BranchConfigurationBuilder builder)
+    public BranchConfigurationBuilder WithBranch(string value, BranchConfigurationBuilder builder)
         => this.branchConfigurationBuilders.GetOrAdd(value, () => builder);
 
-    public virtual TConfigurationBuilder WithBranch(string value, Action<BranchConfigurationBuilder> action)
+    public TConfigurationBuilder WithBranch(string value, Action<BranchConfigurationBuilder> action)
     {
         var result = this.branchConfigurationBuilders.GetOrAdd(value, () => BranchConfigurationBuilder.New);
         action(result);
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithDeploymentMode(DeploymentMode? value)
+    public TConfigurationBuilder WithDeploymentMode(DeploymentMode? value)
     {
         this.versioningMode = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithLabel(string? value)
+    public TConfigurationBuilder WithLabel(string? value)
     {
         this.label = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithIncrement(IncrementStrategy value)
+    public TConfigurationBuilder WithIncrement(IncrementStrategy value)
     {
         this.increment = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithPreventIncrementOfMergedBranch(bool? value)
+    public TConfigurationBuilder WithPreventIncrementOfMergedBranch(bool? value)
     {
         this.preventIncrementOfMergedBranch = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithPreventIncrementWhenBranchMerged(bool? value)
+    public TConfigurationBuilder WithPreventIncrementWhenBranchMerged(bool? value)
     {
         this.preventIncrementWhenBranchMerged = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithPreventIncrementWhenCurrentCommitTagged(bool? value)
+    public TConfigurationBuilder WithPreventIncrementWhenCurrentCommitTagged(bool? value)
     {
         this.preventIncrementWhenCurrentCommitTagged = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithTrackMergeTarget(bool? value)
+    public TConfigurationBuilder WithTrackMergeTarget(bool? value)
     {
         this.trackMergeTarget = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithTrackMergeMessage(bool? value)
+    public TConfigurationBuilder WithTrackMergeMessage(bool? value)
     {
         this.trackMergeMessage = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithCommitMessageIncrementing(CommitMessageIncrementMode? value)
+    public TConfigurationBuilder WithCommitMessageIncrementing(CommitMessageIncrementMode? value)
     {
         this.commitMessageIncrementing = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithRegularExpression(string? value)
+    public TConfigurationBuilder WithRegularExpression(string? value)
     {
         this.regularExpression = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithTracksReleaseBranches(bool? value)
+    public TConfigurationBuilder WithTracksReleaseBranches(bool? value)
     {
         this.tracksReleaseBranches = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithIsReleaseBranch(bool? value)
+    public TConfigurationBuilder WithIsReleaseBranch(bool? value)
     {
         this.isReleaseBranch = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithIsMainBranch(bool? value)
+    public TConfigurationBuilder WithIsMainBranch(bool? value)
     {
         this.isMainBranch = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithPreReleaseWeight(int? value)
+    public TConfigurationBuilder WithPreReleaseWeight(int? value)
     {
         this.preReleaseWeight = value;
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithConfiguration(IGitVersionConfiguration value)
+    public TConfigurationBuilder WithConfiguration(IGitVersionConfiguration value)
     {
         WithAssemblyVersioningScheme(value.AssemblyVersioningScheme);
         WithAssemblyFileVersioningScheme(value.AssemblyFileVersioningScheme);

src/GitVersion.Configuration/ConfigurationProvider.cs

@@ -73,7 +73,7 @@ private IGitVersionConfiguration ProvideConfiguration(string? configFile,
         }
     }
 
-    private IReadOnlyDictionary<object, object?>? ReadOverrideConfiguration(string? configFilePath)
+    private Dictionary<object, object?>? ReadOverrideConfiguration(string? configFilePath)
     {
         if (configFilePath == null)
         {