Skip to content

Commit a20c3b7

Browse files
committed
Merge branch 'hotfix/9.0.4'
2 parents f38745a + d5a5d99 commit a20c3b7

File tree

68 files changed

+1975
-1752
lines changed

Some content is hidden

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

68 files changed

+1975
-1752
lines changed

CHANGELOG.md

+13-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## [vNext]
88

9+
## [9.0.4] / 2025-01-15
10+
- Security: Fixed output filter from `ArgumentStringHandler`
11+
- Removed obsolete members
12+
- Fixed `PreProcess` of tasks requires exact options type
13+
- Fixed missing `position` and `secret` properties
14+
- Fixed preparation of shadow directory in `ReSharperTasks`
15+
- Fixed base class in `ReSharperTasks`
16+
- Fixed missing arguments in `DotNetTasks`
17+
- Fixed missing commands in `DotNetTasks` and `NuGetTasks`
18+
- Fixed package executable in `OctoVersionTasks`
19+
920
## [9.0.3] / 2024-12-05
1021
- Fixed nullable options for `ToolTasks.Run`
1122
- Fixed static tool path resolution
@@ -1205,7 +1216,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
12051216
- Added CLT tasks for Git
12061217
- Fixed background color in console output
12071218

1208-
[vNext]: https://github.com/nuke-build/nuke/compare/9.0.3...HEAD
1219+
[vNext]: https://github.com/nuke-build/nuke/compare/9.0.4...HEAD
1220+
[9.0.4]: https://github.com/nuke-build/nuke/compare/9.0.3...9.0.4
12091221
[9.0.3]: https://github.com/nuke-build/nuke/compare/9.0.2...9.0.3
12101222
[9.0.2]: https://github.com/nuke-build/nuke/compare/9.0.1...9.0.2
12111223
[9.0.1]: https://github.com/nuke-build/nuke/compare/9.0.0...9.0.1

Directory.Packages.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
2323
<PackageVersion Include="NuGet.Packaging" Version="6.12.1" />
2424
<PackageVersion Include="Octokit" Version="13.0.1" />
25-
<PackageVersion Include="Serilog" Version="4.1.0" />
25+
<PackageVersion Include="Serilog" Version="4.2.0" />
2626
<PackageVersion Include="Serilog.Formatting.Compact" Version="3.0.0" />
2727
<PackageVersion Include="Serilog.Formatting.Compact.Reader" Version="4.0.0" />
2828
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
2929
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
3030
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
3131
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
3232
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
33-
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
34-
<PackageVersion Include="YamlDotNet" Version="16.2.0" />
33+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
34+
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
3535
<PackageVersion Include="matkoch.spectre.console" Version="0.46.0" />
3636
</ItemGroup>
3737

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ environment:
3737
PublicNuGetApiKey:
3838
secure: AzhHrKZGYyWnvMtPg06Q7PMJPp47dl5NxAHaE9ZB9tjIWVqmySx3F26YtVhRSPGa
3939
GitHubReleaseGitHubToken:
40-
secure: a5UfxXiDEere9GkCCN9TURaC8CmN/ZaqWIeoHbHNshmXWLedwrEAdwGNzPf3dusKEykOMB7T/fIorZHPIqSRuuR3JsMya/3zPrvozT5o1A5qf6LpNAtWpdB20+3rvupZ
40+
secure: a5UfxXiDEere9GkCCN9TUUq2+8QHAJoeVpZudQZXdWyloZWE5xKOkqzpxdMoYDPSxrVbWxjXbk1Xe9p0OydwuGVnr/3DC//BguNeGtFddbyMWlAiX36XvD1ZGEgP+ZIN
4141
SignPathApiToken:
4242
secure: uQTH2MxpqiqWTy7EJkjtNc43ipG17EUOQN99QsODRNgtNEcikDaP0t4ylekK/ibn
4343
TwitterConsumerKey:

build/Build.CI.AppVeyor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
InvokedTargets = new[] { nameof(ITest.Test), nameof(IPack.Pack) },
3636
Secrets = new string[0])]
3737
[AppVeyorSecret(nameof(PublicNuGetApiKey), "AzhHrKZGYyWnvMtPg06Q7PMJPp47dl5NxAHaE9ZB9tjIWVqmySx3F26YtVhRSPGa")]
38-
[AppVeyorSecret(ICreateGitHubRelease.GitHubRelease + nameof(ICreateGitHubRelease.GitHubToken), "a5UfxXiDEere9GkCCN9TURaC8CmN/ZaqWIeoHbHNshmXWLedwrEAdwGNzPf3dusKEykOMB7T/fIorZHPIqSRuuR3JsMya/3zPrvozT5o1A5qf6LpNAtWpdB20+3rvupZ")]
38+
[AppVeyorSecret(ICreateGitHubRelease.GitHubRelease + nameof(ICreateGitHubRelease.GitHubToken), "a5UfxXiDEere9GkCCN9TUUq2+8QHAJoeVpZudQZXdWyloZWE5xKOkqzpxdMoYDPSxrVbWxjXbk1Xe9p0OydwuGVnr/3DC//BguNeGtFddbyMWlAiX36XvD1ZGEgP+ZIN")]
3939
[AppVeyorSecret(ISignPackages.SignPath + nameof(ISignPackages.ApiToken), "uQTH2MxpqiqWTy7EJkjtNc43ipG17EUOQN99QsODRNgtNEcikDaP0t4ylekK/ibn")]
4040
[AppVeyorSecret(IHazTwitterCredentials.Twitter + nameof(IHazTwitterCredentials.ConsumerKey), "T61zL4r+xtyj7b0aOGYCsyixrXHooXE759T8z3M67Lw=")]
4141
[AppVeyorSecret(IHazTwitterCredentials.Twitter + nameof(IHazTwitterCredentials.ConsumerSecret), "CZwdlO4PHT51Xr0Pe/mT6WpfBzQXsL0C3yWfHgXqdYrf22rx8ePEt5qpszWckbHE5Vh5ErtVfIAQgLeFrqe2Gg==")]

build/Build.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ void DeletePackage(string id, string version)
191191
.DependsOn<IPack>()
192192
.Executes(() =>
193193
{
194-
SuppressErrors(() => DotNet($"tool uninstall -g {Solution.Nuke_GlobalTool.Name}"));
194+
SuppressErrors(() => DotNet($"tool uninstall -g {Solution.Nuke_GlobalTool.Name}"), logWarning: false);
195195
DotNet($"tool install -g {Solution.Nuke_GlobalTool.Name} --add-source {OutputDirectory} --version {DefaultDeploymentVersion}");
196196
});
197197

source/Nuke.Build/ControlFlow.cs

+2-38
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,6 @@ namespace Nuke.Common;
2121
[DebuggerStepThrough]
2222
public static class ControlFlow
2323
{
24-
[Obsolete("Use " + nameof(Common.Assert) + "." + nameof(Common.Assert.Fail))]
25-
public static void Fail(string format, params object[] args)
26-
{
27-
Fail(string.Format(format, args));
28-
}
29-
30-
[Obsolete("Use " + nameof(Common.Assert) + "." + nameof(Common.Assert.Fail))]
31-
public static void Fail(object value, Exception exception = null)
32-
{
33-
Fail(value.ToString(), exception);
34-
}
35-
36-
[Obsolete("Use " + nameof(Common.Assert) + "." + nameof(Common.Assert.Fail))]
37-
public static void Fail(string text, Exception exception = null)
38-
{
39-
Common.Assert.Fail(text, exception);
40-
}
41-
42-
[Obsolete("Use " + nameof(Common.Assert) + "." + nameof(Common.Assert.True) +
43-
" or " + nameof(Common.Assert) + "." + nameof(Common.Assert.False))]
44-
public static void Assert(
45-
[AssertionCondition(AssertionConditionType.IS_TRUE)]
46-
bool condition,
47-
string text)
48-
{
49-
Common.Assert.True(condition, text);
50-
}
51-
52-
[Obsolete("Use " + nameof(Common.Assert) + "." + nameof(Common.Assert.NotNullOrEmpty))]
53-
public static IReadOnlyCollection<T> NotEmpty<T>([CanBeNull] this IEnumerable<T> enumerable, string message = null)
54-
{
55-
var collection = enumerable.NotNull().ToList().AsReadOnly();
56-
Common.Assert.NotEmpty(collection);
57-
return collection;
58-
}
59-
6024
public static void SuppressErrors(Action action, bool includeStackTrace = false, bool logWarning = true)
6125
{
6226
SuppressErrorsIf(condition: true, action, includeStackTrace: includeStackTrace, logWarning: logWarning);
@@ -106,7 +70,7 @@ public static void ExecuteWithRetry(
10670
TimeSpan? delay = null,
10771
Action<string> logAction = null)
10872
{
109-
Assert(retryAttempts > 0, "retryAttempts > 0");
73+
Assert.True(retryAttempts > 0);
11074

11175
logAction ??= Log.Warning;
11276
Exception lastException = null;
@@ -138,7 +102,7 @@ public static void ExecuteWithRetry(
138102
}
139103
}
140104

141-
Fail(new[]
105+
Assert.Fail(new[]
142106
{
143107
$"Execution failed permanently after {retryAttempts} attempts.",
144108
$"Last attempt failed with: {lastException!.Message}"

0 commit comments

Comments
 (0)