Add PowerKit, update PolyShim to 2.10.1, remove hand-written utility equivalents

CliFx.Generators/Binding/CommandInputSymbol.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using CliFx.Generators.Utils.Extensions;
 using Microsoft.CodeAnalysis;
+using PowerKit.Extensions;
 
 namespace CliFx.Generators.Binding;
 

CliFx.Generators/Binding/CommandOptionSymbol.cs

@@ -5,6 +5,7 @@
 using CliFx.Generators.Utils;
 using CliFx.Generators.Utils.Extensions;
 using Microsoft.CodeAnalysis;
+using PowerKit.Extensions;
 
 namespace CliFx.Generators.Binding;
 

CliFx.Generators/Binding/CommandParameterSymbol.cs

@@ -5,6 +5,7 @@
 using CliFx.Generators.Utils;
 using CliFx.Generators.Utils.Extensions;
 using Microsoft.CodeAnalysis;
+using PowerKit.Extensions;
 
 namespace CliFx.Generators.Binding;
 

CliFx.Generators/CliFx.Generators.csproj

@@ -15,5 +15,6 @@
     <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
     <PackageReference Include="PolyShim" PrivateAssets="all" />
+    <PackageReference Include="PowerKit" PrivateAssets="all" />
   </ItemGroup>
 </Project>

CliFx.Generators/CommandDescriptorGenerator.cs

@@ -9,6 +9,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Text;
+using PowerKit.Extensions;
 
 namespace CliFx.Generators;
 

CliFx.Generators/Emitters/CommandDescriptor.cs

@@ -5,6 +5,7 @@
 using CliFx.Generators.Utils;
 using CliFx.Generators.Utils.Extensions;
 using Microsoft.CodeAnalysis;
+using PowerKit.Extensions;
 
 namespace CliFx.Generators.Emitters;
 

CliFx.Generators/Emitters/CommandRegistration.cs

@@ -5,6 +5,7 @@
 using CliFx.Generators.Utils;
 using CliFx.Generators.Utils.Extensions;
 using Microsoft.CodeAnalysis;
+using PowerKit.Extensions;
 
 namespace CliFx.Generators.Emitters;
 

CliFx.Tests/CliFx.Tests.csproj

@@ -18,6 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="PolyShim" PrivateAssets="all" />
+    <PackageReference Include="PowerKit" PrivateAssets="all" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
   </ItemGroup>

CliFx.Tests/Utils/CommandCompiler.cs

@@ -6,10 +6,10 @@
 using Basic.Reference.Assemblies;
 using CliFx.Binding;
 using CliFx.Generators;
-using CliFx.Tests.Utils.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
+using PowerKit.Extensions;
 
 namespace CliFx.Tests.Utils;
 

CliFx/Activation/CommandActivator.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using CliFx.Binding;
 using CliFx.Parsing;
-using CliFx.Utils.Extensions;
+using PowerKit.Extensions;
 
 namespace CliFx.Activation;
 

CliFx/Binding/CommandRootDescriptor.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using CliFx.Utils.Extensions;
+using PowerKit.Extensions;
 
 namespace CliFx.Binding;
 

CliFx/CliFx.csproj

@@ -36,6 +36,7 @@
   <ItemGroup>
     <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
     <PackageReference Include="PolyShim" PrivateAssets="all" />
+    <PackageReference Include="PowerKit" PrivateAssets="all" />
     <PackageReference
       Include="System.Threading.Tasks.Extensions"
       Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"

CliFx/CommandLineApplication.cs

@@ -9,6 +9,7 @@
 using CliFx.Infrastructure;
 using CliFx.Parsing;
 using CliFx.Utils.Extensions;
+using PowerKit.Extensions;
 
 namespace CliFx;
 
@@ -33,8 +34,12 @@ IReadOnlyDictionary<string, string> environmentVariables
         // Handle debug mode
         if (
             !string.IsNullOrWhiteSpace(configuration.DebugModeEnvironmentVariable)
-            && bool.ParseOrDefault(
-                environmentVariables.GetValueOrDefault(configuration.DebugModeEnvironmentVariable)
+            && (
+                bool.ParseOrNull(
+                    environmentVariables.GetValueOrDefault(
+                        configuration.DebugModeEnvironmentVariable
+                    )
+                ) ?? false
             )
         )
         {
@@ -55,8 +60,12 @@ IReadOnlyDictionary<string, string> environmentVariables
         // Handle preview mode
         if (
             !string.IsNullOrWhiteSpace(configuration.PreviewModeEnvironmentVariable)
-            && bool.ParseOrDefault(
-                environmentVariables.GetValueOrDefault(configuration.PreviewModeEnvironmentVariable)
+            && (
+                bool.ParseOrNull(
+                    environmentVariables.GetValueOrDefault(
+                        configuration.PreviewModeEnvironmentVariable
+                    )
+                ) ?? false
             )
         )
         {

CliFx/CommandLineApplicationBuilder.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using CliFx.Binding;
 using CliFx.Infrastructure;
-using CliFx.Utils.Extensions;
+using PowerKit.Extensions;
 
 namespace CliFx;
 

CliFx/Infrastructure/ConsoleExtensions.cs

@@ -1,5 +1,5 @@
 using System;
-using CliFx.Utils;
+using PowerKit;
 
 namespace CliFx.Infrastructure;
 

CliFx/Infrastructure/ConsoleWriter.cs

@@ -3,7 +3,7 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
-using CliFx.Utils.Extensions;
+using PowerKit.Extensions;
 
 namespace CliFx.Infrastructure;
 

CliFx/Parsing/ParsedCommandLine.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using CliFx.Utils.Extensions;
 
 namespace CliFx.Parsing;
 
@@ -126,7 +125,7 @@ ref int index
                     if (!string.IsNullOrWhiteSpace(lastOptionIdentifier))
                         result.Add(new ParsedOption(lastOptionIdentifier, lastOptionValues));
 
-                    lastOptionIdentifier = identifier.AsString();
+                    lastOptionIdentifier = identifier.ToString();
                     lastOptionValues = [];
                 }
             }