Skip to content

Commit 60b57af

Browse files
arturcicarturcic
committed
using c#8 using declarations
1 parent cd04239 commit 60b57af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2556
-2947
lines changed

‎src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

Lines changed: 110 additions & 150 deletions
Large diffs are not rendered by default.

‎src/GitVersionCore.Tests/Configuration/IgnoreConfigTests.cs

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@ public void CanDeserialize()
1919
commits-before: 2015-10-23T12:23:15
2020
";
2121

22-
using (var reader = new StringReader(yaml))
23-
{
24-
var config = ConfigSerialiser.Read(reader);
22+
using var reader = new StringReader(yaml);
23+
var config = ConfigSerialiser.Read(reader);
2524

26-
config.Ignore.ShouldNotBeNull();
27-
config.Ignore.SHAs.ShouldNotBeEmpty();
28-
config.Ignore.SHAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98" });
29-
config.Ignore.Before.ShouldBe(DateTimeOffset.Parse("2015-10-23T12:23:15"));
30-
}
25+
config.Ignore.ShouldNotBeNull();
26+
config.Ignore.SHAs.ShouldNotBeEmpty();
27+
config.Ignore.SHAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98" });
28+
config.Ignore.Before.ShouldBe(DateTimeOffset.Parse("2015-10-23T12:23:15"));
3129
}
3230

3331
[Test]
@@ -40,14 +38,12 @@ public void ShouldSupportsOtherSequenceFormat()
4038
- 6c19c7c219ecf8dbc468042baefa73a1b213e8b1
4139
";
4240

43-
using (var reader = new StringReader(yaml))
44-
{
45-
var config = ConfigSerialiser.Read(reader);
41+
using var reader = new StringReader(yaml);
42+
var config = ConfigSerialiser.Read(reader);
4643

47-
config.Ignore.ShouldNotBeNull();
48-
config.Ignore.SHAs.ShouldNotBeEmpty();
49-
config.Ignore.SHAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98", "6c19c7c219ecf8dbc468042baefa73a1b213e8b1" });
50-
}
44+
config.Ignore.ShouldNotBeNull();
45+
config.Ignore.SHAs.ShouldNotBeEmpty();
46+
config.Ignore.SHAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98", "6c19c7c219ecf8dbc468042baefa73a1b213e8b1" });
5147
}
5248

5349
[Test]
@@ -57,14 +53,12 @@ public void WhenNotInConfigShouldHaveDefaults()
5753
next-version: 1.0
5854
";
5955

60-
using (var reader = new StringReader(yaml))
61-
{
62-
var config = ConfigSerialiser.Read(reader);
56+
using var reader = new StringReader(yaml);
57+
var config = ConfigSerialiser.Read(reader);
6358

64-
config.Ignore.ShouldNotBeNull();
65-
config.Ignore.SHAs.ShouldBeEmpty();
66-
config.Ignore.Before.ShouldBeNull();
67-
}
59+
config.Ignore.ShouldNotBeNull();
60+
config.Ignore.SHAs.ShouldBeEmpty();
61+
config.Ignore.Before.ShouldBeNull();
6862
}
6963

7064
[Test]
@@ -75,10 +69,8 @@ public void WhenBadDateFormatShouldFail()
7569
commits-before: bad format date
7670
";
7771

78-
using (var reader = new StringReader(yaml))
79-
{
80-
Should.Throw<YamlException>(() => ConfigSerialiser.Read(reader));
81-
}
72+
using var reader = new StringReader(yaml);
73+
Should.Throw<YamlException>(() => ConfigSerialiser.Read(reader));
8274
}
8375
}
8476
}

‎src/GitVersionCore.Tests/ExecuteCoreTests.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -428,16 +428,14 @@ private void RepositoryScope(ExecuteCore executeCore, Action<EmptyRepositoryFixt
428428
environment.SetEnvironmentVariable(TravisCI.EnvironmentVariableName, null);
429429
environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, null);
430430

