Reorgs solution

Tooling.sln

@@ -8,13 +8,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		config\versions.props = config\versions.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling.Library", "src\Steeltoe.Tooling.Library\Steeltoe.Tooling.Library.csproj", "{0C883901-4BDB-48D5-BCA8-46611D26B2A3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling", "src\Steeltoe.Tooling\Steeltoe.Tooling.csproj", "{0C883901-4BDB-48D5-BCA8-46611D26B2A3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling.Library.Test", "test\Steeltoe.Tooling.Library.Test\Steeltoe.Tooling.Library.Test.csproj", "{07D7EAA0-AE7F-4493-BAEE-B3FFF2ED74CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling.Test", "test\Steeltoe.Tooling.Test\Steeltoe.Tooling.Test.csproj", "{07D7EAA0-AE7F-4493-BAEE-B3FFF2ED74CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling.Cli", "src\Steeltoe.Tooling.Cli\Steeltoe.Tooling.Cli.csproj", "{51D148CB-D7E1-453F-9EC7-2381294C29A2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Cli", "src\Steeltoe.Cli\Steeltoe.Cli.csproj", "{51D148CB-D7E1-453F-9EC7-2381294C29A2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling.Cli.Feature", "test\Steeltoe.Tooling.Cli.Feature\Steeltoe.Tooling.Cli.Feature.csproj", "{BD4A2CBD-33AF-48C3-914D-8A7F58A15348}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Cli.Feature", "test\Steeltoe.Cli.Feature\Steeltoe.Cli.Feature.csproj", "{BD4A2CBD-33AF-48C3-914D-8A7F58A15348}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

scripts/install

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-toolProject=Steeltoe.Tooling.Cli
+toolProject=Steeltoe.Cli
 
 cd $(dirname $0)/..
 
-dotnet tool uninstall --global $toolProject
+dotnet tool uninstall --global $toolProject 2>/dev/null
 dotnet pack
 dotnet tool install --global --add-source src/$toolProject/bin/Debug $toolProject

scripts/install.ps1

@@ -1,4 +1,4 @@
-$globalToolProject = "Steeltoe.Tooling.Cli"
+$globalToolProject = "Steeltoe.Cli"
 
 Set-Location $PSScriptRoot\..
 

src/Steeltoe.Cli/AddCommand.cs

@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.ComponentModel.DataAnnotations;
 using McMaster.Extensions.CommandLineUtils;
 using Steeltoe.Tooling.Executor;
-using Steeltoe.Tooling.Executor.Service;
 
 // ReSharper disable UnassignedGetOnlyAutoProperty
 // ReSharper disable InconsistentNaming
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     [Command(Description = "Add a service.")]
     public class AddCommand : Command

src/Steeltoe.Cli/Command.cs

@@ -15,9 +15,10 @@
 using System;
 using System.IO;
 using McMaster.Extensions.CommandLineUtils;
+using Steeltoe.Tooling;
 using Steeltoe.Tooling.Executor;
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     public abstract class Command
     {

src/Steeltoe.Cli/CommandShell.cs

@@ -15,9 +15,10 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using Microsoft.Extensions.Logging;
+using Steeltoe.Tooling;
 using Steeltoe.Tooling.System;
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     public class CommandShell : Shell
     {

src/Steeltoe.Cli/DeployCommand.cs

@@ -12,16 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.ComponentModel.DataAnnotations;
 using McMaster.Extensions.CommandLineUtils;
 using Steeltoe.Tooling.Executor;
-using Steeltoe.Tooling.Executor.Service;
 
 // ReSharper disable UnassignedGetOnlyAutoProperty
 // ReSharper disable InconsistentNaming
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     [Command(Description = "Start enabled services in the targeted deployment environment.")]
     public class DeployCommand : Command

src/Steeltoe.Cli/DisableCommand.cs

@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.ComponentModel.DataAnnotations;
 using McMaster.Extensions.CommandLineUtils;
 using Steeltoe.Tooling.Executor;
-using Steeltoe.Tooling.Executor.Service;
 
 // ReSharper disable UnassignedGetOnlyAutoProperty
 // ReSharper disable InconsistentNaming
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     [Command(Description = "Disable a service.")]
     public class DisableCommand : Command

src/Steeltoe.Cli/EnableCommand.cs

@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.ComponentModel.DataAnnotations;
 using McMaster.Extensions.CommandLineUtils;
 using Steeltoe.Tooling.Executor;
-using Steeltoe.Tooling.Executor.Service;
 
 // ReSharper disable UnassignedGetOnlyAutoProperty
 // ReSharper disable InconsistentNaming
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     [Command(Description = "Enable a service.")]
     public class EnableCommand : Command

src/Steeltoe.Cli/ListCommand.cs

@@ -12,16 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.ComponentModel.DataAnnotations;
 using McMaster.Extensions.CommandLineUtils;
 using Steeltoe.Tooling.Executor;
-using Steeltoe.Tooling.Executor.Service;
 
 // ReSharper disable UnassignedGetOnlyAutoProperty
 // ReSharper disable InconsistentNaming
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     [Command(Description = "List services, service types, or deployment environments.  If run with no args, list everything.")]
     public class ListCommand : Command

src/Steeltoe.Cli/Program.cs

@@ -15,7 +15,7 @@
 using System.Reflection;
 using McMaster.Extensions.CommandLineUtils;
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     [Command(Name = "steeltoe", Description = "Steeltoe Developer Tools")]
     [VersionOptionFromMember("-V|--version", MemberName = nameof(GetVersion))]

src/Steeltoe.Cli/RemoveCommand.cs

@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using System.ComponentModel.DataAnnotations;
 using McMaster.Extensions.CommandLineUtils;
 using Steeltoe.Tooling.Executor;
-using Steeltoe.Tooling.Executor.Service;
 
 // ReSharper disable UnassignedGetOnlyAutoProperty
 // ReSharper disable InconsistentNaming
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     [Command(Description = "Remove a service.")]
     public class RemoveCommand : Command

src/Steeltoe.Cli/StatusCommand.cs

@@ -12,16 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.ComponentModel.DataAnnotations;
 using McMaster.Extensions.CommandLineUtils;
 using Steeltoe.Tooling.Executor;
-using Steeltoe.Tooling.Executor.Service;
 
 // ReSharper disable UnassignedGetOnlyAutoProperty
 // ReSharper disable InconsistentNaming
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     [Command(Description = "Show the status of a service in the targeted deployment environment.  If run with no args, show the status of all services.")]
     public class StatusCommand : Command

src/Steeltoe.Cli/Steeltoe.Cli.csproj

@@ -10,6 +10,6 @@
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtilsVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Steeltoe.Tooling.Library\Steeltoe.Tooling.Library.csproj" />
+    <ProjectReference Include="..\Steeltoe.Tooling\Steeltoe.Tooling.csproj" />
   </ItemGroup>
 </Project>

src/Steeltoe.Cli/TargetCommand.cs

@@ -12,16 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.ComponentModel.DataAnnotations;
 using McMaster.Extensions.CommandLineUtils;
 using Steeltoe.Tooling.Executor;
-using Steeltoe.Tooling.Executor.Service;
 
 // ReSharper disable UnassignedGetOnlyAutoProperty
 // ReSharper disable InconsistentNaming
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     [Command(Description = "Target the deployment environment.  If run with no args, show the targeted deployment environment.")]
     public class TargetCommand : Command

src/Steeltoe.Cli/UndeployCommand.cs

@@ -12,16 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.ComponentModel.DataAnnotations;
 using McMaster.Extensions.CommandLineUtils;
 using Steeltoe.Tooling.Executor;
-using Steeltoe.Tooling.Executor.Service;
 
 // ReSharper disable UnassignedGetOnlyAutoProperty
 // ReSharper disable InconsistentNaming
 
-namespace Steeltoe.Tooling.Cli
+namespace Steeltoe.Cli
 {
     [Command(Description = "Stop running services in the targeted deployment environment.")]
     public class UndeployCommand : Command

test/Steeltoe.Cli.Feature/AddFeature.cs

@@ -16,7 +16,7 @@ using LightBDD.Framework;
 using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     [Label("add")]
     public class AddFeature : CliFeatureSpecs

test/Steeltoe.Cli.Feature/CliFeatureSpecs.cs

@@ -16,9 +16,10 @@ using System.IO;
 using LightBDD.XUnit2;
 using Microsoft.Extensions.Logging;
 using Shouldly;
+using Steeltoe.Tooling;
 using Steeltoe.Tooling.System;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     public class CliFeatureSpecs : FeatureFixture
     {
@@ -26,7 +27,7 @@ namespace Steeltoe.Tooling.Cli.Feature
 
         private string CliProjectDirectory { get; } = Path.GetFullPath(Path.Combine(
             Directory.GetCurrentDirectory(),
-            "../../../../../src/Steeltoe.Tooling.Cli"));
+            "../../../../../src/Steeltoe.Cli"));
 
         private Shell _shell = new CommandShell();
 

test/Steeltoe.Cli.Feature/DeployFeature.cs

@@ -16,7 +16,7 @@ using LightBDD.Framework;
 using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     [Label("deploy")]
     public class DeployFeature : CliFeatureSpecs

test/Steeltoe.Cli.Feature/DisableFeature.cs

@@ -16,7 +16,7 @@ using LightBDD.Framework;
 using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     [Label("disable")]
     public class DisableFeature : CliFeatureSpecs

test/Steeltoe.Cli.Feature/EnableFeature.cs

@@ -16,7 +16,7 @@ using LightBDD.Framework;
 using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     [Label("enable")]
     public class EnableFeature : CliFeatureSpecs

test/Steeltoe.Cli.Feature/ListFeature.cs

@@ -16,7 +16,7 @@ using LightBDD.Framework;
 using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     [Label("list")]
     public class ListFeature : CliFeatureSpecs

test/Steeltoe.Cli.Feature/ProgramFeature.cs

@@ -16,7 +16,7 @@ using LightBDD.Framework;
 using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     [Label("program")]
     public class ProgramFeature : CliFeatureSpecs

test/Steeltoe.Cli.Feature/RemoveFeature.cs

@@ -16,7 +16,7 @@ using LightBDD.Framework;
 using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     [Label("remove")]
     public class RemoveFeature : CliFeatureSpecs

test/Steeltoe.Cli.Feature/StatusFeature.cs

@@ -16,7 +16,7 @@ using LightBDD.Framework;
 using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     [Label("status")]
     public class StatusFeature : CliFeatureSpecs

test/Steeltoe.Cli.Feature/Steeltoe.Cli.Feature.csproj

@@ -16,8 +16,8 @@
     <PackageReference Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Steeltoe.Tooling.Cli\Steeltoe.Tooling.Cli.csproj" />
-    <ProjectReference Include="..\..\src\Steeltoe.Tooling.Library\Steeltoe.Tooling.Library.csproj" />
+    <ProjectReference Include="..\..\src\Steeltoe.Cli\Steeltoe.Cli.csproj" />
+    <ProjectReference Include="..\..\src\Steeltoe.Tooling\Steeltoe.Tooling.csproj" />
   </ItemGroup>
   <Target Name="SpicNSpan" AfterTargets="Clean">
     <RemoveDir Directories="$(BaseOutputPath)" />

test/Steeltoe.Cli.Feature/SystemShellFeature.Steps.cs

@@ -19,7 +19,7 @@ using LightBDD.XUnit2;
 using Shouldly;
 using Steeltoe.Tooling.System;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     public partial class SystemShellFeature : FeatureFixture
     {

test/Steeltoe.Cli.Feature/SystemShellFeature.cs

@@ -17,7 +17,7 @@ using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 using Steeltoe.Tooling.System;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     public partial class SystemShellFeature
     {

test/Steeltoe.Cli.Feature/TargetFeature.cs

@@ -16,7 +16,7 @@ using LightBDD.Framework;
 using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     [Label("target")]
     public class TargetFeature : CliFeatureSpecs

test/Steeltoe.Cli.Feature/UndeployFeature.cs

@@ -16,7 +16,7 @@ using LightBDD.Framework;
 using LightBDD.Framework.Scenarios.Extended;
 using LightBDD.XUnit2;
 
-namespace Steeltoe.Tooling.Cli.Feature
+namespace Steeltoe.Cli.Feature
 {
     [Label("undeploy")]
     public class UndeployFeature : CliFeatureSpecs

test/Steeltoe.Tooling.Test/Steeltoe.Tooling.Test.csproj

@@ -15,6 +15,6 @@
     <PackageReference Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Steeltoe.Tooling.Library\Steeltoe.Tooling.Library.csproj" />
+    <ProjectReference Include="..\..\src\Steeltoe.Tooling\Steeltoe.Tooling.csproj" />
   </ItemGroup>
 </Project>