Skip to content

Commit ff34946

Browse files
committed
cleanup
1 parent fcae4f4 commit ff34946

File tree

110 files changed

+261
-263
lines changed

Some content is hidden

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

110 files changed

+261
-263
lines changed

src/GitVersionCore.Tests/AssemblyFileVersionTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using NUnit.Framework;
2-
using Shouldly;
3-
using GitVersion.Extensions;
41
using GitVersion;
2+
using GitVersion.Extensions;
53
using GitVersionCore.Tests.Helpers;
4+
using NUnit.Framework;
5+
using Shouldly;
66

77
namespace GitVersionCore.Tests
88
{

src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4-
using NSubstitute;
5-
using NUnit.Framework;
6-
using Shouldly;
7-
using GitVersion.OutputVariables;
4+
using GitVersion;
85
using GitVersion.Extensions;
96
using GitVersion.Extensions.VersionAssemblyInfoResources;
10-
using GitVersion;
117
using GitVersion.Logging;
8+
using GitVersion.OutputVariables;
129
using GitVersionCore.Tests.Helpers;
1310
using Microsoft.Extensions.DependencyInjection;
11+
using NSubstitute;
12+
using NUnit.Framework;
13+
using Shouldly;
1414

1515
namespace GitVersionCore.Tests
1616
{

src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using NUnit.Framework;
2-
using Shouldly;
3-
using GitVersion.BuildServers;
41
using GitVersion;
2+
using GitVersion.BuildServers;
53
using GitVersionCore.Tests.Helpers;
64
using Microsoft.Extensions.DependencyInjection;
5+
using NUnit.Framework;
6+
using Shouldly;
77

88
namespace GitVersionCore.Tests.BuildServers
99
{

src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
22
using System.Collections.Generic;
3-
using NUnit.Framework;
4-
using Shouldly;
5-
using GitVersion.OutputVariables;
63
using GitVersion;
74
using GitVersion.Logging;
5+
using GitVersion.OutputVariables;
86
using GitVersionCore.Tests.Helpers;
97
using Microsoft.Extensions.DependencyInjection;
8+
using NUnit.Framework;
9+
using Shouldly;
1010

1111
namespace GitVersionCore.Tests.BuildServers
1212
{

src/GitVersionCore.Tests/BuildServers/CodeBuildTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Reflection;
5-
using NUnit.Framework;
6-
using Shouldly;
7-
using GitVersion.BuildServers;
85
using GitVersion;
6+
using GitVersion.BuildServers;
97
using GitVersion.OutputVariables;
108
using GitVersionCore.Tests.Helpers;
119
using Microsoft.Extensions.DependencyInjection;
10+
using NUnit.Framework;
11+
using Shouldly;
1212

1313
namespace GitVersionCore.Tests.BuildServers
1414
{

src/GitVersionCore.Tests/BuildServers/ContinuaCiTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
2-
using NUnit.Framework;
32
using GitVersion.BuildServers;
43
using GitVersionCore.Tests.Helpers;
54
using Microsoft.Extensions.DependencyInjection;
5+
using NUnit.Framework;
66

77
namespace GitVersionCore.Tests.BuildServers
88
{

src/GitVersionCore.Tests/BuildServers/DroneTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
2-
using GitVersion.BuildServers;
32
using GitVersion;
3+
using GitVersion.BuildServers;
44
using GitVersionCore.Tests.Helpers;
55
using Microsoft.Extensions.DependencyInjection;
66
using NUnit.Framework;

src/GitVersionCore.Tests/BuildServers/EnvRunTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System.IO;
2-
using NUnit.Framework;
3-
using Shouldly;
4-
using GitVersion.BuildServers;
52
using GitVersion;
3+
using GitVersion.BuildServers;
64
using GitVersionCore.Tests.Helpers;
75
using Microsoft.Extensions.DependencyInjection;
6+
using NUnit.Framework;
7+
using Shouldly;
88

99
namespace GitVersionCore.Tests.BuildServers
1010
{

src/GitVersionCore.Tests/BuildServers/GitHubActionsTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
using System.Collections.Generic;
12
using GitVersion;
23
using GitVersion.BuildServers;
3-
using NUnit.Framework;
4-
using Shouldly;
5-
using System.Collections.Generic;
64
using GitVersionCore.Tests.Helpers;
75
using Microsoft.Extensions.DependencyInjection;
6+
using NUnit.Framework;
7+
using Shouldly;
88
using Environment = System.Environment;
99

1010
namespace GitVersionCore.Tests.BuildServers

src/GitVersionCore.Tests/BuildServers/GitLabCiTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Reflection;
5-
using NUnit.Framework;
6-
using Shouldly;
7-
using GitVersion.BuildServers;
85
using GitVersion;
6+
using GitVersion.BuildServers;
97
using GitVersion.OutputVariables;
108
using GitVersionCore.Tests.Helpers;
119
using Microsoft.Extensions.DependencyInjection;
10+
using NUnit.Framework;
11+
using Shouldly;
1212

1313
namespace GitVersionCore.Tests.BuildServers
1414
{

src/GitVersionCore.Tests/BuildServers/JenkinsTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Reflection;
5-
using NUnit.Framework;
6-
using Shouldly;
7-
using GitVersion.BuildServers;
85
using GitVersion;
6+
using GitVersion.BuildServers;
97
using GitVersion.OutputVariables;
108
using GitVersionCore.Tests.Helpers;
119
using Microsoft.Extensions.DependencyInjection;
10+
using NUnit.Framework;
11+
using Shouldly;
1212

1313
namespace GitVersionCore.Tests.BuildServers
1414
{

src/GitVersionCore.Tests/BuildServers/MyGetTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using NUnit.Framework;
21
using GitVersion.BuildServers;
32
using GitVersionCore.Tests.Helpers;
43
using Microsoft.Extensions.DependencyInjection;
4+
using NUnit.Framework;
55

66
namespace GitVersionCore.Tests.BuildServers
77
{

src/GitVersionCore.Tests/BuildServers/TeamCityTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using NUnit.Framework;
21
using GitVersion.BuildServers;
32
using GitVersionCore.Tests.Helpers;
43
using Microsoft.Extensions.DependencyInjection;
4+
using NUnit.Framework;
55

66
namespace GitVersionCore.Tests.BuildServers
77
{

src/GitVersionCore.Tests/CommitDateTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
22
using System.Linq;
33
using GitVersion;
4-
using GitVersion.VersionFilters;
5-
using NUnit.Framework;
64
using GitVersion.Configuration;
7-
using GitVersion.VersioningModes;
85
using GitVersion.Extensions;
6+
using GitVersion.VersionFilters;
7+
using GitVersion.VersioningModes;
98
using GitVersionCore.Tests.Helpers;
9+
using NUnit.Framework;
1010

1111
namespace GitVersionCore.Tests
1212
{

src/GitVersionCore.Tests/ConfigProviderTests.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44
using System.Linq;
55
using System.Reflection;
66
using System.Runtime.CompilerServices;
7-
using NUnit.Framework;
8-
using Shouldly;
9-
using YamlDotNet.Serialization;
7+
using GitVersion;
108
using GitVersion.Configuration;
11-
using GitVersion.VersioningModes;
129
using GitVersion.Extensions;
13-
using GitVersion;
1410
using GitVersion.Logging;
11+
using GitVersion.VersioningModes;
1512
using GitVersionCore.Tests.Helpers;
1613
using Microsoft.Extensions.DependencyInjection;
1714
using Microsoft.Extensions.Options;
15+
using NUnit.Framework;
16+
using Shouldly;
17+
using YamlDotNet.Serialization;
18+
using Environment = System.Environment;
1819

1920
namespace GitVersionCore.Tests
2021
{
@@ -96,7 +97,7 @@ public void RegexIsRequired()
9697
tag: bugfix";
9798
SetupConfigFileContent(text);
9899
var ex = Should.Throw<GitVersionConfigurationException>(() => configProvider.Provide(repoPath));
99-
ex.Message.ShouldBe($"Branch configuration 'bug' is missing required configuration 'regex'{System.Environment.NewLine}" +
100+
ex.Message.ShouldBe($"Branch configuration 'bug' is missing required configuration 'regex'{Environment.NewLine}" +
100101
"See https://gitversion.net/docs/configuration/ for more info");
101102
}
102103

@@ -111,7 +112,7 @@ public void SourceBranchIsRequired()
111112
tag: bugfix";
112113
SetupConfigFileContent(text);
113114
var ex = Should.Throw<GitVersionConfigurationException>(() => configProvider.Provide(repoPath));
114-
ex.Message.ShouldBe($"Branch configuration 'bug' is missing required configuration 'source-branches'{System.Environment.NewLine}" +
115+
ex.Message.ShouldBe($"Branch configuration 'bug' is missing required configuration 'source-branches'{Environment.NewLine}" +
115116
"See https://gitversion.net/docs/configuration/ for more info");
116117
}
117118

src/GitVersionCore.Tests/Configuration/IgnoreConfigTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22
using System.IO;
3+
using GitVersion.Configuration;
4+
using GitVersionCore.Tests.Helpers;
35
using NUnit.Framework;
46
using Shouldly;
57
using YamlDotNet.Core;
6-
using GitVersion.Configuration;
7-
using GitVersionCore.Tests.Helpers;
88

99
namespace GitVersionCore.Tests.Configuration
1010
{

src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System.IO;
2-
using NUnit.Framework;
3-
using Shouldly;
2+
using GitVersion;
43
using GitVersion.Configuration;
54
using GitVersion.Exceptions;
6-
using GitVersion;
75
using GitVersionCore.Tests.Helpers;
86
using Microsoft.Extensions.DependencyInjection;
97
using Microsoft.Extensions.Options;
8+
using NUnit.Framework;
9+
using Shouldly;
1010

1111
namespace GitVersionCore.Tests
1212
{

src/GitVersionCore.Tests/DocumentationTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
using System.IO;
33
using System.Linq;
44
using System.Reflection;
5-
using NUnit.Framework;
6-
using Shouldly;
7-
using YamlDotNet.Serialization;
85
using GitVersion.Configuration;
96
using GitVersion.OutputVariables;
107
using GitVersionCore.Tests.Helpers;
8+
using NUnit.Framework;
9+
using Shouldly;
10+
using YamlDotNet.Serialization;
1111

1212
namespace GitVersionCore.Tests
1313
{

src/GitVersionCore.Tests/DynamicRepositoryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.IO;
22
using GitVersion;
3-
using NUnit.Framework;
43
using GitVersionCore.Tests.Helpers;
54
using Microsoft.Extensions.DependencyInjection;
65
using Microsoft.Extensions.Options;
6+
using NUnit.Framework;
77

88
namespace GitVersionCore.Tests
99
{

src/GitVersionCore.Tests/Extensions/ExtensionMethodsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using NUnit.Framework;
21
using GitVersion.Extensions;
2+
using NUnit.Framework;
33

44
namespace GitVersionCore.Tests.Extensions
55
{

src/GitVersionCore.Tests/GitRepoMetadataProviderTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
using GitTools.Testing;
33
using GitVersion;
44
using GitVersion.Configuration;
5-
using GitVersionCore.Tests.IntegrationTests;
6-
using NUnit.Framework;
7-
using Shouldly;
8-
using GitVersion.Logging;
95
using GitVersion.Extensions;
6+
using GitVersion.Logging;
107
using GitVersionCore.Tests.Helpers;
8+
using GitVersionCore.Tests.IntegrationTests;
119
using Microsoft.Extensions.DependencyInjection;
10+
using NUnit.Framework;
11+
using Shouldly;
1212

1313
namespace GitVersionCore.Tests
1414
{

src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
using GitTools.Testing;
33
using GitVersion;
44
using GitVersion.Configuration;
5-
using GitVersion.OutputVariables;
6-
using LibGit2Sharp;
7-
using Shouldly;
8-
using GitVersion.Logging;
9-
using Microsoft.Extensions.Options;
105
using GitVersion.Extensions;
6+
using GitVersion.Logging;
7+
using GitVersion.OutputVariables;
118
using GitVersion.VersionCalculation;
129
using GitVersionCore.Tests.Helpers;
10+
using LibGit2Sharp;
1311
using Microsoft.Extensions.DependencyInjection;
12+
using Microsoft.Extensions.Options;
13+
using Shouldly;
1414

1515
namespace GitVersionCore.Tests
1616
{

src/GitVersionCore.Tests/GitVersionContextTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11

2+
using System.Collections.Generic;
23
using GitTools.Testing;
34
using GitVersion;
4-
using LibGit2Sharp;
5-
using NUnit.Framework;
6-
using Shouldly;
7-
using System.Collections.Generic;
85
using GitVersion.Configuration;
96
using GitVersion.Logging;
107
using GitVersion.VersioningModes;
118
using GitVersionCore.Tests.Helpers;
129
using GitVersionCore.Tests.Mocks;
10+
using LibGit2Sharp;
1311
using Microsoft.Extensions.DependencyInjection;
12+
using NUnit.Framework;
13+
using Shouldly;
1414

1515
namespace GitVersionCore.Tests
1616
{

src/GitVersionCore.Tests/GitVersionExecutorTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
using System.Text;
44
using GitTools.Testing;
55
using GitVersion;
6-
using NUnit.Framework;
7-
using Shouldly;
8-
using GitVersion.Configuration;
96
using GitVersion.Cache;
10-
using LibGit2Sharp;
11-
using GitVersionCore.Tests.Helpers;
7+
using GitVersion.Configuration;
128
using GitVersion.Logging;
9+
using GitVersionCore.Tests.Helpers;
10+
using LibGit2Sharp;
1311
using Microsoft.Extensions.DependencyInjection;
1412
using Microsoft.Extensions.Options;
13+
using NUnit.Framework;
14+
using Shouldly;
1515
using Environment = System.Environment;
1616

1717
namespace GitVersionCore.Tests

src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
22
using System.IO;
3-
using NUnit.Framework;
4-
using Shouldly;
5-
using GitVersion.OutputVariables;
6-
using GitVersion.Extensions.GitVersionInformationResources;
73
using GitVersion;
4+
using GitVersion.Extensions.GitVersionInformationResources;
5+
using GitVersion.OutputVariables;
86
using GitVersionCore.Tests.Helpers;
97
using Microsoft.Extensions.DependencyInjection;
8+
using NUnit.Framework;
9+
using Shouldly;
1010

1111
namespace GitVersionCore.Tests
1212
{

0 commit comments

Comments
 (0)