Skip to content

Commit 81a4d09

Browse files
committed
cleanup
1 parent 6d2ff62 commit 81a4d09

6 files changed

+7
-15
lines changed

src/Directory.Build.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
4-
53
<Authors>GitTools and Contributors</Authors>
64
<Copyright>Copyright GitTools 2021.</Copyright>
75
<Company>$(Authors)</Company>
@@ -35,7 +33,6 @@
3533
<PackageVersion_NSubstitute>4.2.2</PackageVersion_NSubstitute>
3634
<PackageVersion_CoverletMsBuild>3.0.2</PackageVersion_CoverletMsBuild>
3735
<PackageVersion_NUnit>3.13.1</PackageVersion_NUnit>
38-
<PackageVersion_GitToolsTesting>1.2.0</PackageVersion_GitToolsTesting>
3936
<PackageVersion_NUnit3TestAdapter>3.17.0</PackageVersion_NUnit3TestAdapter>
4037
<PackageVersion_NunitXmlTestLogger>3.0.91</PackageVersion_NunitXmlTestLogger>
4138
<PackageVersion_Shouldly>4.0.3</PackageVersion_Shouldly>

src/GitVersion.Core/Configuration/ConfigFileLocatorFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public ConfigFileLocatorFactory(IFileSystem fileSystem, IOptions<GitVersionOptio
1717
public IConfigFileLocator Create()
1818
{
1919
return string.IsNullOrWhiteSpace(options.Value.ConfigInfo.ConfigFile)
20-
? new DefaultConfigFileLocator(fileSystem) as IConfigFileLocator
20+
? new DefaultConfigFileLocator(fileSystem)
2121
: new NamedConfigFileLocator(fileSystem, options);
2222
}
2323
}

src/GitVersion.Core/Model/VersionVariables.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Buffers;
32
using System.Collections;
43
using System.Collections.Generic;
54
using System.IO;

src/GitVersion.Core/Model/VersionVariablesJsonNumberConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Buffers;
33
using System.Buffers.Text;
4-
using System.Linq;
54
using System.Text.Json;
65
using System.Text.Json.Serialization;
76
using JetBrains.Annotations;

src/GitVersion.Core/Model/VersionVariablesJsonStringConverter.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Buffers;
33
using System.Buffers.Text;
4-
using System.Linq;
54
using System.Text.Json;
65
using System.Text.Json.Serialization;
76
using JetBrains.Annotations;
@@ -37,7 +36,5 @@ public override void Write(Utf8JsonWriter writer, [CanBeNull] string value, Json
3736
}
3837

3938
public override bool HandleNull => true;
40-
41-
private static bool NotAPaddedNumber(string value) => value != null && (value == "0" || !value.StartsWith("0"));
4239
}
4340
}

src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ public static class IncrementStrategyFinder
2121
public const string DefaultPatchPattern = @"\+semver:\s?(fix|patch)";
2222
public const string DefaultNoBumpPattern = @"\+semver:\s?(none|skip)";
2323

24-
private static readonly ConcurrentDictionary<string, Regex> CompiledRegexCache = new ConcurrentDictionary<string, Regex>();
24+
private static readonly ConcurrentDictionary<string, Regex> CompiledRegexCache = new();
2525

26-
private static readonly Regex DefaultMajorPatternRegex = new Regex(DefaultMajorPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
27-
private static readonly Regex DefaultMinorPatternRegex = new Regex(DefaultMinorPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
28-
private static readonly Regex DefaultPatchPatternRegex = new Regex(DefaultPatchPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
29-
private static readonly Regex DefaultNoBumpPatternRegex = new Regex(DefaultNoBumpPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
26+
private static readonly Regex DefaultMajorPatternRegex = new(DefaultMajorPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
27+
private static readonly Regex DefaultMinorPatternRegex = new(DefaultMinorPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
28+
private static readonly Regex DefaultPatchPatternRegex = new(DefaultPatchPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
29+
private static readonly Regex DefaultNoBumpPatternRegex = new(DefaultNoBumpPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
3030

3131
public static VersionField? DetermineIncrementedField(IGitRepository repository, GitVersionContext context, BaseVersion baseVersion)
3232
{
@@ -36,7 +36,7 @@ public static class IncrementStrategyFinder
3636
// use the default branch config increment strategy if there are no commit message overrides
3737
if (commitMessageIncrement == null)
3838
{
39-
return baseVersion.ShouldIncrement ? defaultIncrement : (VersionField?)null;
39+
return baseVersion.ShouldIncrement ? defaultIncrement : null;
4040
}
4141

4242
// cap the commit message severity to minor for alpha versions

0 commit comments

Comments
 (0)