Skip to content

Migrate to new cli hosting framework for the cli app #21

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
darthsharp merged 7 commits into from
Jan 31, 2026
Merged

Migrate to new cli hosting framework for the cli app #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
586d3d3
Introduce CLI application and commands for GitTool
darthsharp Jan 31, 2026
ac0fc11
Add branch commands: list, info, pull, and push
darthsharp Jan 31, 2026
11dcbb8
Refactor CLI directory and project structure
darthsharp Jan 31, 2026
c85c9ca
Add `UpdateBranchesCommand` to update local permanent branches
darthsharp Jan 31, 2026
18a6bab
Remove GitTool CLI commands and related implementations
darthsharp Jan 31, 2026
3003393
Add `CreateReleaseCommand` to manage Git release workflow
darthsharp Jan 31, 2026
c578afe
Add `SetupCommand` for repository configuration and refactor `ShowCon…
darthsharp Jan 31, 2026
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
62 changes: 17 additions & 45 deletions GitTools.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "source", "source", "{35D676
Directory.Build.props = source\Directory.Build.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commands", "Commands", "{4AD18751-E2F6-40F3-99F6-69FA2320CA30}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.Git.Abstractions", "source\Git\CreativeCoders.Git.Abstractions\CreativeCoders.Git.Abstractions.csproj", "{AD6C98CD-A96D-4795-B9A7-F321D6597C11}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.Git.Auth.CredentialManagerCore", "source\Git\CreativeCoders.Git.Auth.CredentialManagerCore\CreativeCoders.Git.Auth.CredentialManagerCore.csproj", "{0858E655-2326-48F6-85FA-01E068A0331F}"
Expand All @@ -34,12 +32,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.GitTool.GitH
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.GitTool.GitLab", "source\GitTool\CreativeCoders.GitTool.GitLab\CreativeCoders.GitTool.GitLab.csproj", "{F79BE247-8C60-4A51-B538-B2387C2D357F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.GitTool.Commands.Branches", "source\GitTool\Commands\CreativeCoders.GitTool.Commands.Branches\CreativeCoders.GitTool.Commands.Branches.csproj", "{1589F267-9A07-470B-A13C-9FE1CE5016B5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.GitTool.Commands.Features", "source\GitTool\Commands\CreativeCoders.GitTool.Commands.Features\CreativeCoders.GitTool.Commands.Features.csproj", "{0B7EBFC9-9D04-4F2C-8B63-387F2A2AAAD9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.GitTool.Cli", "source\GitTool\CreativeCoders.GitTool.Cli\CreativeCoders.GitTool.Cli.csproj", "{35C347B1-6DA0-4D9F-8259-928C561EEF8C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.Git.Auth.CredentialManagerCore.UnitTests", "tests\CreativeCoders.Git.Auth.CredentialManagerCore.UnitTests\CreativeCoders.Git.Auth.CredentialManagerCore.UnitTests.csproj", "{0E6E1AE1-7176-4D40-96AE-7A9FDC4D3223}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.Git.UnitTests", "tests\CreativeCoders.Git.UnitTests\CreativeCoders.Git.UnitTests.csproj", "{8E5F6024-5850-4272-9A9D-45CF566C526A}"
Expand All @@ -48,14 +40,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.GitTool.GitH
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.GitTool.GitLab.UnitTests", "tests\CreativeCoders.GitTool.GitLab.UnitTests\CreativeCoders.GitTool.GitLab.UnitTests.csproj", "{40CB3BB2-1AD4-4008-8D61-C179342F07F2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.GitTool.Commands.Releases", "source\GitTool\Commands\CreativeCoders.GitTool.Commands.Releases\CreativeCoders.GitTool.Commands.Releases.csproj", "{9F00E2AF-FA50-49DD-B6B0-3330E2883044}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreativeCoders.GitTool.Commands.Tool", "source\GitTool\Commands\CreativeCoders.GitTool.Commands.Tool\CreativeCoders.GitTool.Commands.Tool.csproj", "{E0E53B66-17F8-4A01-A799-8998FD0A20ED}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E4F28808-C129-4AE9-8454-08EAB02D7E7F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreativeCoders.GitTool.Commands.Shared", "source\GitTool\Commands\CreativeCoders.GitTool.Commands.Shared\CreativeCoders.GitTool.Commands.Shared.csproj", "{FC8C53FC-85DB-4A43-9D80-CEFF9047250E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__global", "__global", "{957CFE00-6B57-4EBF-BEE2-319A5C7B9EF9}"
ProjectSection(SolutionItems) = preProject
.gitattributes = .gitattributes
Expand Down Expand Up @@ -88,6 +74,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DE982092
build.sh = build.sh
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cli", "Cli", "{D65676E3-6820-464B-8493-597E3E1DCD98}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreativeCoders.GitTool.Cli.GtApp", "source\GitTool\CreativeCoders.GitTool.Cli.GtApp\CreativeCoders.GitTool.Cli.GtApp.csproj", "{46156AAB-B9F6-4C99-AD0A-9F370DB87679}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreativeCoders.GitTool.Cli.Commands", "source\GitTool\CreativeCoders.GitTool.Cli.Commands\CreativeCoders.GitTool.Cli.Commands.csproj", "{80C7112B-7D72-4585-BDFA-101289319B2C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -118,18 +110,6 @@ Global
{F79BE247-8C60-4A51-B538-B2387C2D357F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F79BE247-8C60-4A51-B538-B2387C2D357F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F79BE247-8C60-4A51-B538-B2387C2D357F}.Release|Any CPU.Build.0 = Release|Any CPU
{1589F267-9A07-470B-A13C-9FE1CE5016B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1589F267-9A07-470B-A13C-9FE1CE5016B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1589F267-9A07-470B-A13C-9FE1CE5016B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1589F267-9A07-470B-A13C-9FE1CE5016B5}.Release|Any CPU.Build.0 = Release|Any CPU
{0B7EBFC9-9D04-4F2C-8B63-387F2A2AAAD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B7EBFC9-9D04-4F2C-8B63-387F2A2AAAD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B7EBFC9-9D04-4F2C-8B63-387F2A2AAAD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B7EBFC9-9D04-4F2C-8B63-387F2A2AAAD9}.Release|Any CPU.Build.0 = Release|Any CPU
{35C347B1-6DA0-4D9F-8259-928C561EEF8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{35C347B1-6DA0-4D9F-8259-928C561EEF8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{35C347B1-6DA0-4D9F-8259-928C561EEF8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{35C347B1-6DA0-4D9F-8259-928C561EEF8C}.Release|Any CPU.Build.0 = Release|Any CPU
{0E6E1AE1-7176-4D40-96AE-7A9FDC4D3223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E6E1AE1-7176-4D40-96AE-7A9FDC4D3223}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E6E1AE1-7176-4D40-96AE-7A9FDC4D3223}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -146,47 +126,39 @@ Global
{40CB3BB2-1AD4-4008-8D61-C179342F07F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40CB3BB2-1AD4-4008-8D61-C179342F07F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40CB3BB2-1AD4-4008-8D61-C179342F07F2}.Release|Any CPU.Build.0 = Release|Any CPU
{9F00E2AF-FA50-49DD-B6B0-3330E2883044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F00E2AF-FA50-49DD-B6B0-3330E2883044}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F00E2AF-FA50-49DD-B6B0-3330E2883044}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F00E2AF-FA50-49DD-B6B0-3330E2883044}.Release|Any CPU.Build.0 = Release|Any CPU
{E0E53B66-17F8-4A01-A799-8998FD0A20ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E0E53B66-17F8-4A01-A799-8998FD0A20ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0E53B66-17F8-4A01-A799-8998FD0A20ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E0E53B66-17F8-4A01-A799-8998FD0A20ED}.Release|Any CPU.Build.0 = Release|Any CPU
{FC8C53FC-85DB-4A43-9D80-CEFF9047250E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FC8C53FC-85DB-4A43-9D80-CEFF9047250E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FC8C53FC-85DB-4A43-9D80-CEFF9047250E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FC8C53FC-85DB-4A43-9D80-CEFF9047250E}.Release|Any CPU.Build.0 = Release|Any CPU
{06510226-737C-4300-92A5-3FE3C5E4D6A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{06510226-737C-4300-92A5-3FE3C5E4D6A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46156AAB-B9F6-4C99-AD0A-9F370DB87679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46156AAB-B9F6-4C99-AD0A-9F370DB87679}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46156AAB-B9F6-4C99-AD0A-9F370DB87679}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46156AAB-B9F6-4C99-AD0A-9F370DB87679}.Release|Any CPU.Build.0 = Release|Any CPU
{80C7112B-7D72-4585-BDFA-101289319B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80C7112B-7D72-4585-BDFA-101289319B2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80C7112B-7D72-4585-BDFA-101289319B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80C7112B-7D72-4585-BDFA-101289319B2C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{90C87656-57A8-4AE9-8619-DA08AA137D6A} = {35D676C5-4FB7-41AB-A60B-DD8F30ACFB5B}
{EA56F26E-54C0-4C1C-986C-2785829AE2D8} = {35D676C5-4FB7-41AB-A60B-DD8F30ACFB5B}
{4AD18751-E2F6-40F3-99F6-69FA2320CA30} = {90C87656-57A8-4AE9-8619-DA08AA137D6A}
{AD6C98CD-A96D-4795-B9A7-F321D6597C11} = {EA56F26E-54C0-4C1C-986C-2785829AE2D8}
{0858E655-2326-48F6-85FA-01E068A0331F} = {EA56F26E-54C0-4C1C-986C-2785829AE2D8}
{25BCE0B9-068F-4EC0-BCD0-680B3FE47626} = {EA56F26E-54C0-4C1C-986C-2785829AE2D8}
{CF40538D-E176-4449-B27F-22BB43E5BFD6} = {90C87656-57A8-4AE9-8619-DA08AA137D6A}
{8B3F3455-5D00-47A3-B40E-F3E3E3C5E5DA} = {90C87656-57A8-4AE9-8619-DA08AA137D6A}
{F79BE247-8C60-4A51-B538-B2387C2D357F} = {90C87656-57A8-4AE9-8619-DA08AA137D6A}
{1589F267-9A07-470B-A13C-9FE1CE5016B5} = {4AD18751-E2F6-40F3-99F6-69FA2320CA30}
{0B7EBFC9-9D04-4F2C-8B63-387F2A2AAAD9} = {4AD18751-E2F6-40F3-99F6-69FA2320CA30}
{35C347B1-6DA0-4D9F-8259-928C561EEF8C} = {90C87656-57A8-4AE9-8619-DA08AA137D6A}
{0E6E1AE1-7176-4D40-96AE-7A9FDC4D3223} = {B7558045-D005-49D4-9205-55A32B6C99DE}
{8E5F6024-5850-4272-9A9D-45CF566C526A} = {B7558045-D005-49D4-9205-55A32B6C99DE}
{B6FE210C-94B0-4D65-A881-42FA3F3A9856} = {B7558045-D005-49D4-9205-55A32B6C99DE}
{40CB3BB2-1AD4-4008-8D61-C179342F07F2} = {B7558045-D005-49D4-9205-55A32B6C99DE}
{9F00E2AF-FA50-49DD-B6B0-3330E2883044} = {4AD18751-E2F6-40F3-99F6-69FA2320CA30}
{E0E53B66-17F8-4A01-A799-8998FD0A20ED} = {4AD18751-E2F6-40F3-99F6-69FA2320CA30}
{FC8C53FC-85DB-4A43-9D80-CEFF9047250E} = {4AD18751-E2F6-40F3-99F6-69FA2320CA30}
{06510226-737C-4300-92A5-3FE3C5E4D6A4} = {E4F28808-C129-4AE9-8454-08EAB02D7E7F}
{E91F4387-0278-43C4-AE97-E9C54E414C41} = {957CFE00-6B57-4EBF-BEE2-319A5C7B9EF9}
{DE982092-6508-4062-99D5-6A6EE9ECB81F} = {957CFE00-6B57-4EBF-BEE2-319A5C7B9EF9}
{D65676E3-6820-464B-8493-597E3E1DCD98} = {90C87656-57A8-4AE9-8619-DA08AA137D6A}
{46156AAB-B9F6-4C99-AD0A-9F370DB87679} = {D65676E3-6820-464B-8493-597E3E1DCD98}
{80C7112B-7D72-4585-BDFA-101289319B2C} = {D65676E3-6820-464B-8493-597E3E1DCD98}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D38E5978-8FB3-474B-BDCB-18853E21A429}
Expand Down
2 changes: 1 addition & 1 deletion build/Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CreativeCoders.CakeBuild" Version="6.1.0" />
<PackageReference Include="CreativeCoders.CakeBuild" Version="6.2.0"/>
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions build/BuildContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ public class BuildContext(ICakeContext context)

public DirectoryPath PublishOutputDir => ArtifactsDir.Combine("published");

private const string CliPath = "source/GitTool/CreativeCoders.GitTool.Cli";
private const string CliPath = "source/GitTool/CreativeCoders.GitTool.Cli.GtApp";

private const string CliProjectFile = "CreativeCoders.GitTool.Cli.csproj";
private const string CliProjectFile = "CreativeCoders.GitTool.Cli.GtApp.csproj";

public IEnumerable<PublishingItem> PublishingItems =>
[
Expand Down
4 changes: 2 additions & 2 deletions source/Git/CreativeCoders.Git.Abstractions/CreativeCoders.Git.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CreativeCoders.Core" Version="6.1.0" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.4" />
<PackageReference Include="CreativeCoders.Core" Version="6.2.0"/>
<PackageReference Include="JetBrains.Annotations" Version="2025.2.4"/>

</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion source/Git/CreativeCoders.Git.Abstractions/IGitRepositoryFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ public interface IGitRepositoryFactory
IGitRepository OpenRepository(string? path);

IGitRepository OpenRepositoryFromCurrentDir();
}
}
6 changes: 3 additions & 3 deletions source/Git/CreativeCoders.Git/CreativeCoders.Git.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CreativeCoders.Core" Version="6.1.0" />
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
<PackageReference Include="CreativeCoders.Core" Version="6.2.0"/>
<PackageReference Include="LibGit2Sharp" Version="0.31.0"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2"/>
</ItemGroup>

<ItemGroup>
Expand Down
50 changes: 0 additions & 50 deletions source/GitTool/Commands/CreativeCoders.GitTool.Commands.Branches/BranchesController.cs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...GitTool/Commands/CreativeCoders.GitTool.Commands.Branches/Commands/List/BranchLocation.cs
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions ...Tool/Commands/CreativeCoders.GitTool.Commands.Branches/Commands/Pull/PullBranchCommand.cs
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions ...Tool/Commands/CreativeCoders.GitTool.Commands.Branches/Commands/Pull/PullBranchOptions.cs
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...Tool/Commands/CreativeCoders.GitTool.Commands.Branches/Commands/Push/PushBranchCommand.cs
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions .../CreativeCoders.GitTool.Commands.Branches/CreativeCoders.GitTool.Commands.Branches.csproj
View file
Open in desktop

This file was deleted.

Loading