Skip to content

Commit a0af556

Browse files
committed
Fixed merge issues
1 parent 6bcfecf commit a0af556

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

src/GitVersionCore/GitVersionFinder.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
namespace GitVersion
22
{
33
using System.IO;
4-
using System.Linq;
54
using GitVersion.VersionCalculation;
6-
using LibGit2Sharp;
75

86
public class GitVersionFinder
97
{

src/GitVersionCore/OutputVariables/VersionVariables.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,12 @@
55
using System.Collections.Generic;
66
using System.IO;
77
using System.Linq;
8-
using System.Reflection;
9-
108
using GitVersion.Helpers;
119

1210
using YamlDotNet.Serialization;
1311

1412
public class VersionVariables : IEnumerable<KeyValuePair<string, string>>
1513
{
16-
public static VersionVariables FromDictionary(IEnumerable<KeyValuePair<string, string>> properties)
17-
{
18-
var type = typeof(VersionVariables);
19-
var ctor = type.GetConstructors().Single();
20-
var ctorArgs = ctor.GetParameters()
21-
.Select(p => properties.Single(v => v.Key.ToLower() == p.Name.ToLower()).Value)
22-
.Cast<object>()
23-
.ToArray();
24-
return (VersionVariables)Activator.CreateInstance(type, ctorArgs);
25-
}
26-
2714
public VersionVariables(string major,
2815
string minor,
2916
string patch,
@@ -135,7 +122,6 @@ IEnumerator IEnumerable.GetEnumerator()
135122
return GetEnumerator();
136123
}
137124

138-
139125
public static VersionVariables FromDictionary(IEnumerable<KeyValuePair<string, string>> properties)
140126
{
141127
var type = typeof(VersionVariables);

0 commit comments

Comments
 (0)