Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageReference Include="System.Formats.Asn1" Version="10.0.5" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
Expand Down
6 changes: 3 additions & 3 deletions DecSm.Atom.Module.AzureStorage/AzureBlobArtifactProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public async Task RetrieveArtifacts(
{
Prefix = artifactBlobDir,
},
cancellationToken: cancellationToken);
cancellationToken);

await foreach (var blobItem in blobs)
{
Expand Down Expand Up @@ -272,7 +272,7 @@ public async Task Cleanup(IReadOnlyList<string> runIdentifiers, CancellationToke
{
Prefix = $"{buildName}/{buildIdPath}/",
},
cancellationToken: cancellationToken);
cancellationToken);

await foreach (var blob in blobs)
{
Expand Down Expand Up @@ -324,7 +324,7 @@ public async Task<IReadOnlyList<string>> GetStoredRunIdentifiers(
{
Prefix = $"{buildName}/",
},
cancellationToken: cancellationToken);
cancellationToken);

var buildIds = new List<string>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
</PackageReference>
<PackageReference Include="FakeItEasy" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Spectre.Console.Testing" Version="0.54.0" />
<PackageReference Include="Spectre.Console.Testing" Version="0.55.0" />
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.0" />
<PackageReference Include="Verify.NUnit" Version="31.14.0" />
<PackageReference Include="Verify.NUnit" Version="31.15.0" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions DecSm.Atom.Module.GitVersion/IGitVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
/// GitVersion for generating build IDs and version numbers, ensuring consistent and
/// semantically versioned builds based on your Git history.
/// </remarks>
[PublicAPI]
[ConfigureHostBuilder]
public partial interface IGitVersion
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
</PackageReference>
<PackageReference Include="FakeItEasy" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Spectre.Console.Testing" Version="0.54.0" />
<PackageReference Include="Spectre.Console.Testing" Version="0.55.0" />
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.0" />
<PackageReference Include="Verify.NUnit" Version="31.14.0" />
<PackageReference Include="Verify.NUnit" Version="31.15.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions DecSm.Atom.Module.GithubWorkflows/Expressions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ namespace DecSm.Atom.Module.GithubWorkflows;
[PublicAPI]
public abstract record IGithubExpression
{
public string Expression => $"${{{{ {Write()} }}}}";

/// <summary>
/// Writes the expression to its GitHub Actions string representation.
/// </summary>
Expand All @@ -20,8 +22,6 @@ public abstract record IGithubExpression
public override string ToString() =>
Write();

public string Expression => $"${{{{ {Write()} }}}}";

/// <summary>
/// Implicitly converts an <see cref="IGithubExpression" /> to its string representation.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="System.Formats.Asn1" Version="10.0.5" />
<PackageReference Include="Verify.NUnit" Version="31.14.0" />
<PackageReference Include="Verify.NUnit" Version="31.15.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion DecSm.Atom.TestUtils/DecSm.Atom.TestUtils.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Spectre.Console.Testing" Version="0.54.0" />
<PackageReference Include="Spectre.Console.Testing" Version="0.55.0" />
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.0" />
</ItemGroup>

Expand Down
4 changes: 1 addition & 3 deletions DecSm.Atom.Tests/ApiSurfaceTests/PublicApiSurfaceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,10 @@ public async Task VerifyPublicApiSurface()
};
}

public sealed record Type(string Name, IReadOnlyList<IMember> Members);
public sealed record Type(string Name, [UsedImplicitly] IReadOnlyList<IMember> Members);

