Skip to content

Commit

Permalink
Merge branch 'hotfix/9.0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
matkoch committed Jan 15, 2025
2 parents f38745a + d5a5d99 commit a20c3b7
Show file tree
Hide file tree
Showing 68 changed files with 1,975 additions and 1,752 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [vNext]

## [9.0.4] / 2025-01-15
- Security: Fixed output filter from `ArgumentStringHandler`
- Removed obsolete members
- Fixed `PreProcess` of tasks requires exact options type
- Fixed missing `position` and `secret` properties
- Fixed preparation of shadow directory in `ReSharperTasks`
- Fixed base class in `ReSharperTasks`
- Fixed missing arguments in `DotNetTasks`
- Fixed missing commands in `DotNetTasks` and `NuGetTasks`
- Fixed package executable in `OctoVersionTasks`

## [9.0.3] / 2024-12-05
- Fixed nullable options for `ToolTasks.Run`
- Fixed static tool path resolution
Expand Down Expand Up @@ -1205,7 +1216,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added CLT tasks for Git
- Fixed background color in console output

[vNext]: https://github.com/nuke-build/nuke/compare/9.0.3...HEAD
[vNext]: https://github.com/nuke-build/nuke/compare/9.0.4...HEAD
[9.0.4]: https://github.com/nuke-build/nuke/compare/9.0.3...9.0.4
[9.0.3]: https://github.com/nuke-build/nuke/compare/9.0.2...9.0.3
[9.0.2]: https://github.com/nuke-build/nuke/compare/9.0.1...9.0.2
[9.0.1]: https://github.com/nuke-build/nuke/compare/9.0.0...9.0.1
Expand Down
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NuGet.Packaging" Version="6.12.1" />
<PackageVersion Include="Octokit" Version="13.0.1" />
<PackageVersion Include="Serilog" Version="4.1.0" />
<PackageVersion Include="Serilog" Version="4.2.0" />
<PackageVersion Include="Serilog.Formatting.Compact" Version="3.0.0" />
<PackageVersion Include="Serilog.Formatting.Compact.Reader" Version="4.0.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
<PackageVersion Include="YamlDotNet" Version="16.2.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
<PackageVersion Include="matkoch.spectre.console" Version="0.46.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ environment:
PublicNuGetApiKey:
secure: AzhHrKZGYyWnvMtPg06Q7PMJPp47dl5NxAHaE9ZB9tjIWVqmySx3F26YtVhRSPGa
GitHubReleaseGitHubToken:
secure: a5UfxXiDEere9GkCCN9TURaC8CmN/ZaqWIeoHbHNshmXWLedwrEAdwGNzPf3dusKEykOMB7T/fIorZHPIqSRuuR3JsMya/3zPrvozT5o1A5qf6LpNAtWpdB20+3rvupZ
secure: a5UfxXiDEere9GkCCN9TUUq2+8QHAJoeVpZudQZXdWyloZWE5xKOkqzpxdMoYDPSxrVbWxjXbk1Xe9p0OydwuGVnr/3DC//BguNeGtFddbyMWlAiX36XvD1ZGEgP+ZIN
SignPathApiToken:
secure: uQTH2MxpqiqWTy7EJkjtNc43ipG17EUOQN99QsODRNgtNEcikDaP0t4ylekK/ibn
TwitterConsumerKey:
Expand Down
2 changes: 1 addition & 1 deletion build/Build.CI.AppVeyor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
InvokedTargets = new[] { nameof(ITest.Test), nameof(IPack.Pack) },
Secrets = new string[0])]
[AppVeyorSecret(nameof(PublicNuGetApiKey), "AzhHrKZGYyWnvMtPg06Q7PMJPp47dl5NxAHaE9ZB9tjIWVqmySx3F26YtVhRSPGa")]
[AppVeyorSecret(ICreateGitHubRelease.GitHubRelease + nameof(ICreateGitHubRelease.GitHubToken), "a5UfxXiDEere9GkCCN9TURaC8CmN/ZaqWIeoHbHNshmXWLedwrEAdwGNzPf3dusKEykOMB7T/fIorZHPIqSRuuR3JsMya/3zPrvozT5o1A5qf6LpNAtWpdB20+3rvupZ")]
[AppVeyorSecret(ICreateGitHubRelease.GitHubRelease + nameof(ICreateGitHubRelease.GitHubToken), "a5UfxXiDEere9GkCCN9TUUq2+8QHAJoeVpZudQZXdWyloZWE5xKOkqzpxdMoYDPSxrVbWxjXbk1Xe9p0OydwuGVnr/3DC//BguNeGtFddbyMWlAiX36XvD1ZGEgP+ZIN")]
[AppVeyorSecret(ISignPackages.SignPath + nameof(ISignPackages.ApiToken), "uQTH2MxpqiqWTy7EJkjtNc43ipG17EUOQN99QsODRNgtNEcikDaP0t4ylekK/ibn")]
[AppVeyorSecret(IHazTwitterCredentials.Twitter + nameof(IHazTwitterCredentials.ConsumerKey), "T61zL4r+xtyj7b0aOGYCsyixrXHooXE759T8z3M67Lw=")]
[AppVeyorSecret(IHazTwitterCredentials.Twitter + nameof(IHazTwitterCredentials.ConsumerSecret), "CZwdlO4PHT51Xr0Pe/mT6WpfBzQXsL0C3yWfHgXqdYrf22rx8ePEt5qpszWckbHE5Vh5ErtVfIAQgLeFrqe2Gg==")]
Expand Down
2 changes: 1 addition & 1 deletion build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ void DeletePackage(string id, string version)
.DependsOn<IPack>()
.Executes(() =>
{
SuppressErrors(() => DotNet($"tool uninstall -g {Solution.Nuke_GlobalTool.Name}"));
SuppressErrors(() => DotNet($"tool uninstall -g {Solution.Nuke_GlobalTool.Name}"), logWarning: false);
DotNet($"tool install -g {Solution.Nuke_GlobalTool.Name} --add-source {OutputDirectory} --version {DefaultDeploymentVersion}");
});

