Skip to content

Commit 72c5acf

Browse files
arturcicarturcic
committed
use primary constructors - GitVersion.Output
1 parent c410e0a commit 72c5acf

19 files changed

+133
-216
lines changed

‎src/GitVersion.Output.Tests/Output/AssemblyFileVersionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme asse
1616
{
1717
var semVer = new SemanticVersion(major, minor, patch)
1818
{
19-
PreReleaseTag = new SemanticVersionPreReleaseTag("Test", tag, true)
19+
PreReleaseTag = new("Test", tag, true)
2020
};
2121

2222
var assemblyFileVersion = semVer.GetAssemblyFileVersion(assemblyFileVersioningScheme);

‎src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(strin
4141
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", ConfigurationConstants.DefaultTagPrefix), new TestEffectiveConfiguration(), null);
4242

4343
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
44-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
44+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, true, assemblyInfoFile));
4545

4646
this.fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(PathHelper.Combine("Approved", fileExtension)));
4747
}
@@ -59,7 +59,7 @@ public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo
5959
);
6060

6161
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
62-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
62+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, true, assemblyInfoFile));
6363

6464
this.fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(PathHelper.Combine("Approved", fileExtension)));
6565
}
@@ -78,7 +78,7 @@ public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInf
7878
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", ConfigurationConstants.DefaultTagPrefix), new TestEffectiveConfiguration(), null);
7979

8080
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
81-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, [.. assemblyInfoFiles]));
81+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, true, [.. assemblyInfoFiles]));
8282

8383
foreach (var item in assemblyInfoFiles)
8484
{
@@ -100,7 +100,7 @@ public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo
100100
);
101101

102102
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
103-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
103+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
104104

105105
this.fileSystem.Exists(fullPath).ShouldBeFalse();
106106
}
@@ -117,7 +117,7 @@ public void ShouldNotCreateAssemblyInfoFileForUnknownSourceCodeAndEnsureAssembly
117117
);
118118

119119
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
120-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
120+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, true, assemblyInfoFile));
121121

122122
this.fileSystem.Received(0).WriteAllText(fullPath, Arg.Any<string>());
123123
}
@@ -133,7 +133,7 @@ public void ShouldStartSearchFromWorkingDirectory()
133133
);
134134

135135
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
136-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, [.. assemblyInfoFiles]));
136+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, [.. assemblyInfoFiles]));
137137

