Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH4278: Update Spectre.Console to 0.49.1 #4279

Merged
merged 5 commits into from
Sep 26, 2024
Merged

GH4278: Update Spectre.Console to 0.49.1 #4279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c173849
(GH-4278) Update Spectre.Console to 0.49.1
devlead Sep 25, 2024
0ab4b70
Spectre Cli no longer trims leading - in remaing
devlead Sep 25, 2024
74ebb56
Address MacOS failing integration test
devlead Sep 25, 2024
d0a7a88
Try integration tests on MacOS 13
devlead Sep 25, 2024
fec1acf
DotNetWorkloadRepair flaky, just report
devlead Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
os: [windows-latest, macos-13, ubuntu-latest]
steps:
- name: Get the sources
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Cli/Cake.Cli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="Autofac" Version="8.0.0" />
<PackageReference Include="Spectre.Console" Version="0.47.0" />
<PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
<PackageReference Include="Spectre.Console" Version="0.49.1" />
<PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
</ItemGroup>
</Project>
5 changes: 3 additions & 2 deletions src/Cake/Commands/DefaultCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,11 @@ private static CakeArguments CreateCakeArguments(IRemainingArguments remainingAr
// Keep the actual remaining arguments in the cake arguments
foreach (var group in remainingArguments.Parsed)
{
arguments[group.Key] = new List<string>();
string key = group.Key.TrimStart('-');
arguments[key] = new List<string>();
foreach (var argument in group)
{
arguments[group.Key].Add(argument);
arguments[key].Add(argument);
}
}

Expand Down
1 change: 1 addition & 0 deletions tests/integration/Cake.Common/Tools/DotNet/DotNetAliases.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ Task("Cake.Common.Tools.DotNet.DotNetAliases.DotNetWorkloadSearch")

Task("Cake.Common.Tools.DotNet.DotNetAliases.DotNetWorkloadRepair")
.IsDependentOn("Cake.Common.Tools.DotNet.DotNetAliases.Setup")
.OnError(exception => { Console.WriteLine(exception); })
.Does(() =>
{
// When
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/Cake.Core/Scripting/AddinDirective.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Task("Cake.Core.Scripting.AddinDirective.LoadNativeAssemblies")
{
FilePath cakeCore = typeof(ICakeContext).GetTypeInfo().Assembly.Location;
FilePath cake = cakeCore.GetDirectory().CombineWithFilePath("Cake.dll");
var script = @"#addin nuget:?package=Cake.Git&version=2.0.0
var script = @"#addin nuget:?package=Cake.Git&version=4.0.0

var repoRoot = GitFindRootFromPath(Context.EnvironmentVariable(""CAKE_TEST_DIR""));

Expand Down
Loading