Skip to content

Commit 3cb12bc

Browse files
committed
fix warnings
1 parent aeb1661 commit 3cb12bc

39 files changed

+68
-91
lines changed

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ dotnet_style_prefer_simplified_interpolation = true:suggestion
6464
dotnet_diagnostic.IDE0067.severity = none
6565
dotnet_diagnostic.IDE0068.severity = none
6666
dotnet_diagnostic.IDE0069.severity = none
67+
dotnet_diagnostic.CA1016.severity = none
6768

6869
#### C# Coding Conventions ####
6970

build/common/Utilities/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class Constants
1818

1919
public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
2020
public static readonly string[] VersionsToBuild = { Version60, Version70 };
21-
public static readonly string[] DistrosToSkipForArtifacts = { Alpine315, Alpine316, Alpine317, Centos7 };
21+
public static readonly string[] DistrosToSkipForArtifacts = { Alpine315, Alpine316, Alpine317, Centos7, Ubuntu2204 };
2222
public static readonly string[] DistrosToSkipForDocker = { Centos7 };
2323

2424
public const string DockerBaseImageName = "gittools/build-images";

src/GitTools.Testing/Fixtures/SequenceDiagram.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void BranchToFromTag(string branchName, string fromTag, string onBranch,
105105
/// </summary>
106106
public void Merge(string from, string to) => this.diagramBuilder.AppendLineFormat("{0} -> {1}: merge", GetParticipant(from), GetParticipant(to));
107107

108-
private string GetParticipant(string branch) => this.participants.ContainsKey(branch) ? this.participants[branch] : branch;
108+
private string GetParticipant(string branch) => participants.TryGetValue(branch, out var value) ? value : branch;
109109

110110
/// <summary>
111111
/// Ends the sequence diagram

src/GitTools.Testing/Internal/DirectoryHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo targ
2323
}
2424
}
2525

26-
private static string Rename(string name) => ToRename.ContainsKey(name) ? ToRename[name] : name;
26+
private static string Rename(string name) => ToRename.TryGetValue(name, out var value) ? value : name;
2727

2828
public static void DeleteSubDirectories(string parentPath)
2929
{

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,7 @@ private static ExecutionResults ExecuteIn(ArgumentBuilder arguments,
5252

5353
foreach (var (key, value) in environments)
5454
{
55-
if (environmentalVariables.ContainsKey(key))
56-
{
57-
environmentalVariables[key] = value;
58-
}
59-
else
60-
{
61-
environmentalVariables.Add(key, value);
62-
}
55+
environmentalVariables[key] = value;
6356
}
6457

6558
var exitCode = -1;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static IBranch CreateMockBranch(string name, params ICommit[] commits)
4444
return branch;
4545
}
4646

47-
public static IBranch? FindBranch(this IGitRepository repository, string branchName) => repository.Branches.FirstOrDefault(x => x.Name.WithoutRemote == branchName);
47+
public static IBranch FindBranch(this IGitRepository repository, string branchName) => repository.Branches.First(x => x.Name.WithoutRemote == branchName) ?? throw new GitVersionException($"Branch {branchName} not found");
4848

4949
public static void DumpGraph(this IGitRepository repository, Action<string>? writer = null, int? maxCommits = null) => GitExtensions.DumpGraph(repository.Path, writer, maxCommits);
5050

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo targ
2424
}
2525
}
2626

27-
private static string Rename(string name) => ToRename.ContainsKey(name) ? ToRename[name] : name;
27+
private static string Rename(string name) => ToRename.TryGetValue(name, out var value) ? value : name;
2828

2929
public static void DeleteSubDirectories(string parentPath)
3030
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public GitVersionContextBuilder WithRepository(IGitRepository gitRepository)
1919
return this;
2020
}
2121

22-
public GitVersionContextBuilder WithConfig(GitVersionConfiguration configuration)
22+
public GitVersionContextBuilder WithConfig(GitVersionConfiguration configurationInfo)
2323
{
24-
this.configuration = configuration;
24+
this.configuration = configurationInfo;
2525
return this;
2626
}
2727

@@ -57,14 +57,14 @@ public void Build()
5757
{
5858
var repo = this.repository ?? CreateRepository();
5959

60-
var configuration = new ConfigurationBuilder()
60+
var configurationInfo = new ConfigurationBuilder()
6161
.Add(this.configuration ?? new GitVersionConfiguration())
6262
.Build();
6363

6464
var options = Options.Create(new GitVersionOptions
6565
{
6666
WorkingDirectory = new EmptyRepositoryFixture().RepositoryPath,
67-
ConfigInfo = { OverrideConfig = configuration }
67+
ConfigInfo = { OverrideConfig = configurationInfo }
6868
});
6969

7070
this.ServicesProvider = ConfigureServices(services =>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ private static void ValidateConfiguration(GitVersionConfiguration configuration)
294294
throw new ConfigurationException($"Branch configuration '{name}' is missing required configuration 'regex'{helpUrl}");
295295
}
296296

297-
var sourceBranches = branchConfiguration?.SourceBranches;
297+
var sourceBranches = branchConfiguration.SourceBranches;
298298
if (sourceBranches == null)
299299
{
300300
throw new ConfigurationException($"Branch configuration '{name}' is missing required configuration 'source-branches'{helpUrl}");

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,7 @@ public Stream OpenRead(string path)
8585
public void CreateDirectory(string path)
8686
{
8787
var fullPath = Path.GetFullPath(path);
88-
if (this.fileSystem.ContainsKey(fullPath))
89-
{
90-
this.fileSystem[fullPath] = Array.Empty<byte>();
91-
}
92-
else
93-
{
94-
this.fileSystem.Add(fullPath, Array.Empty<byte>());
95-
}
88+
this.fileSystem[fullPath] = Array.Empty<byte>();
9689
}
9790

9891
public bool DirectoryExists(string path)

0 commit comments

Comments
 (0)