Skip to content

Commit bbcd856

Browse files
committed
wip
1 parent dee012b commit bbcd856

File tree

27 files changed

+41
-38
lines changed

27 files changed

+41
-38
lines changed

.editorconfig

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@ csharp_space_between_method_declaration_name_and_open_parenthesis = false
154154
csharp_space_between_method_declaration_parameter_list_parentheses = false
155155
csharp_space_between_square_brackets = false
156156

157-
csharp_use_roslyn_logic_for_evident_types = true
157+
resharper_csharp_use_roslyn_logic_for_evident_types = true
158158

159159
# Alignment
160-
align_multiline_parameter = true
160+
resharper_csharp_align_multiline_parameter = true
161161

162162
# Qualify fields with "this."
163-
csharp_instance_members_qualify_members = field
163+
resharper_csharp_instance_members_qualify_members = field
164164

165165
# IDE0011: Add braces
166166
dotnet_diagnostic.IDE0011.severity = none
@@ -197,4 +197,8 @@ dotnet_diagnostic.RCS1036.severity = error
197197

198198
xml_space_before_self_closing = true
199199

200-
resharper_arrange_object_creation_when_type_not_evident_highlighting = none
200+
resharper_arrange_object_creation_when_type_not_evident_highlighting = none
201+
202+
resharper_unused_auto_property_accessor_global_highlighting = none
203+
204+
resharper_unused_method_return_value_global_highlighting = none

src/GitVersion.App.Tests/HelpWriterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void AllArgsAreInHelp()
5151
.ShouldBeEmpty();
5252
}
5353

54-
private static bool IsNotInHelp(IReadOnlyDictionary<string, string> lookup, string propertyName, string helpText)
54+
private static bool IsNotInHelp(Dictionary<string, string> lookup, string propertyName, string helpText)
5555
{
5656
if (lookup.TryGetValue(propertyName, out var value))
5757
return !helpText.Contains(value);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace GitVersion.App.Tests;
77

88
public sealed class ProgramFixture
99
{
10-
private readonly IEnvironment environment;
10+
private readonly TestEnvironment environment;
1111
private List<Action<IServiceCollection>> Overrides { get; } = [];
1212
private readonly Lazy<string> logger;
1313
private readonly Lazy<string?> output;
@@ -49,7 +49,7 @@ public void WithEnv(params KeyValuePair<string, string>[] envs)
4949

5050
public Task<ExecutionResults> Run(string arg)
5151
{
52-
var args = arg.Split([' '], StringSplitOptions.RemoveEmptyEntries).ToArray();
52+
var args = arg.Split([' '], StringSplitOptions.RemoveEmptyEntries);
5353
return Run(args);
5454
}
5555

src/GitVersion.App/ArgumentParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,14 +562,14 @@ private static void EnsureArgumentValueCount(IReadOnlyList<string>? values)
562562
}
563563
}
564564

565-
private static NameValueCollection CollectSwitchesAndValuesFromArguments(IList<string> namedArguments, out bool firstArgumentIsSwitch)
565+
private static NameValueCollection CollectSwitchesAndValuesFromArguments(string[] namedArguments, out bool firstArgumentIsSwitch)
566566
{
567567
firstArgumentIsSwitch = true;
568568
var switchesAndValues = new NameValueCollection();
569569
string? currentKey = null;
570570
var argumentRequiresValue = false;
571571

572-
for (var i = 0; i < namedArguments.Count; ++i)
572+
for (var i = 0; i < namedArguments.Length; ++i)
573573
{
574574
var arg = namedArguments[i];
575575

src/GitVersion.BuildAgents/Agents/MyGet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public override string[] SetOutputVariables(string name, string? value)
2828
return [.. messages];
2929
}
3030

31-
public override string? SetBuildNumber(GitVersionVariables variables) =>
31+
public override string SetBuildNumber(GitVersionVariables variables) =>
3232
$"##myget[buildNumber '{ServiceMessageEscapeHelper.EscapeValue(variables.FullSemVer)}']";
3333

3434
public override bool PreventFetch() => false;

src/GitVersion.Configuration/ConfigurationProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private IGitVersionConfiguration ProvideConfiguration(string? configFile,
7373
}
7474
}
7575

76-
private IReadOnlyDictionary<object, object?>? ReadOverrideConfiguration(string? configFilePath)
76+
private Dictionary<object, object?>? ReadOverrideConfiguration(string? configFilePath)
7777
{
7878
if (configFilePath == null)
7979
{

src/GitVersion.Core.Tests/DocumentationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace GitVersion.Core.Tests;
99
[TestFixture]
1010
public class DocumentationTests : TestBase
1111
{
12-
private IFileSystem fileSystem;
12+
private FileSystem fileSystem;
1313
private IDirectoryInfo docsDirectory;
1414

1515
[OneTimeSetUp]

src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ internal static IGitRepository ToGitRepository(this IRepository repository)
165165
return gitRepository;
166166
}
167167

168-
private static IServiceProvider ConfigureServices(Action<IServiceCollection>? servicesOverrides = null)
168+
private static ServiceProvider ConfigureServices(Action<IServiceCollection>? servicesOverrides = null)
169169
{
170170
var services = new ServiceCollection()
171171
.AddModule(new GitVersionCoreTestModule());

src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace GitVersion.Core.Tests;
66
[TestFixture]
77
public class StringFormatWithExtensionTests
88
{
9-
private IEnvironment environment;
9+
private TestEnvironment environment;
1010

1111
[SetUp]
1212
public void Setup() => this.environment = new TestEnvironment();

src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private static IGitRepository CreateRepository()
8484
return mockRepository;
8585
}
8686

87-
private static IServiceProvider ConfigureServices(Action<IServiceCollection>? overrideServices = null)
87+
private static ServiceProvider ConfigureServices(Action<IServiceCollection>? overrideServices = null)
8888
{
8989
var services = new ServiceCollection()
9090
.AddModule(new GitVersionCoreTestModule());

0 commit comments

Comments
 (0)