Merge pull request #140 from vcsjones/minor-improvements

Bump package versions and display better help
vcsjones · Sep 13, 2021 · a4f1d84 · a4f1d84
2 parents a67eca5 + 87567a2
commit a4f1d84
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 15 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -11,5 +11,5 @@ jobs:
       name: Checkout
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.100'
+        dotnet-version: '3.1.412'
     - run: dotnet test
diff --git a/src/AzureSign.Core/AzureSign.Core.csproj b/src/AzureSign.Core/AzureSign.Core.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.18" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AzureSignTool/AzureSignTool.csproj b/src/AzureSignTool/AzureSignTool.csproj
@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.2.0-preview.2" />
-    <PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.0.2" />
+    <PackageReference Include="Azure.Identity" Version="1.4.1" />
+    <PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.2.0" />
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.18" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.18" />
     <PackageReference Include="RSAKeyVaultProvider" Version="2.1.1" />
   </ItemGroup>
 

diff --git a/src/AzureSignTool/Program.cs b/src/AzureSignTool/Program.cs
@@ -15,18 +15,13 @@ public static int Main(string[] args)
                 Console.Error.WriteLine("Azure Sign Tool is only supported on Windows.");
                 return E_PLATFORMNOTSUPPORTED;
             }
-            var application = new CommandLineApplication<Program>();
+            var application = new CommandLineApplication<SignApplication>();
             application.ValueParsers.Add(new HashAlgorithmNameValueParser());
-            application.ShowHint();
             application.Command<SignCommand>("sign", config =>
             {
                 config.Description = "Signs a file.";
-                config.Conventions.UseDefaultConventions();
-            });
-            application.Command(string.Empty, config => {
-                application.ShowHelp();
-                application.ShowHint();
             });
+            application.Conventions.UseDefaultConventions();
             application.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.StopParsingAndCollect;
             return application.Execute(args);
         }

diff --git a/src/AzureSignTool/SignApplication.cs b/src/AzureSignTool/SignApplication.cs
@@ -0,0 +1,20 @@
+using McMaster.Extensions.CommandLineUtils;
+
+namespace AzureSignTool
+{
+    internal sealed class SignApplication
+    {
+        private readonly CommandLineApplication _current;
+
+        public SignApplication(CommandLineApplication current)
+        {
+            _current = current;
+        }
+
+        public int OnExecute()
+        {
+            _current.ShowHelp();
+            return 1;
+        }
+    }
+}
diff --git a/test/AzureSignTool.Tests/HelpTests.cs b/test/AzureSignTool.Tests/HelpTests.cs
@@ -16,7 +16,7 @@ public void BlankInputShouldShowHelpOutput()
             });
 
             Assert.Contains("Usage:", StdOut);
-            Assert.Equal(0, ExitCode);
+            Assert.Equal(1, ExitCode);
         }
 
         [Fact]
@@ -26,7 +26,7 @@ public void BlankInputForSignCommandShouldShowHelpOutput()
                 return Program.Main(new string[] { "sign" });
             });
 
-            Assert.Contains("Usage:", StdOut);
+            Assert.Contains("--help", StdOut);
             Assert.NotEqual(0, ExitCode);
         }