138138
this.fileSystem.Received().DirectoryEnumerateFiles(Arg.Is(workingDir), Arg.Any<string>(), Arg.Any<SearchOption>());
139139
}
@@ -150,7 +150,7 @@ public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFi
150150
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
151151
{
152152
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
153-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
153+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
154154

155155
fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
156156
s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
@@ -171,7 +171,7 @@ public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileEx
171171
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, (fs, variables) =>
172172
{
173173
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
174-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
174+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
175175

176176
assemblyFileContent = fs.ReadAllText(fileName);
177177
assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(PathHelper.Combine("Approved", fileExtension)));
@@ -190,7 +190,7 @@ public void ShouldReplaceAssemblyVersionInRelativePath(string fileExtension, str
190190
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
191191
{
192192
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
193-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
193+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
194194

195195
fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
196196
s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
@@ -211,7 +211,7 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithWhiteSpace(string file
211211
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
212212
{
213213
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
214-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
214+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
215215

216216
fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
217217
s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
@@ -232,7 +232,7 @@ public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string as
232232
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
233233
{
234234
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
235-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
235+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
236236

237237
fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
238238
s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
@@ -253,7 +253,7 @@ public void ShouldReplaceAssemblyVersionWithAttributeSuffix(string fileExtension
253253
VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
254254
{
255255
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
256-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
256+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
257257

258258
fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
259259
!s.Contains(@"AssemblyVersionAttribute(""1.0.0.0"")") &&
@@ -277,7 +277,7 @@ public void ShouldAddAssemblyVersionIfMissingFromInfoFile(string fileExtension)
277277
VerifyAssemblyInfoFile("", fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
278278
{
279279
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
280-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
280+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
281281

282282
fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
283283
s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
@@ -298,7 +298,7 @@ public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string a
298298
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
299299
{
300300
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
301-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
301+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
302302

303303
fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
304304
s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
@@ -319,7 +319,7 @@ public void ShouldReplaceAssemblyVersionWhenCreatingAssemblyVersionFileAndEnsure
319319
VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
320320
{
321321
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
322-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
322+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
323323

324324
fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
325325
s.Contains(@"AssemblyVersion(""2.3.1.0"")") &&
@@ -340,7 +340,7 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariables(string fileE
340340
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
341341
{
342342
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
343-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
343+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
344344

345345
fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
346346
s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
@@ -361,7 +361,7 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariablesAndWhiteSpace
361361
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
362362
{
363363
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
364-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
364+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
365365

366366
fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
367367
s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
@@ -382,7 +382,7 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile
382382
VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
383383
{
384384
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
385-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
385+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
386386

387387
assemblyFileContent = fs.ReadAllText(fileName);
388388
assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(PathHelper.Combine("Approved", fileExtension)));
@@ -401,7 +401,7 @@ public void Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttri
401401
VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
402402
{
403403
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
404-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
404+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
405405

406406
assemblyFileContent = fs.ReadAllText(fileName);
407407
assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(PathHelper.Combine("Approved", fileExtension)));
@@ -420,7 +420,7 @@ public void ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone(stri
420420
VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, (fs, variables) =>
421421
{
422422
using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
423-
assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
423+
assemblyInfoFileUpdater.Execute(variables, new(workingDir, false, assemblyInfoFile));
424424

425425
assemblyFileContent = fs.ReadAllText(fileName);
426426
assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(PathHelper.Combine("Approved", fileExtension)));
@@ -436,7 +436,7 @@ private void VerifyAssemblyInfoFile(
436436
this.fileSystem = Substitute.For<IFileSystem>();
437437
var version = new SemanticVersion
438438
{
439-
BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
439+
BuildMetaData = new("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
440440
Major = 2,
441441
Minor = 3,
442442
Patch = 1

‎src/GitVersion.Output.Tests/Output/FormatArgumentTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void ShouldOutputFormatTests(string format, string expectedValue)
4040
var versionVariables = sp.GetRequiredService<IGitVersionCalculateTool>().CalculateVersionVariables();
4141
var outputGenerator = sp.GetRequiredService<IOutputGenerator>();
4242

43-
outputGenerator.Execute(versionVariables, new OutputContext());
43+
outputGenerator.Execute(versionVariables, new());
4444
var output = consoleBuilder.ToString().Replace("\n", "").Replace("\r", "");
4545
output.ShouldBeEquivalentTo(expectedValue);
4646
}
@@ -75,7 +75,7 @@ public void ShouldOutputFormatWithEnvironmentVariablesTests(string format, strin
7575
var versionVariables = sp.GetRequiredService<IGitVersionCalculateTool>().CalculateVersionVariables();
7676
var outputGenerator = sp.GetRequiredService<IOutputGenerator>();
7777

78-
outputGenerator.Execute(versionVariables, new OutputContext());
78+
outputGenerator.Execute(versionVariables, new());
7979
var output = consoleBuilder.ToString().Replace("\n", "").Replace("\r", "");
8080
output.ShouldBeEquivalentTo(expectedValue);
8181
}

‎src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void ShouldCreateFile(string fileExtension)
2828
Minor = 2,
2929
Patch = 3,
3030
PreReleaseTag = "unstable4",
31-
BuildMetaData = new SemanticVersionBuildMetaData("versionSourceSha", 5,
31+
BuildMetaData = new("versionSourceSha", 5,
3232
"feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), 0)
3333
};
3434

@@ -40,7 +40,7 @@ public void ShouldCreateFile(string fileExtension)
4040
var variables = variableProvider.GetVariablesFor(semanticVersion, new TestEffectiveConfiguration(), null);
4141
using var generator = sp.GetRequiredService<IGitVersionInfoGenerator>();
4242

43-
generator.Execute(variables, new GitVersionInfoContext(directory, fileName, fileExtension));
43+
generator.Execute(variables, new(directory, fileName, fileExtension));
4444

4545
fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(PathHelper.Combine("Approved", fileExtension)));
4646
}

‎src/GitVersion.Output.Tests/Output/InformationalVersionBuilderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void ValidateInformationalVersionBuilder(string branchName, string sha, s
2727
Minor = minor,
2828
Patch = patch,
2929
PreReleaseTag = tag,
30-
BuildMetaData = new SemanticVersionBuildMetaData(versionSourceSha, commitsSinceTag, branchName, sha, shortSha, DateTimeOffset.MinValue, 0)
30+
BuildMetaData = new(versionSourceSha, commitsSinceTag, branchName, sha, shortSha, DateTimeOffset.MinValue, 0)
3131
};
3232
var informationalVersion = semanticVersion.ToString("i");
3333

‎src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void Setup()
2727
ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
2828
var sp = ConfigureServices();
2929

30-
this.logMessages = new List<string>();
30+
this.logMessages = [];
3131
this.log = new Log(new TestLogAppender(this.logMessages.Add));
3232

3333
this.fileSystem = sp.GetRequiredService<IFileSystem>();
@@ -264,7 +264,7 @@ public void UpdateProjectFileAddsVersionToFile(string xml)
264264
VerifyAssemblyInfoFile(xml, fileName, AssemblyVersioningScheme.MajorMinorPatch, (fs, variables) =>
265265
{
266266
using var projFileUpdater = new ProjectFileUpdater(this.log, fs);
267-
projFileUpdater.Execute(variables, new AssemblyInfoContext(Path.GetTempPath(), false, fileName));
267+
projFileUpdater.Execute(variables, new(Path.GetTempPath(), false, fileName));
268268

269269
const string expectedXml = @"
270270
<Project Sdk=""Microsoft.NET.Sdk"">
@@ -291,7 +291,7 @@ private void VerifyAssemblyInfoFile(
291291
this.fileSystem = Substitute.For<IFileSystem>();
292292
var version = new SemanticVersion
293293
{
294-
BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
294+
BuildMetaData = new("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
295295
Major = 2,
296296
Minor = 3,
297297
Patch = 1

‎src/GitVersion.Output.Tests/Output/WixFileTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void UpdateWixVersionFile()
2323
Major = 1,
2424
Minor = 2,
2525
Patch = 3,
26-
BuildMetaData = new SemanticVersionBuildMetaData("5.Branch.develop")
26+
BuildMetaData = new("5.Branch.develop")
2727
{
2828
VersionSourceSha = "versionSourceSha",
2929
Sha = "commitSha",
@@ -48,7 +48,7 @@ public void UpdateWixVersionFile()
4848

4949
using var wixVersionFileUpdater = sp.GetRequiredService<IWixVersionFileUpdater>();
5050

51-
wixVersionFileUpdater.Execute(versionVariables, new WixVersionContext(workingDir));
51+
wixVersionFileUpdater.Execute(versionVariables, new(workingDir));
5252

5353
var file = PathHelper.Combine(workingDir, WixVersionFileUpdater.WixVersionFileName);
5454
fileSystem
@@ -65,7 +65,7 @@ public void UpdateWixVersionFileWhenFileAlreadyExists()
6565
Major = 1,
6666
Minor = 2,
6767
Patch = 3,
68-
BuildMetaData = new SemanticVersionBuildMetaData("5.Branch.develop")
68+
BuildMetaData = new("5.Branch.develop")
6969
{
7070
VersionSourceSha = "versionSourceSha",
7171
Sha = "commitSha",
@@ -92,9 +92,9 @@ public void UpdateWixVersionFileWhenFileAlreadyExists()
9292

9393
// fake an already existing file
9494
var file = PathHelper.Combine(workingDir, WixVersionFileUpdater.WixVersionFileName);
95-
fileSystem.WriteAllText(file, new string('x', 1024 * 1024));
95+
fileSystem.WriteAllText(file, new('x', 1024 * 1024));
9696

97-
wixVersionFileUpdater.Execute(versionVariables, new WixVersionContext(workingDir));
97+
wixVersionFileUpdater.Execute(versionVariables, new(workingDir));
9898

9999
fileSystem
100100
.ReadAllText(file)

0 commit comments

Comments
 (0)