431-
using (var fixture = new EmptyRepositoryFixture())
432-
{
433-
fixture.Repository.MakeACommit();
434-
var vv = executeCore.ExecuteGitVersion(null, null, null, null, false, fixture.RepositoryPath, null);
431+
using var fixture = new EmptyRepositoryFixture();
432+
fixture.Repository.MakeACommit();
433+
var vv = executeCore.ExecuteGitVersion(null, null, null, null, false, fixture.RepositoryPath, null);
435434

436-
vv.AssemblySemVer.ShouldBe("0.1.0.0");
437-
vv.FileName.ShouldNotBeNullOrEmpty();
435+
vv.AssemblySemVer.ShouldBe("0.1.0.0");
436+
vv.FileName.ShouldNotBeNullOrEmpty();
438437

439-
fixtureAction?.Invoke(fixture, vv);
440-
}
438+
fixtureAction?.Invoke(fixture, vv);
441439
}
442440
}
443441
}

‎src/GitVersionCore.Tests/GitRepoMetadataProviderTests.cs

Lines changed: 101 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -25,47 +25,45 @@ public void FindsCorrectMergeBaseForForwardMerge()
2525
// | *89840df 56 minutes ago
2626
// |/
2727
//*91bf945 58 minutes ago(master)
28-
using (var fixture = new EmptyRepositoryFixture())
29-
{
30-
fixture.MakeACommit("initial");
31-
fixture.BranchTo("develop");
32-
var expectedReleaseMergeBase = fixture.Repository.Head.Tip;
28+
using var fixture = new EmptyRepositoryFixture();
29+
fixture.MakeACommit("initial");
30+
fixture.BranchTo("develop");
31+
var expectedReleaseMergeBase = fixture.Repository.Head.Tip;
3332

34-
// Create release from develop
35-
fixture.BranchTo("release-2.0.0");
33+
// Create release from develop
34+
fixture.BranchTo("release-2.0.0");
3635

37-
// Make some commits on release
38-
fixture.MakeACommit("release 1");
39-
fixture.MakeACommit("release 2");
40-
var expectedDevelopMergeBase = fixture.Repository.Head.Tip;
36+
// Make some commits on release
37+
fixture.MakeACommit("release 1");
38+
fixture.MakeACommit("release 2");
39+
var expectedDevelopMergeBase = fixture.Repository.Head.Tip;
4140

42-
// First forward merge release to develop
43-
fixture.Checkout("develop");
44-
fixture.MergeNoFF("release-2.0.0");
41+
// First forward merge release to develop
42+
fixture.Checkout("develop");
43+
fixture.MergeNoFF("release-2.0.0");
4544

46-
// Make some new commit on release
47-
fixture.Checkout("release-2.0.0");
48-
fixture.MakeACommit("release 3 - after first merge");
45+
// Make some new commit on release
46+
fixture.Checkout("release-2.0.0");
47+
fixture.MakeACommit("release 3 - after first merge");
4948

50-
// Make new commit on develop
51-
fixture.Checkout("develop");
49+
// Make new commit on develop
50+
fixture.Checkout("develop");
5251

53-
// Checkout to release (no new commits)
54-
fixture.Checkout("release-2.0.0");
52+
// Checkout to release (no new commits)
53+
fixture.Checkout("release-2.0.0");
5554

56-
var develop = fixture.Repository.FindBranch("develop");
57-
var release = fixture.Repository.FindBranch("release-2.0.0");
58-
var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
59-
.FindMergeBase(release, develop);
55+
var develop = fixture.Repository.FindBranch("develop");
56+
var release = fixture.Repository.FindBranch("release-2.0.0");
57+
var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
58+
.FindMergeBase(release, develop);
6059

61-
var developMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
62-
.FindMergeBase(develop, release);
60+
var developMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
61+
.FindMergeBase(develop, release);
6362

64-
fixture.Repository.DumpGraph(Console.WriteLine);
63+
fixture.Repository.DumpGraph(Console.WriteLine);
6564

66-
releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
67-
developMergeBase.ShouldBe(expectedDevelopMergeBase);
68-
}
65+
releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
66+
developMergeBase.ShouldBe(expectedDevelopMergeBase);
6967
}
7068

