Skip to content

Commit b3dbbbc

Browse files
arturcicarturcic
committed
(cleanup) use Config.DefaultTagPrefix
1 parent 552710f commit b3dbbbc

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

‎src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ public void ShouldUseDefaultTagPrefixWhenNotSetInConfigFile()
461461
SetupConfigFileContent(text);
462462
var config = this.configProvider.Provide(this.repoPath);
463463

464-
config.TagPrefix.ShouldBe("[vV]");
464+
config.TagPrefix.ShouldBe(Config.DefaultTagPrefix);
465465
}
466466

467467
[Test]
@@ -491,7 +491,7 @@ public void ShouldNotOverrideDefaultTagPrefixWhenNotSetInOverrideConfig()
491491
SetupConfigFileContent(text);
492492
var config = this.configProvider.Provide(this.repoPath, new Config { TagPrefix = null });
493493

494-
config.TagPrefix.ShouldBe("[vV]");
494+
config.TagPrefix.ShouldBe(Config.DefaultTagPrefix);
495495
}
496496

497497
[Test]

‎src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public TestEffectiveConfiguration(
1313
string? assemblyFileVersioningFormat = null,
1414
string? assemblyInformationalFormat = null,
1515
VersioningMode versioningMode = VersioningMode.ContinuousDelivery,
16-
string tagPrefix = "v",
16+
string tagPrefix = Config.DefaultTagPrefix,
1717
string tag = "",
1818
string? nextVersion = null,
1919
string branchPrefixToTrim = "",

‎src/GitVersion.Core.Tests/Model/MergeMessageTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace GitVersion.Core.Tests;
88
[TestFixture]
99
public class MergeMessageTests : TestBase
1010
{
11-
private readonly Config config = new() { TagPrefix = "[vV]" };
11+
private readonly Config config = new() { TagPrefix = Config.DefaultTagPrefix };
1212

1313
[Test]
1414
public void NullMessageStringThrows() =>

‎src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void ValidateVersionParsing(
6464

6565
[TestCase("someText")]
6666
[TestCase("some-T-ext")]
67-
[TestCase("v.1.2.3", "v")]
67+
[TestCase("v.1.2.3", Config.DefaultTagPrefix)]
6868
public void ValidateInvalidVersionParsing(string versionString, string? tagPrefixRegex = null) =>
6969
Assert.IsFalse(SemanticVersion.TryParse(versionString, tagPrefixRegex, out _), "TryParse Result");
7070

‎src/GitVersion.Core.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using GitVersion.Extensions;
33
using GitVersion.Helpers;
44
using GitVersion.Logging;
5+
using GitVersion.Model.Configuration;
56
using GitVersion.OutputVariables;
67
using GitVersion.VersionCalculation;
78
using GitVersion.VersionConverters.AssemblyInfo;
@@ -42,7 +43,7 @@ public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(strin
4243
var workingDir = Path.GetTempPath();
4344
var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
4445
var fullPath = PathHelper.Combine(workingDir, assemblyInfoFile);
45-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
46+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", Config.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
4647

4748
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
4849
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
@@ -60,7 +61,7 @@ public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo
6061
var workingDir = Path.GetTempPath();
6162
var assemblyInfoFile = PathHelper.Combine("src", "Project", "Properties", $"VersionAssemblyInfo.{fileExtension}");
6263
var fullPath = PathHelper.Combine(workingDir, assemblyInfoFile);
63-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
64+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", Config.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
6465

6566
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
6667
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
@@ -81,7 +82,7 @@ public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInf
8182
"AssemblyInfo." + fileExtension,
8283
PathHelper.Combine("src", "Project", "Properties", "VersionAssemblyInfo." + fileExtension)
8384
};
84-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
85+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", Config.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
8586

8687
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
8788
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFiles.ToArray()));
@@ -101,7 +102,7 @@ public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo
101102
var workingDir = Path.GetTempPath();
102103
var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
103104
var fullPath = PathHelper.Combine(workingDir, assemblyInfoFile);
104-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
105+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", Config.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
105106

106107
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
107108
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
@@ -116,7 +117,7 @@ public void ShouldNotCreateAssemblyInfoFileForUnknownSourceCodeAndEnsureAssembly
116117
var workingDir = Path.GetTempPath();
117118
const string assemblyInfoFile = "VersionAssemblyInfo.js";
118119
var fullPath = PathHelper.Combine(workingDir, assemblyInfoFile);
119-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
120+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", Config.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
120121

121122
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
122123
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
@@ -130,7 +131,7 @@ public void ShouldStartSearchFromWorkingDirectory()
130131
this.fileSystem = Substitute.For<IFileSystem>();
131132
var workingDir = Path.GetTempPath();
132133
var assemblyInfoFiles = Array.Empty<string>();
133-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
134+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", Config.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
134135

135136
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
136137
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFiles.ToArray()));

‎src/GitVersion.Core.Tests/VersionConverters/ProjectFileUpdaterTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using GitVersion.Extensions;
44
using GitVersion.Helpers;
55
using GitVersion.Logging;
6+
using GitVersion.Model.Configuration;
67
using GitVersion.OutputVariables;
78
using GitVersion.VersionCalculation;
89
using GitVersion.VersionConverters.AssemblyInfo;
@@ -154,7 +155,7 @@ public void CannotUpdateProjectFileWithoutAPropertyGroup(string xml)
154155
[Description(NoMonoDescription)]
155156
public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string xml)
156157
{
157-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
158+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", Config.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
158159
var xmlRoot = XElement.Parse(xml);
159160
variables.AssemblySemVer.ShouldNotBeNull();
160161
ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
@@ -183,7 +184,7 @@ public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string x
183184
[Description(NoMonoDescription)]
184185
public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string xml)
185186
{
186-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
187+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", Config.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
187188
var xmlRoot = XElement.Parse(xml);
188189
variables.AssemblySemVer.ShouldNotBeNull();
189190
ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
@@ -215,7 +216,7 @@ public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string
215216
[Description(NoMonoDescription)]
216217
public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLastElement(string xml)
217218
{
218-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
219+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", Config.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
219220
var xmlRoot = XElement.Parse(xml);
220221
variables.AssemblySemVer.ShouldNotBeNull();
221222
ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
@@ -248,7 +249,7 @@ public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLas
248249
[Description(NoMonoDescription)]
249250
public void UpdateProjectXmlVersionElementWithMultipleVersionElementsLastOneIsModified(string xml)
250251
{
251-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
252+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", Config.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
252253
var xmlRoot = XElement.Parse(xml);
253254
variables.AssemblySemVer.ShouldNotBeNull();
254255
ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);

0 commit comments

Comments
 (0)