Skip to content

Commit b4e2cb1

Browse files
tsharptsharp
committedDec 5, 2024·
Fixing package name and adding some more options
1 parent a11d461 commit b4e2cb1

24 files changed

+278
-39
lines changed
 

‎Directory.Build.props

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818

1919
<!-- Don't expose experimental features -->
2020
<ExposeExperimentalFeatures Condition="'$(ExposeExperimentalFeatures)' == ''">false</ExposeExperimentalFeatures>
21+
22+
<!-- Use Lock File for Restores -->
23+
<!-- https://devblogs.microsoft.com/nuget/enable-repeatable-package-restores-using-a-lock-file/ -->
24+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
2125
</PropertyGroup>
2226

2327
<!-- Build Versioning -->

‎packages.lock.json

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": 2,
3+
"dependencies": {
4+
".NETFramework,Version=v4.5": {
5+
"Microsoft.Build.Artifacts": {
6+
"type": "Direct",
7+
"requested": "[6.1.10, )",
8+
"resolved": "6.1.10",
9+
"contentHash": "7B6h7yAZ6RD4osQSaIUnmMZ96RXPHUzyCrK/kAYQjyTO2i71LjOAdR0HjSus7HRwYhi94f2iZ+f0qMO9b2ykkQ=="
10+
}
11+
}
12+
}
13+
}

‎src/XArch.PlatformManagement.CommandLine.Sample/Modules/Test/HelloWorldCommand.cs ‎src/XArch.CommandLine.Sample/Modules/Test/HelloWorldCommand.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using XArch.PlatformManagement.CommandLine;
1+
using XArch.CommandLine;
22

