* Remove Lingo entirely

Timwi · Timwi · commit 9fd7bba2e7df · 2024-09-25T18:49:18.000+02:00
* Upgrade RT libraries
* Move Test1Cmd class to separate file
* Add a test for subcommands that uses JSON comparison to test the whole result
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,9 +47,6 @@ jobs:
       - name: "dotnet pack: ${{ env.VER_STR }}"
         run: dotnet pack Src/RT.CommandLine.csproj --configuration Release -p:InformationalVersion="${{env.VER_STR}}" -p:VersionPrefix=${{env.VER_NUM}} -p:VersionSuffix=${{env.VER_SUF}} -p:FileVersion=${{env.VER_NUM}} -p:AssemblyVersion=${{env.VER_NUM}} -o Publish
 
-      - name: "dotnet pack Lingo: ${{ env.VER_STR }}"
-        run: dotnet pack SrcLingo/RT.CommandLine.Lingo.csproj --configuration Release -p:InformationalVersion="${{env.VER_STR}}" -p:VersionPrefix=${{env.VER_NUM}} -p:VersionSuffix=${{env.VER_SUF}} -p:FileVersion=${{env.VER_NUM}} -p:AssemblyVersion=${{env.VER_NUM}} -o Publish
-
       - name: Push to NuGet
         run: dotnet nuget push Publish/*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
 
diff --git a/External/RT.Util b/External/RT.Util
@@ -1 +1 @@
-Subproject commit 0b24fb8af9318edf2fb1b45d6d97b728133fcde8
+Subproject commit cd73ade4acf2f491d0f7a49a5c2e50392a1ad7f0
diff --git a/RT.CommandLine.sln b/RT.CommandLine.sln
@@ -4,8 +4,6 @@ VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RT.CommandLine", "Src\RT.CommandLine.csproj", "{DED68431-337E-439C-94E4-ACE2E5363178}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RT.CommandLine.Lingo", "SrcLingo\RT.CommandLine.Lingo.csproj", "{DC6401A1-14F1-44E3-A121-43CC2F192809}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RT.CommandLine.Tests", "Tests\RT.CommandLine.Tests.csproj", "{294D2B02-3FA6-4B9A-82BF-F80396943892}"
 EndProject
 Global
@@ -18,10 +16,6 @@ Global
 		{DED68431-337E-439C-94E4-ACE2E5363178}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DED68431-337E-439C-94E4-ACE2E5363178}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DED68431-337E-439C-94E4-ACE2E5363178}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC6401A1-14F1-44E3-A121-43CC2F192809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC6401A1-14F1-44E3-A121-43CC2F192809}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC6401A1-14F1-44E3-A121-43CC2F192809}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC6401A1-14F1-44E3-A121-43CC2F192809}.Release|Any CPU.Build.0 = Release|Any CPU
 		{294D2B02-3FA6-4B9A-82BF-F80396943892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{294D2B02-3FA6-4B9A-82BF-F80396943892}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{294D2B02-3FA6-4B9A-82BF-F80396943892}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Src/CommandLine.cs b/Src/CommandLine.cs
@@ -1,4 +1,4 @@
-﻿using System.Reflection;
+using System.Reflection;
 using RT.Internal;
 using RT.PostBuild;
 using RT.Util;
diff --git a/Src/RT.CommandLine.csproj b/Src/RT.CommandLine.csproj
@@ -16,8 +16,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="RT.PostBuild" Version="2.0.1770" />
-    <PackageReference Include="RT.Util.Core" Version="2.0.1770" />
+    <PackageReference Include="RT.PostBuild" Version="2.0.1774" />
+    <PackageReference Include="RT.Util.Core" Version="2.0.1774" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SrcLingo/CommandLine.cs b/SrcLingo/CommandLine.cs
diff --git a/SrcLingo/RT.CommandLine.Lingo.csproj b/SrcLingo/RT.CommandLine.Lingo.csproj
diff --git a/Tests/CommandLineLingoTests.cs b/Tests/CommandLineLingoTests.cs
diff --git a/Tests/CommandLineTests.cs b/Tests/CommandLineTests.cs
@@ -1,4 +1,6 @@
-﻿using RT.Util.Consoles;
+﻿using RT.Json;
+using RT.Serialization;
+using RT.Util.Consoles;
 using Xunit;
 
 namespace RT.CommandLine.Tests;
@@ -92,50 +94,6 @@ public static void TestInvalidOption()
         }
     }
 
-
-    class Test1Cmd : ICommandLineValidatable
-    {
-        [IsPositional, IsMandatory]
-        public string Base;
-
-        [IsPositional, IsMandatory]
-        public Test1SubcommandBase Subcommand;
-
-        public static int ValidateCalled = 0;
-
-        public ConsoleColoredString Validate()
-        {
-            ValidateCalled++;
-            return null;
-        }
-    }
-
-    [CommandGroup]
-    abstract class Test1SubcommandBase : ICommandLineValidatable
-    {
-        public static int ValidateCalled = 0;
-        public abstract ConsoleColoredString Validate();
-    }
-
-    [CommandName("sub1")]
-    sealed class Test1Subcommand1 : Test1SubcommandBase
-    {
-        [IsPositional, IsMandatory]
-        public string ItemName;
-
-        public override ConsoleColoredString Validate()
-        {
-            ValidateCalled++;
-            return null;
-        }
-    }
-
-    [CommandName("sub2")]
-    sealed class Test1Subcommand2 : Test1SubcommandBase
-    {
-        public override ConsoleColoredString Validate() { return null; }
-    }
-
     [Fact]
     public static void TestSubcommandValidation()
     {
@@ -157,4 +115,16 @@ public static void TestSubcommandValidation()
         Assert.Equal(1, Test1Cmd.ValidateCalled);
         Assert.Equal(0, Test1SubcommandBase.ValidateCalled);
     }
+
+    [Fact]
+    public static void TestMore()
+    {
+        Assert.True(
+            JsonValue.Parse(@"{""Boolean"":true,""Subcommand"":{""SharedString"":null,""Name"":""this"","":type"":""Test2SubcommandAdd""}}")
+            == ClassifyJson.Serialize(CommandLineParser.Parse<Test2Cmd>(["-b", "add", "this"])));
+
+        Assert.True(
+            JsonValue.Parse(@"{""Boolean"":false,""Subcommand"":{""SharedString"":null,""Id"":""this"","":type"":""Test2SubcommandDelete""}}")
+            == ClassifyJson.Serialize(CommandLineParser.Parse<Test2Cmd>(["del", "this"])));
+    }
 }
diff --git a/Tests/RT.CommandLine.Tests.csproj b/Tests/RT.CommandLine.Tests.csproj
@@ -9,8 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="RT.Serialization" Version="2.0.1774" />
+    <PackageReference Include="RT.Serialization.Json" Version="2.0.1774" />
+    <PackageReference Include="xunit" Version="2.9.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -22,7 +24,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SrcLingo\RT.CommandLine.Lingo.csproj" />
     <ProjectReference Include="..\Src\RT.CommandLine.csproj" />
   </ItemGroup>
 
diff --git a/Tests/Test1.cs b/Tests/Test1.cs
@@ -0,0 +1,46 @@
+﻿using RT.Util.Consoles;
+
+namespace RT.CommandLine.Tests;
+
+class Test1Cmd : ICommandLineValidatable
+{
+    [IsPositional, IsMandatory]
+    public string Base;
+
+    [IsPositional, IsMandatory]
+    public Test1SubcommandBase Subcommand;
+
+    public static int ValidateCalled = 0;
+
+    public ConsoleColoredString Validate()
+    {
+        ValidateCalled++;
+        return null;
+    }
+}
+
+[CommandGroup]
+abstract class Test1SubcommandBase : ICommandLineValidatable
+{
+    public static int ValidateCalled = 0;
+    public abstract ConsoleColoredString Validate();
+}
+
+[CommandName("sub1")]
+sealed class Test1Subcommand1 : Test1SubcommandBase
+{
+    [IsPositional, IsMandatory]
+    public string ItemName;
+
+    public override ConsoleColoredString Validate()
+    {
+        ValidateCalled++;
+        return null;
+    }
+}
+
+[CommandName("sub2")]
+sealed class Test1Subcommand2 : Test1SubcommandBase
+{
+    public override ConsoleColoredString Validate() { return null; }
+}
diff --git a/Tests/Test2.cs b/Tests/Test2.cs
@@ -0,0 +1,30 @@
+﻿namespace RT.CommandLine.Tests;
+
+class Test2Cmd
+{
+    [Option("-b")]
+    public bool Boolean;
+
+    public Test2Subcommand Subcommand;
+}
+
+[CommandGroup]
+abstract class Test2Subcommand
+{
+    [Option("-k")]
+    public string SharedString;
+}
+
+[CommandName("add")]
+class Test2SubcommandAdd : Test2Subcommand
+{
+    [IsPositional, IsMandatory]
+    public string Name;
+}
+
+[CommandName("del")]
+class Test2SubcommandDelete : Test2Subcommand
+{
+    [IsPositional, IsMandatory]
+    public string Id;
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Reflection;`
	`1`	`+using System.Reflection;`
`2`	`2`	`using RT.Internal;`
`3`	`3`	`using RT.PostBuild;`
`4`	`4`	`using RT.Util;`