Skip to content

Commit c67f471

Browse files
committed
(cleanup) use Config.DefaultTagPrefix
1 parent 2aaebe1 commit c67f471

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

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 = GitVersionConfiguration.DefaultTagPrefix,
1717
string tag = "",
1818
string? nextVersion = null,
1919
string branchPrefixToTrim = "",

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

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

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

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using GitVersion.Configuration;
12
using GitVersion.Core.Tests.Helpers;
23
using GitVersion.Extensions;
34
using GitVersion.Helpers;
@@ -40,7 +41,7 @@ public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(strin
4041
var workingDir = Path.GetTempPath();
4142
var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
4243
var fullPath = PathHelper.Combine(workingDir, assemblyInfoFile);
43-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v?"), new TestEffectiveConfiguration(), false);
44+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", GitVersionConfiguration.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
4445

4546
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
4647
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
@@ -56,7 +57,7 @@ public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo
5657
var workingDir = Path.GetTempPath();
5758
var assemblyInfoFile = PathHelper.Combine("src", "Project", "Properties", $"VersionAssemblyInfo.{fileExtension}");
5859
var fullPath = PathHelper.Combine(workingDir, assemblyInfoFile);
59-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v?"), new TestEffectiveConfiguration(), false);
60+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", GitVersionConfiguration.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
6061

6162
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
6263
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
@@ -75,7 +76,7 @@ public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInf
7576
"AssemblyInfo." + fileExtension,
7677
PathHelper.Combine("src", "Project", "Properties", "VersionAssemblyInfo." + fileExtension)
7778
};
78-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v?"), new TestEffectiveConfiguration(), false);
79+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", GitVersionConfiguration.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
7980

8081
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
8182
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFiles.ToArray()));
@@ -95,7 +96,7 @@ public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo
9596
var workingDir = Path.GetTempPath();
9697
var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
9798
var fullPath = PathHelper.Combine(workingDir, assemblyInfoFile);
98-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v?"), new TestEffectiveConfiguration(), false);
99+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", GitVersionConfiguration.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
99100

100101
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
101102
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
@@ -110,7 +111,7 @@ public void ShouldNotCreateAssemblyInfoFileForUnknownSourceCodeAndEnsureAssembly
110111
var workingDir = Path.GetTempPath();
111112
const string assemblyInfoFile = "VersionAssemblyInfo.js";
112113
var fullPath = PathHelper.Combine(workingDir, assemblyInfoFile);
113-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v?"), new TestEffectiveConfiguration(), false);
114+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", GitVersionConfiguration.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
114115

115116
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
116117
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
@@ -124,7 +125,7 @@ public void ShouldStartSearchFromWorkingDirectory()
124125
this.fileSystem = Substitute.For<IFileSystem>();
125126
var workingDir = Path.GetTempPath();
126127
var assemblyInfoFiles = Array.Empty<string>();
127-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v?"), new TestEffectiveConfiguration(), false);
128+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", GitVersionConfiguration.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
128129

129130
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
130131
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
@@ -1,4 +1,5 @@
11
using System.Xml.Linq;
2+
using GitVersion.Configuration;
23
using GitVersion.Core.Tests.Helpers;
34
using GitVersion.Extensions;
45
using GitVersion.Helpers;
@@ -142,7 +143,7 @@ public void CannotUpdateProjectFileWithoutAPropertyGroup(string xml)
142143
)]
143144
public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string xml)
144145
{
145-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v?"), new TestEffectiveConfiguration(), false);
146+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", GitVersionConfiguration.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
146147
var xmlRoot = XElement.Parse(xml);
147148
variables.AssemblySemVer.ShouldNotBeNull();
148149
ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
@@ -169,7 +170,7 @@ public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string x
169170
)]
170171
public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string xml)
171172
{
172-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v?"), new TestEffectiveConfiguration(), false);
173+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", GitVersionConfiguration.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
173174
var xmlRoot = XElement.Parse(xml);
174175
variables.AssemblySemVer.ShouldNotBeNull();
175176
ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
@@ -199,7 +200,7 @@ public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string
199200
)]
200201
public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLastElement(string xml)
201202
{
202-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v?"), new TestEffectiveConfiguration(), false);
203+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", GitVersionConfiguration.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
203204
var xmlRoot = XElement.Parse(xml);
204205
variables.AssemblySemVer.ShouldNotBeNull();
205206
ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
@@ -230,7 +231,7 @@ public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLas
230231
)]
231232
public void UpdateProjectXmlVersionElementWithMultipleVersionElementsLastOneIsModified(string xml)
232233
{
233-
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v?"), new TestEffectiveConfiguration(), false);
234+
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", GitVersionConfiguration.DefaultTagPrefix), new TestEffectiveConfiguration(), false);
234235
var xmlRoot = XElement.Parse(xml);
235236
variables.AssemblySemVer.ShouldNotBeNull();
236237
ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);

0 commit comments

Comments
 (0)