3-
namespace XArch.PlatformManagement.CommandLine.Sample.Modules.Test
3+
namespace XArch.CommandLine.Sample.Modules.Test
44
{
55
[RegisterCommand(command: "hello")]
66
internal class HelloWorldCommand : CommandBase

‎src/XArch.PlatformManagement.CommandLine.Sample/Program.cs ‎src/XArch.CommandLine.Sample/Program.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
using Microsoft.Extensions.DependencyInjection;
44

5-
using XArch.PlatformManagement.CommandLine;
6-
7-
namespace XArch.PlatformManagement.CommandLine.Sample
5+
namespace XArch.CommandLine.Sample
86
{
97
internal class Program
108
{

‎src/XArch.PlatformManagement.CommandLine.Sample/XArch.PlatformManagement.CommandLine.Sample.csproj ‎src/XArch.CommandLine.Sample/XArch.CommandLine.Sample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<ProjectReference Include="..\XArch.PlatformManagement.CommandLine\XArch.PlatformManagement.CommandLine.csproj" />
19+
<ProjectReference Include="..\XArch.CommandLine\XArch.CommandLine.csproj" />
2020
</ItemGroup>
2121

2222
</Project>

‎src/XArch.CommandLine.Sample/packages.lock.json

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"version": 2,
3+
"dependencies": {
4+
"net8.0": {
5+
"Microsoft.Build.Artifacts": {
6+
"type": "Direct",
7+
"requested": "[6.1.10, )",
8+
"resolved": "6.1.10",
9+
"contentHash": "7B6h7yAZ6RD4osQSaIUnmMZ96RXPHUzyCrK/kAYQjyTO2i71LjOAdR0HjSus7HRwYhi94f2iZ+f0qMO9b2ykkQ=="
10+
},
11+
"Microsoft.Extensions.DependencyInjection": {
12+
"type": "Direct",
13+
"requested": "[8.0.0, )",
14+
"resolved": "8.0.0",
15+
"contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==",
16+
"dependencies": {
17+
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
18+
}
19+
},
20+
"System.CommandLine": {
21+
"type": "Direct",
22+
"requested": "[2.0.0-beta4.22272.1, )",
23+
"resolved": "2.0.0-beta4.22272.1",
24+
"contentHash": "1uqED/q2H0kKoLJ4+hI2iPSBSEdTuhfCYADeJrAqERmiGQ2NNacYKRNEQ+gFbU4glgVyK8rxI+ZOe1onEtr/Pg=="
25+
},
26+
"YamlDotNet": {
27+
"type": "Direct",
28+
"requested": "[16.2.1, )",
29+
"resolved": "16.2.1",
30+
"contentHash": "im6zTVgesjcfTRfuMpnx51Rg2svWenp/3q5XBfcIzgj8PNIkkSD2xEl9HWcVi2SaJPP9XcXUdzed9gSDEuf1TA=="
31+
},
32+
"Microsoft.Extensions.DependencyInjection.Abstractions": {
33+
"type": "Transitive",
34+
"resolved": "8.0.0",
35+
"contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg=="
36+
},
37+
"xarch.commandline": {
38+
"type": "Project",
39+
"dependencies": {
40+
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
41+
"System.CommandLine": "[2.0.0-beta4.22272.1, )",
42+
"System.Text.Json": "[8.0.5, )",
43+
"YamlDotNet": "[16.2.1, )"
44+
}
45+
},
46+
"System.Text.Json": {
47+
"type": "CentralTransitive",
48+
"requested": "[8.0.5, )",
49+
"resolved": "8.0.5",
50+
"contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg=="
51+
}
52+
}
53+
}
54+
}

‎src/XArch.PlatformManagement.CommandLine/CommandBase.cs ‎src/XArch.CommandLine/CommandBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
using Microsoft.Extensions.DependencyInjection;
77

8-
namespace XArch.PlatformManagement.CommandLine
8+
namespace XArch.CommandLine
99
{
1010
public abstract class CommandBase
1111
{

‎src/XArch.PlatformManagement.CommandLine/CommandContextDataProvider.cs ‎src/XArch.CommandLine/CommandContextDataProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.IO;
33

4-
namespace XArch.PlatformManagement.CommandLine
4+
namespace XArch.CommandLine
55
{
66
internal sealed class CommandContextDataProvider : ICommandContextDataProvider
77
{

‎src/XArch.PlatformManagement.CommandLine/CommandExecutionContext.cs ‎src/XArch.CommandLine/CommandExecutionContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.CommandLine.Invocation;
33

4-
namespace XArch.PlatformManagement.CommandLine
4+
namespace XArch.CommandLine
55
{
66
public class CommandExecutionContext : IDisposable
77
{

‎src/XArch.PlatformManagement.CommandLine/CommandRuntime.cs ‎src/XArch.CommandLine/CommandRuntime.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.CommandLine.Parsing;
44
using System.Threading.Tasks;
55

6-
namespace XArch.PlatformManagement.CommandLine
6+
namespace XArch.CommandLine
77
{
88
internal sealed class CommandRuntime : ICommandRuntime
99
{

‎src/XArch.PlatformManagement.CommandLine/CommandRuntimeBuilder.cs ‎src/XArch.CommandLine/CommandRuntimeBuilder.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using Microsoft.Extensions.DependencyInjection;
88

9-
namespace XArch.PlatformManagement.CommandLine
9+
namespace XArch.CommandLine
1010
{
1111
public sealed class CommandRuntimeBuilder
1212
{
@@ -140,7 +140,7 @@ private void GenerateAssemblyCommands(RootCommand rootCommand, Assembly assembly
140140
private void RegisterCommandHandlers()
141141
{
142142
// Services and configure commands now ...
143-
this.serviceProvider = serviceDescriptors.BuildServiceProvider();
143+
serviceProvider = serviceDescriptors.BuildServiceProvider();
144144

145145
foreach (var commandDescriptor in commandDescriptors)
146146
{

‎src/XArch.PlatformManagement.CommandLine/ContextData.cs ‎src/XArch.CommandLine/ContextData.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace XArch.PlatformManagement.CommandLine
1+
namespace XArch.CommandLine
22
{
33
public abstract class ContextData
44
{

‎src/XArch.PlatformManagement.CommandLine/ICommandContextDataProvider.cs ‎src/XArch.CommandLine/ICommandContextDataProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace XArch.PlatformManagement.CommandLine
1+
namespace XArch.CommandLine
22
{
33
public interface ICommandContextDataProvider
44
{

‎src/XArch.PlatformManagement.CommandLine/ICommandRuntime.cs ‎src/XArch.CommandLine/ICommandRuntime.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Threading.Tasks;
22

3-
namespace XArch.PlatformManagement.CommandLine
3+
namespace XArch.CommandLine
44
{
55
public interface ICommandRuntime
66
{

‎src/XArch.PlatformManagement.CommandLine/NamespaceContextData.cs ‎src/XArch.CommandLine/NamespaceContextData.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace XArch.PlatformManagement.CommandLine
1+
namespace XArch.CommandLine
22
{
33
internal class NamespaceContextData
44
{

‎src/XArch.PlatformManagement.CommandLine/NestedServiceProvider.cs ‎src/XArch.CommandLine/NestedServiceProvider.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
namespace XArch.PlatformManagement.CommandLine
3+
namespace XArch.CommandLine
44
{
55
internal sealed class NestedServiceProvider : IServiceProvider
66
{
@@ -15,8 +15,8 @@ public NestedServiceProvider(IServiceProvider parentServiceProvider, IServicePro
1515

1616
public object GetService(Type serviceType)
1717
{
18-
return this.serviceProvider.GetService(serviceType) ??
19-
this.parentServiceProvider.GetService(serviceType);
18+
return serviceProvider.GetService(serviceType) ??
19+
parentServiceProvider.GetService(serviceType);
2020
}
2121
}
2222
}

‎src/XArch.CommandLine/README.md

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# XArch.CommandLine
2+
3+
XArch.CommandLine is a library that provides a basic framework for building command-line applications. It is built on top of the `System.CommandLine` library and provides a more structured way to build command-line applications.
4+
5+
## Features
6+
- Dependency injection
7+
- Module-based architecture
8+
- REPL support
9+
- Command-line parsing and completion support from `System.CommandLine`
10+
- Context-aware commands and ability to save state between commands
11+
12+
## Example
13+
```CSharp
14+
internal class Program
15+
{
16+
static async Task Main(string[] args)
17+
{
18+
await CommandRuntimeBuilder
19+
.Create()
20+
.ConfigureServices(ConfigureServices)
21+
.RegisterModuleAssembly(Assembly.GetExecutingAssembly())
22+
.UseRepl()
23+
.Build()
24+
.RunAsync(args);
25+
}
26+
27+
private static void ConfigureServices(IServiceCollection services)
28+
{
29+
}
30+
}
31+
```

‎src/XArch.PlatformManagement.CommandLine/RegisterCommandAttribute.cs ‎src/XArch.CommandLine/RegisterCommandAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Text.RegularExpressions;
33

4-
namespace XArch.PlatformManagement.CommandLine
4+
namespace XArch.CommandLine
55
{
66

77
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]

‎src/XArch.PlatformManagement.CommandLine/Serialization.cs ‎src/XArch.CommandLine/Serialization.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using YamlDotNet.Serialization;
22
using YamlDotNet.Serialization.NamingConventions;
33

4-
namespace XArch.PlatformManagement.CommandLine
4+
namespace XArch.CommandLine
55
{
66
internal static class Serialization
77
{

‎src/XArch.CommandLine/XArch.CommandLine.csproj

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.1</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<LangVersion>latest</LangVersion>
7+
</PropertyGroup>
8+
9+
<PropertyGroup>
10+
<PackageId>XArch.CommandLine</PackageId>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
12+
<Authors>Travis Sharp</Authors>
13+
<EnablePackageValidation>true</EnablePackageValidation>
14+
<ApiCompatRespectInternals>true</ApiCompatRespectInternals>
15+
<!--<PackRelease>true</PackRelease>-->
16+
<!--<CopyDocumentationFilesFromPackages>true</CopyDocumentationFilesFromPackages>-->
17+
</PropertyGroup>
18+
19+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
20+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
21+
</PropertyGroup>
22+
23+
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
24+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
25+
</PropertyGroup>
26+
27+
<ItemGroup>
28+
<None Include="README.md" Pack="true" PackagePath="\"/>
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
33+
<PackageReference Include="YamlDotNet" />
34+
<PackageReference Include="System.Text.Json" />
35+
<PackageReference Include="System.CommandLine" />
36+
</ItemGroup>
37+
38+
</Project>

0 commit comments

Comments
 (0)
Please sign in to comment.