Skip to content

feat(cli): add interactive mode support for user input during builds #142

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

Merged
DecSmith42 merged 6 commits into from
Jan 4, 2025
Merged

feat(cli): add interactive mode support for user input during builds #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f70682
feat(cli): add interactive mode support for user input during builds
DecSmith42 Jan 4, 2025
d67a544
chore(dependencies): bump analyzer and associated packages versions
DecSmith42 Jan 4, 2025
699cbc8
fix(reporter): resolve bug in log message splitting logic
DecSmith42 Jan 4, 2025
541b964
fix(dotnet-tools): replace 'install' with 'update' for dotnet tools
DecSmith42 Jan 4, 2025
9b0220b
chore: rebuild workflows
DecSmith42 Jan 4, 2025
d7e3639
fix(params): ensure cached value uses converted result
DecSmith42 Jan 4, 2025
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 .devops/workflows/Test_BuildPrivateNugetFeed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- checkout: self
fetchDepth: 0

- script: dotnet tool install --global DecSm.Atom.Tool --prerelease
- script: dotnet tool update --global DecSm.Atom.Tool --prerelease
displayName: 'Install atom tool'

- script: |
Expand Down
2 changes: 1 addition & 1 deletion .devops/workflows/Test_ValidatePrivateNugetFeed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- checkout: self
fetchDepth: 0

- script: dotnet tool install --global DecSm.Atom.Tool --prerelease
- script: dotnet tool update --global DecSm.Atom.Tool --prerelease
displayName: 'Install atom tool'

- script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Test_BuildPrivateNugetFeed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
with:
fetch-depth: 0
- name: Install atom tool
run: dotnet tool install --global DecSm.Atom.Tool --prerelease
run: dotnet tool update --global DecSm.Atom.Tool --prerelease
shell: bash

- name: Setup NuGet
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Test_ValidatePrivateNugetFeed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
with:
fetch-depth: 0
- name: Install atom tool
run: dotnet tool install --global DecSm.Atom.Tool --prerelease
run: dotnet tool update --global DecSm.Atom.Tool --prerelease
shell: bash

- name: Setup NuGet
Expand Down
4 changes: 2 additions & 2 deletions DecSm.Atom.Module.AzureKeyVault/DecSm.Atom.Module.AzureKeyVault.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions DecSm.Atom.Module.AzureStorage/DecSm.Atom.Module.AzureStorage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions DecSm.Atom.Module.DevopsWorkflows/DecSm.Atom.Module.DevopsWorkflows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion DecSm.Atom.Module.DevopsWorkflows/Generation/DevopsWorkflowWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ private void WriteStep(WorkflowModel workflow, IWorkflowTargetModel step, Workfl
.ToList();

// TODO: Remove preview flag once v1.0.0 is released
using (WriteSection("- script: dotnet tool install --global DecSm.Atom.Tool --prerelease"))
using (WriteSection("- script: dotnet tool update --global DecSm.Atom.Tool --prerelease"))
WriteLine("displayName: 'Install atom tool'");

WriteLine();
Expand Down
4 changes: 2 additions & 2 deletions DecSm.Atom.Module.Dotnet/DecSm.Atom.Module.Dotnet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions DecSm.Atom.Module.Dotnet/DotnetToolService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void InstallTool(string toolName, string? version = null, bool global = true, bo
: string.Empty;

GetService<ProcessRunner>()
.Run(new("dotnet", $"tool install {toolName} {versionFlag} {globalFlag}")
.Run(new("dotnet", $"tool update {toolName} {versionFlag} {globalFlag}")
{
InvocationLogLevel = LogLevel.Debug,
});
Expand Down Expand Up @@ -97,7 +97,7 @@ await GetService<ProcessRunner>()
: string.Empty;

await GetService<ProcessRunner>()
.RunAsync(new("dotnet", $"tool install {toolName} {versionFlag} {globalFlag}")
.RunAsync(new("dotnet", $"tool update {toolName} {versionFlag} {globalFlag}")
{
InvocationLogLevel = LogLevel.Debug,
});
Expand Down
4 changes: 2 additions & 2 deletions DecSm.Atom.Module.GitVersion/DecSm.Atom.Module.GitVersion.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
16 changes: 8 additions & 8 deletions DecSm.Atom.Module.GithubWorkflows.Tests/DecSm.Atom.Module.GithubWorkflows.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,39 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FakeItEasy" Version="8.3.0"/>
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
<PackageReference Include="NUnit" Version="4.2.2"/>
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
<PackageReference Include="Shouldly" Version="4.2.1"/>
<PackageReference Include="Spectre.Console.Testing" Version="0.49.1"/>
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.1.7" />
<PackageReference Include="Verify.NUnit" Version="28.4.0"/>
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.2.1" />
<PackageReference Include="Verify.NUnit" Version="28.7.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
<PackageReference Include="NUnit.Analyzers" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions DecSm.Atom.Module.GithubWorkflows/DecSm.Atom.Module.GithubWorkflows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion DecSm.Atom.Module.GithubWorkflows/Generation/GithubWorkflowWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ private void WriteStep(WorkflowModel workflow, IWorkflowTargetModel step, Workfl
// TODO: Remove preview flag once v1.0.0 is released
using (WriteSection("- name: Install atom tool"))
{
WriteLine("run: dotnet tool install --global DecSm.Atom.Tool --prerelease");
WriteLine("run: dotnet tool update --global DecSm.Atom.Tool --prerelease");
WriteLine("shell: bash");
}

Expand Down
31 changes: 15 additions & 16 deletions DecSm.Atom.SourceGenerators.Tests/DecSm.Atom.SourceGenerators.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,42 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Basic.Reference.Assemblies.Net80" Version="1.7.9" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="Basic.Reference.Assemblies.Net80" Version="1.7.9"/>
<PackageReference Include="coverlet.collector" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"
Version="4.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="Verify.NUnit" Version="28.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
<PackageReference Include="NUnit" Version="4.3.2"/>
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
<PackageReference Include="Shouldly" Version="4.2.1"/>
<PackageReference Include="Verify.NUnit" Version="28.7.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
<PackageReference Include="NUnit.Analyzers" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DecSm.Atom\DecSm.Atom.csproj" />
<ProjectReference Include="..\DecSm.Atom.SourceGenerators\DecSm.Atom.SourceGenerators.csproj" />
<ProjectReference Include="..\DecSm.Atom\DecSm.Atom.csproj"/>
<ProjectReference Include="..\DecSm.Atom.SourceGenerators\DecSm.Atom.SourceGenerators.csproj"/>
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions DecSm.Atom.SourceGenerators/DecSm.Atom.SourceGenerators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions DecSm.Atom.TestUtils/DecSm.Atom.TestUtils.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@

<ItemGroup>
<PackageReference Include="Spectre.Console.Testing" Version="0.49.1"/>
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.1.7" />
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.2.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0"/>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading
Loading