7169
[Test]
@@ -80,49 +78,47 @@ public void FindsCorrectMergeBaseForForwardMergeMovesOn()
8078
// | *89840df 56 minutes ago
8179
// |/
8280
//*91bf945 58 minutes ago(master)
83-
using (var fixture = new EmptyRepositoryFixture())
84-
{
85-
fixture.MakeACommit("initial");
86-
fixture.BranchTo("develop");
87-
var expectedReleaseMergeBase = fixture.Repository.Head.Tip;
81+
using var fixture = new EmptyRepositoryFixture();
82+
fixture.MakeACommit("initial");
83+
fixture.BranchTo("develop");
84+
var expectedReleaseMergeBase = fixture.Repository.Head.Tip;
8885

89-
// Create release from develop
90-
fixture.BranchTo("release-2.0.0");
86+
// Create release from develop
87+
fixture.BranchTo("release-2.0.0");
9188

92-
// Make some commits on release
93-
fixture.MakeACommit("release 1");
94-
fixture.MakeACommit("release 2");
95-
var expectedDevelopMergeBase = fixture.Repository.Head.Tip;
89+
// Make some commits on release
90+
fixture.MakeACommit("release 1");
91+
fixture.MakeACommit("release 2");
92+
var expectedDevelopMergeBase = fixture.Repository.Head.Tip;
9693

97-
// First forward merge release to develop
98-
fixture.Checkout("develop");
99-
fixture.MergeNoFF("release-2.0.0");
94+
// First forward merge release to develop
95+
fixture.Checkout("develop");
96+
fixture.MergeNoFF("release-2.0.0");
10097

101-
// Make some new commit on release
102-
fixture.Checkout("release-2.0.0");
103-
fixture.MakeACommit("release 3 - after first merge");
98+
// Make some new commit on release
99+
fixture.Checkout("release-2.0.0");
100+
fixture.MakeACommit("release 3 - after first merge");
104101

105-
// Make new commit on develop
106-
fixture.Checkout("develop");
107-
// Checkout to release (no new commits)
108-
fixture.MakeACommit("develop after merge");
102+
// Make new commit on develop
103+
fixture.Checkout("develop");
104+
// Checkout to release (no new commits)
105+
fixture.MakeACommit("develop after merge");
109106

110-
// Checkout to release (no new commits)
111-
fixture.Checkout("release-2.0.0");
107+
// Checkout to release (no new commits)
108+
fixture.Checkout("release-2.0.0");
112109

113-
var develop = fixture.Repository.FindBranch("develop");
114-
var release = fixture.Repository.FindBranch("release-2.0.0");
115-
var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
116-
.FindMergeBase(release, develop);
110+
var develop = fixture.Repository.FindBranch("develop");
111+
var release = fixture.Repository.FindBranch("release-2.0.0");
112+
var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
113+
.FindMergeBase(release, develop);
117114

118-
var developMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
119-
.FindMergeBase(develop, release);
115+
var developMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
116+
.FindMergeBase(develop, release);
120117

121-
fixture.Repository.DumpGraph(Console.WriteLine);
118+
fixture.Repository.DumpGraph(Console.WriteLine);
122119

123-
releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
124-
developMergeBase.ShouldBe(expectedDevelopMergeBase);
125-
}
120+
releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
121+
developMergeBase.ShouldBe(expectedDevelopMergeBase);
126122
}
127123

128124
[Test]
@@ -142,62 +138,60 @@ public void FindsCorrectMergeBaseForMultipleForwardMerges()
142138
//|/
143139
//*f6f1283 58 minutes ago(master)
144140

