Skip to content

Commit 24a9e2e

Browse files
committed
Fix missing Framework in MinVerTasks and MinVerAttribute
1 parent f9fe883 commit 24a9e2e

File tree

4 files changed

+49
-4
lines changed

4 files changed

+49
-4
lines changed

source/Nuke.Common/Tools/MinVer/MinVer.Generated.cs

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static partial class MinVerTasks
3131
/// </summary>
3232
public static string MinVerPath =>
3333
ToolPathResolver.TryGetEnvironmentExecutable("MINVER_EXE") ??
34-
ToolPathResolver.GetPackageExecutable("minver-cli", "minver-cli.dll");
34+
GetToolPath();
3535
public static Action<OutputType, string> MinVerLogger { get; set; } = ProcessTasks.DefaultLogger;
3636
/// <summary>
3737
/// <p>Minimalistic versioning using Git tags.</p>
@@ -116,14 +116,15 @@ public partial class MinVerSettings : ToolSettings
116116
/// <summary>
117117
/// Path to the MinVer executable.
118118
/// </summary>
119-
public override string ProcessToolPath => base.ProcessToolPath ?? MinVerTasks.MinVerPath;
119+
public override string ProcessToolPath => base.ProcessToolPath ?? GetProcessToolPath();
120120
public override Action<OutputType, string> ProcessCustomLogger => MinVerTasks.MinVerLogger;
121121
public virtual MinVerVersionPart AutoIncrement { get; internal set; }
122122
public virtual string BuildMetadata { get; internal set; }
123123
public virtual string DefaultPreReleasePhase { get; internal set; }
124124
public virtual string MinimumMajorMinor { get; internal set; }
125125
public virtual string TagPrefix { get; internal set; }
126126
public virtual MinVerVerbosity Verbosity { get; internal set; }
127+
public virtual string Framework { get; internal set; }
127128
protected override Arguments ConfigureProcessArguments(Arguments arguments)
128129
{
129130
arguments
@@ -298,6 +299,28 @@ public static T ResetVerbosity<T>(this T toolSettings) where T : MinVerSettings
298299
return toolSettings;
299300
}
300301
#endregion
302+
#region Framework
303+
/// <summary>
304+
/// <p><em>Sets <see cref="MinVerSettings.Framework"/></em></p>
305+
/// </summary>
306+
[Pure]
307+
public static T SetFramework<T>(this T toolSettings, string framework) where T : MinVerSettings
308+
{
309+
toolSettings = toolSettings.NewInstance();
310+
toolSettings.Framework = framework;
311+
return toolSettings;
312+
}
313+
/// <summary>
314+
/// <p><em>Resets <see cref="MinVerSettings.Framework"/></em></p>
315+
/// </summary>
316+
[Pure]
317+
public static T ResetFramework<T>(this T toolSettings) where T : MinVerSettings
318+
{
319+
toolSettings = toolSettings.NewInstance();
320+
toolSettings.Framework = null;
321+
return toolSettings;
322+
}
323+
#endregion
301324
}
302325
#endregion
303326
#region MinVerVerbosity

source/Nuke.Common/Tools/MinVer/MinVer.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"name": "MinVer",
77
"officialUrl": "https://github.com/adamralph/minver",
88
"help": "Minimalistic versioning using Git tags.",
9-
"packageId": "minver-cli",
10-
"packageExecutable": "minver-cli.dll",
9+
"customExecutable": true,
1110
"tasks": [
1211
{
1312
"returnType": "MinVer",
@@ -42,6 +41,11 @@
4241
"name": "Verbosity",
4342
"type": "MinVerVerbosity",
4443
"format": "--verbosity {value}"
44+
},
45+
{
46+
"name": "Framework",
47+
"type": "string",
48+
"noArgument": true
4549
}
4650
]
4751
}

source/Nuke.Common/Tools/MinVer/MinVerAttribute.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ namespace Nuke.Common.Tools.MinVer
2121
[UsedImplicitly(ImplicitUseKindFlags.Default)]
2222
public class MinVerAttribute : ValueInjectionAttributeBase
2323
{
24+
public string Framework { get; set; } = "net6.0";
2425
public bool UpdateBuildNumber { get; set; }
2526

2627
public override object GetValue(MemberInfo member, object instance)
2728
{
2829
var version = MinVerTasks.MinVer(s => s
30+
.SetFramework(Framework)
2931
.DisableProcessLogOutput())
3032
.Result;
3133

source/Nuke.Common/Tools/MinVer/MinVerTasks.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ namespace Nuke.Common.Tools.MinVer
1010
{
1111
public static partial class MinVerTasks
1212
{
13+
internal static string GetToolPath(string framework = null)
14+
{
15+
return ToolPathResolver.GetPackageExecutable(
16+
packageId: "minver-cli",
17+
packageExecutable: "minver-cli.dll",
18+
framework: framework);
19+
}
20+
1321
private static MinVer GetResult(IProcess process, MinVerSettings toolSettings)
1422
{
1523
var versionString = process.Output.Select(x => x.Text).Single(x => !x.StartsWith("MinVer:"));
@@ -32,4 +40,12 @@ private static MinVer GetResult(IProcess process, MinVerSettings toolSettings)
3240
return version;
3341
}
3442
}
43+
44+
partial class MinVerSettings
45+
{
46+
private string GetProcessToolPath()
47+
{
48+
return MinVerTasks.GetToolPath(Framework);
49+
}
50+
}
3551
}

0 commit comments

Comments
 (0)