public interface IMember
{
string ToString();

string Name { get; }
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

InvalidOperationException: One or more workflows are dirty.
Run 'atom -g' to regenerate them
at async Task ExecuteAsync(CancellationToken stoppingToken
) in AtomService.cs:112
at async Task ExecuteAsync(CancellationToken
stoppingToken) in AtomService.cs:112

6 changes: 3 additions & 3 deletions DecSm.Atom.Tests/DecSm.Atom.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
</PackageReference>
<PackageReference Include="FakeItEasy" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Spectre.Console.Testing" Version="0.54.0" />
<PackageReference Include="Spectre.Console.Testing" Version="0.55.0" />
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.0" />
<PackageReference Include="Verify.NUnit" Version="31.14.0" />
<PackageReference Include="Verify.NUnit" Version="31.15.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions DecSm.Atom.Tool.Tests/DecSm.Atom.Tool.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FakeItEasy" Version="9.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.0" />
<PackageReference Include="Verify.NUnit" Version="31.14.0" />
<PackageReference Include="Verify.NUnit" Version="31.15.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion DecSm.Atom/DecSm.Atom.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Spectre.Console" Version="0.54.0" />
<PackageReference Include="Spectre.Console" Version="0.55.0" />
<PackageReference Include="System.IO.Abstractions" Version="22.1.0" />
<PackageReference Include="TestableIO.System.IO.Abstractions.Analyzers" Version="2022.0.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
22 changes: 14 additions & 8 deletions DecSm.Atom/Logging/SpectreLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,15 @@ public void Log<TState>(
if (!IsEnabled(logLevel))
return;

if (logLevel is LogLevel.Debug or LogLevel.Trace && !LogOptions.IsVerboseEnabled)
return;
switch (logLevel)
{
case LogLevel.None:
case LogLevel.Debug or LogLevel.Trace when !LogOptions.IsVerboseEnabled:
return;
}

var levelText = string.Empty;
var levelColour = string.Empty;
string levelText;
string levelColour;
var levelBackground = string.Empty;
var messageStyle = string.Empty;

Expand Down Expand Up @@ -92,8 +96,6 @@ public void Log<TState>(
break;

case LogLevel.None:
break;

default:
throw new UnreachableException();
}
Expand Down Expand Up @@ -133,7 +135,9 @@ public void Log<TState>(
: "dim";

var columns = new Columns(new Text(" "),
new Markup($"[{messageStyle}]{message}[/]").LeftJustified()).Collapse();
new Markup(messageStyle is { Length: > 0 }
? $"[{messageStyle}]{message}[/]"
: message).LeftJustified()).Collapse();

ServiceStaticAccessor<IAnsiConsole>.Service?.Write(columns);

Expand All @@ -148,7 +152,9 @@ public void Log<TState>(
.AddRow($"[dim]{time:yy-MM-dd zzz}[/]",
$"[dim]{FormatCategoryName(categoryName.EscapeMarkup(), command)}:[/]")
.AddRow($"[dim]{time:HH:mm:ss.fff}[/] [bold {levelColour}{levelBackground}]{levelText}[/]",
$"[{messageStyle}]{message}[/]")
messageStyle is { Length: > 0 }
? $"[{messageStyle}]{message}[/]"
: message)
.AddRow(string.Empty);

if (exception is not null)
Expand Down
16 changes: 6 additions & 10 deletions DecSm.Atom/Reports/ConsoleOutcomeReportWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@ IParamService paramService
public Task ReportRunOutcome(CancellationToken cancellationToken)
{
var table = new Table()
.LeftAligned()
.HideHeaders()
.Border(TableBorder.Minimal)
.AddColumn("Target")
.AddColumn("Outcome")
.AddColumn("Duration");
.AddColumn("Target", c => c.LeftAligned())
.AddColumn("Outcome", c => c.LeftAligned())
.AddColumn("Duration", c => c.LeftAligned());

foreach (var state in buildModel
.TargetStates
Expand Down Expand Up @@ -203,9 +202,8 @@ private void Write(List<ArtifactReportData> reportData)
return;

var table = new Table()
.Alignment(Justify.Left)
.AddColumn("Name")
.AddColumn("Path")
.AddColumn("Name", c => c.LeftAligned())
.AddColumn("Path", c => c.LeftAligned())
.Border(TableBorder.Minimal);

foreach (var artifact in reportData)
Expand Down Expand Up @@ -252,9 +250,7 @@ private void Write(ICustomReportData reportData)
/// </summary>
private void Write(TableReportData reportData)
{
var table = new Table()
.Alignment(Justify.Left)
.Border(TableBorder.Minimal);
var table = new Table().Border(TableBorder.Minimal);

var columnCount = reportData
.Rows
Expand Down
Loading