145-
using (var fixture = new EmptyRepositoryFixture())
146-
{
147-
fixture.MakeACommit("initial");
148-
fixture.BranchTo("develop");
149-
var expectedReleaseMergeBase = fixture.Repository.Head.Tip;
141+
using var fixture = new EmptyRepositoryFixture();
142+
fixture.MakeACommit("initial");
143+
fixture.BranchTo("develop");
144+
var expectedReleaseMergeBase = fixture.Repository.Head.Tip;
150145

151-
// Create release from develop
152-
fixture.BranchTo("release-2.0.0");
146+
// Create release from develop
147+
fixture.BranchTo("release-2.0.0");
153148

154-
// Make some commits on release
155-
fixture.MakeACommit("release 1");
156-
fixture.MakeACommit("release 2");
149+
// Make some commits on release
150+
fixture.MakeACommit("release 1");
151+
fixture.MakeACommit("release 2");
157152

158-
// First forward merge release to develop
159-
fixture.Checkout("develop");
160-
fixture.MergeNoFF("release-2.0.0");
153+
// First forward merge release to develop
154+
fixture.Checkout("develop");
155+
fixture.MergeNoFF("release-2.0.0");
161156

162-
// Make some new commit on release
163-
fixture.Checkout("release-2.0.0");
164-
fixture.Repository.MakeACommit("release 3 - after first merge");
157+
// Make some new commit on release
158+
fixture.Checkout("release-2.0.0");
159+
fixture.Repository.MakeACommit("release 3 - after first merge");
165160

166-
// Make new commit on develop
167-
fixture.Checkout("develop");
168-
// Checkout to release (no new commits)
169-
fixture.Checkout("release-2.0.0");
170-
fixture.Checkout("develop");
171-
fixture.Repository.MakeACommit("develop after merge");
161+
// Make new commit on develop
162+
fixture.Checkout("develop");
163+
// Checkout to release (no new commits)
164+
fixture.Checkout("release-2.0.0");
165+
fixture.Checkout("develop");
166+
fixture.Repository.MakeACommit("develop after merge");
172167

173-
// Checkout to release (no new commits)
174-
fixture.Checkout("release-2.0.0");
168+
// Checkout to release (no new commits)
169+
fixture.Checkout("release-2.0.0");
175170

176-
// Make some new commit on release
177-
fixture.Repository.MakeACommit("release 4");
178-
fixture.Repository.MakeACommit("release 5");
179-
var expectedDevelopMergeBase = fixture.Repository.Head.Tip;
171+
// Make some new commit on release
172+
fixture.Repository.MakeACommit("release 4");
173+
fixture.Repository.MakeACommit("release 5");
174+
var expectedDevelopMergeBase = fixture.Repository.Head.Tip;
180175

181-
// Second merge release to develop
182-
fixture.Checkout("develop");
183-
fixture.MergeNoFF("release-2.0.0");
176+
// Second merge release to develop
177+
fixture.Checkout("develop");
178+
fixture.MergeNoFF("release-2.0.0");
184179

185-
// Checkout to release (no new commits)
186-
fixture.Checkout("release-2.0.0");
180+
// Checkout to release (no new commits)
181+
fixture.Checkout("release-2.0.0");
187182

188-
var develop = fixture.Repository.FindBranch("develop");
189-
var release = fixture.Repository.FindBranch("release-2.0.0");
190-
var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
191-
.FindMergeBase(release, develop);
183+
var develop = fixture.Repository.FindBranch("develop");
184+
var release = fixture.Repository.FindBranch("release-2.0.0");
185+
var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
186+
.FindMergeBase(release, develop);
192187

193-
var developMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
194-
.FindMergeBase(develop, release);
188+
var developMergeBase = new GitRepoMetadataProvider(fixture.Repository, new NullLog(), new Config())
189+
.FindMergeBase(develop, release);
195190

196-
fixture.Repository.DumpGraph(Console.WriteLine);
191+
fixture.Repository.DumpGraph(Console.WriteLine);
197192

198-
releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
199-
developMergeBase.ShouldBe(expectedDevelopMergeBase);
200-
}
193+
releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
194+
developMergeBase.ShouldBe(expectedDevelopMergeBase);
201195
}
202196
}
203197
}

0 commit comments

Comments
 (0)