Skip to content

Commit 047b34d

Browse files
arturcicarturcic
committed
added back the msbuild tasks
1 parent a4aa54e commit 047b34d

8 files changed

+151
-187
lines changed

‎src/GitVersionTask/FileHelper.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Linq;
55
using System.Text.RegularExpressions;
66
using GitVersion;
7+
using Microsoft.Build.Framework;
78

89
public static class FileHelper
910
{
@@ -59,7 +60,7 @@ public static string GetFileExtension(string language)
5960
}
6061
}
6162

62-
public static void CheckForInvalidFiles(IEnumerable<string> compileFiles, string projectFile)
63+
public static void CheckForInvalidFiles(IEnumerable<ITaskItem> compileFiles, string projectFile)
6364
{
6465
foreach (var compileFile in GetInvalidFiles(compileFiles, projectFile))
6566
{
@@ -129,9 +130,9 @@ private static bool VisualBasicFileContainsVersionAttribute(string compileFile,
129130
\s*\(\s*\)\s*\> # End brackets ()>");
130131
}
131132

132-
private static IEnumerable<string> GetInvalidFiles(IEnumerable<string> compileFiles, string projectFile)
133+
private static IEnumerable<string> GetInvalidFiles(IEnumerable<ITaskItem> compileFiles, string projectFile)
133134
{
134-
return compileFiles
135+
return compileFiles.Select(x => x.ItemSpec)
135136
.Where(compileFile => compileFile.Contains("AssemblyInfo"))
136137
.Where(s => FileContainsVersionAttribute(s, projectFile));
137138
}

‎src/GitVersionTask/GenerateGitVersionInformation.cs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
namespace GitVersionTask
22
{
3-
public class GenerateGitVersionInformation
3+
using Microsoft.Build.Framework;
4+
5+
public class GenerateGitVersionInformation : GitVersionTaskBase
46
{
5-
// This method is entrypoint for the task declared in .props file
6-
public static Output Execute(Input input) => GitVersionTasks.GenerateGitVersionInformation(input);
7+
[Required]
8+
public string ProjectFile { get; set; }
9+
10+
[Required]
11+
public string IntermediateOutputPath { get; set; }
12+
13+
[Required]
14+
public string Language { get; set; }
715

8-
public sealed class Input : InputWithCommonAdditionalProperties
9-
{
10-
}
16+
[Output]
17+
public string GitVersionInformationFilePath { get; set; }
1118

12-
public sealed class Output
13-
{
14-
public string GitVersionInformationFilePath { get; set; }
15-
}
19+
public override bool Execute() => TaskProxy.GenerateGitVersionInformation(this);
1620
}
1721
}

‎src/GitVersionTask/GetVersion.cs

Lines changed: 64 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,99 @@
11
namespace GitVersionTask
22
{
3-
public class GetVersion
4-
{
5-
public static Output Execute(Input input) => GitVersionTasks.GetVersion(input);
3+
using Microsoft.Build.Framework;
64

7-
public sealed class Input : InputBase
8-
{
9-
}
5+
public class GetVersion : GitVersionTaskBase
6+
{
7+
[Output]
8+
public string Major { get; set; }
109

11-
public sealed class Output
12-
{
13-
public string Major { get; set; }
10+
[Output]
11+
public string Minor { get; set; }
1412

15-
public string Minor { get; set; }
13+
[Output]
14+
public string Patch { get; set; }
1615

17-
public string Patch { get; set; }
16+
[Output]
17+
public string PreReleaseTag { get; set; }
1818

19-
public string PreReleaseTag { get; set; }
19+
[Output]
20+
public string PreReleaseTagWithDash { get; set; }
2021

21-
public string PreReleaseTagWithDash { get; set; }
22+
[Output]
23+
public string PreReleaseLabel { get; set; }
2224

23-
public string PreReleaseLabel { get; set; }
25+
[Output]
26+
public string PreReleaseNumber { get; set; }
2427

25-
public string PreReleaseNumber { get; set; }
28+
[Output]
29+
public string WeightedPreReleaseNumber { get; set; }
2630

27-
public string WeightedPreReleaseNumber { get; set; }
31+
[Output]
32+
public string BuildMetaData { get; set; }
2833

29-
public string BuildMetaData { get; set; }
34+
[Output]
35+
public string BuildMetaDataPadded { get; set; }
3036

31-
public string BuildMetaDataPadded { get; set; }
37+
[Output]
38+
public string FullBuildMetaData { get; set; }
3239

33-
public string FullBuildMetaData { get; set; }
40+
[Output]
41+
public string MajorMinorPatch { get; set; }
3442

35-
public string MajorMinorPatch { get; set; }
43+
[Output]
44+
public string SemVer { get; set; }
3645

37-
public string SemVer { get; set; }
46+
[Output]
47+
public string LegacySemVer { get; set; }
3848

39-
public string LegacySemVer { get; set; }
49+
[Output]
50+
public string LegacySemVerPadded { get; set; }
4051

41-
public string LegacySemVerPadded { get; set; }
52+
[Output]
53+
public string AssemblySemVer { get; set; }
4254

43-
public string AssemblySemVer { get; set; }
55+
[Output]
56+
public string AssemblySemFileVer { get; set; }
4457

45-
public string AssemblySemFileVer { get; set; }
58+
[Output]
59+
public string FullSemVer { get; set; }
4660

47-
public string FullSemVer { get; set; }
61+
[Output]
62+
public string InformationalVersion { get; set; }
4863

49-
public string InformationalVersion { get; set; }
64+
[Output]
65+
public string BranchName { get; set; }
5066

51-
public string BranchName { get; set; }
67+
[Output]
68+
public string Sha { get; set; }
5269

53-
public string Sha { get; set; }
70+
[Output]
71+
public string ShortSha { get; set; }
5472

55-
public string ShortSha { get; set; }
73+
[Output]
74+
public string NuGetVersionV2 { get; set; }
5675

57-
public string NuGetVersionV2 { get; set; }
76+
[Output]
77+
public string NuGetVersion { get; set; }
5878

59-
public string NuGetVersion { get; set; }
79+
[Output]
80+
public string NuGetPreReleaseTagV2 { get; set; }
6081

61-
public string NuGetPreReleaseTagV2 { get; set; }
82+
[Output]
83+
public string NuGetPreReleaseTag { get; set; }
6284

63-
public string NuGetPreReleaseTag { get; set; }
85+
[Output]
86+
public string CommitDate { get; set; }
6487

65-
public string CommitDate { get; set; }
88+
[Output]
89+
public string VersionSourceSha { get; set; }
6690

67-
public string VersionSourceSha { get; set; }
91+
[Output]
92+
public string CommitsSinceVersionSource { get; set; }
6893

69-
public string CommitsSinceVersionSource { get; set; }
94+
[Output]
95+
public string CommitsSinceVersionSourcePadded { get; set; }
7096

71-
public string CommitsSinceVersionSourcePadded { get; set; }
72-
}
97+
public override bool Execute() => TaskProxy.GetVersion(this);
7398
}
7499
}

‎src/GitVersionTask/GitVersionTaskUtils.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ namespace GitVersionTask
66

77
public static class GitVersionTaskUtils
88
{
9-
public static bool GetVersionVariables(InputBase input, out VersionVariables versionVariables)
10-
=> new ExecuteCore(new FileSystem()).TryGetVersion(input.SolutionDirectory, out versionVariables, input.NoFetch, new Authentication());
9+
public static bool GetVersionVariables(GitVersionTaskBase task, out VersionVariables versionVariables)
10+
=> new ExecuteCore(new FileSystem()).TryGetVersion(task.SolutionDirectory, out versionVariables, task.NoFetch, new Authentication());
1111

1212
public static FileWriteInfo GetFileWriteInfo(
1313
this string intermediateOutputPath,

0 commit comments

Comments
 (0)