Expand Down
40 changes: 2 additions & 38 deletions source/Nuke.Build/ControlFlow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,42 +21,6 @@ namespace Nuke.Common;
[DebuggerStepThrough]
public static class ControlFlow
{
[Obsolete("Use " + nameof(Common.Assert) + "." + nameof(Common.Assert.Fail))]
public static void Fail(string format, params object[] args)
{
Fail(string.Format(format, args));
}

[Obsolete("Use " + nameof(Common.Assert) + "." + nameof(Common.Assert.Fail))]
public static void Fail(object value, Exception exception = null)
{
Fail(value.ToString(), exception);
}

[Obsolete("Use " + nameof(Common.Assert) + "." + nameof(Common.Assert.Fail))]
public static void Fail(string text, Exception exception = null)
{
Common.Assert.Fail(text, exception);
}

[Obsolete("Use " + nameof(Common.Assert) + "." + nameof(Common.Assert.True) +
" or " + nameof(Common.Assert) + "." + nameof(Common.Assert.False))]
public static void Assert(
[AssertionCondition(AssertionConditionType.IS_TRUE)]
bool condition,
string text)
{
Common.Assert.True(condition, text);
}

[Obsolete("Use " + nameof(Common.Assert) + "." + nameof(Common.Assert.NotNullOrEmpty))]
public static IReadOnlyCollection<T> NotEmpty<T>([CanBeNull] this IEnumerable<T> enumerable, string message = null)
{
var collection = enumerable.NotNull().ToList().AsReadOnly();
Common.Assert.NotEmpty(collection);
return collection;
}

public static void SuppressErrors(Action action, bool includeStackTrace = false, bool logWarning = true)
{
SuppressErrorsIf(condition: true, action, includeStackTrace: includeStackTrace, logWarning: logWarning);
Expand Down Expand Up @@ -106,7 +70,7 @@ public static void ExecuteWithRetry(
TimeSpan? delay = null,
Action<string> logAction = null)
{
Assert(retryAttempts > 0, "retryAttempts > 0");
Assert.True(retryAttempts > 0);

logAction ??= Log.Warning;
Exception lastException = null;
Expand Down Expand Up @@ -138,7 +102,7 @@ public static void ExecuteWithRetry(
}
}

Fail(new[]
Assert.Fail(new[]
{
$"Execution failed permanently after {retryAttempts} attempts.",
$"Last attempt failed with: {lastException!.Message}"
Expand Down
Loading

0 comments on commit a20c3b7

Please sign in to comment.