Update to Steeltoe v4.0-rc1 (#14)

Author: bart-vmware

Version.props

@@ -5,7 +5,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <SteeltoeVersion>3.2.*</SteeltoeVersion>
+    <SteeltoeVersion>4.0.0-rc1</SteeltoeVersion>
+    <SteeltoeUtilsVersion>3.2.8</SteeltoeUtilsVersion>
     <SwashbuckleVersion>6.5.0</SwashbuckleVersion>
   </PropertyGroup>
 

src/NetCoreToolService/Controllers/NewController.cs

@@ -33,7 +33,7 @@ public class NewController : ControllerBase
 
         private readonly ILogger<NewController> _logger;
 
-        private readonly Dictionary<string, IPackager> _packagers = new ()
+        private readonly Dictionary<string, IPackager> _packagers = new()
         {
             { "zip", new ZipPackager() },
         };
@@ -260,7 +260,7 @@ private async Task<TemplateDictionary> GetTemplateDictionary()
             var lines = listCommand.Output.Split('\n').ToList()
                 .FindAll(line => !string.IsNullOrWhiteSpace(line));
 
-            var headingIdx = lines.FindIndex(line => line.StartsWith("-"));
+            var headingIdx = lines.FindIndex(line => line.StartsWith('-'));
             var headings = lines[headingIdx].Split("  ");
             const int nameColStart = 0;
             var nameColEnd = nameColStart + headings[0].Length;

src/NetCoreToolService/Program.cs

@@ -4,7 +4,7 @@
 
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
-using Steeltoe.Extensions.Logging;
+using Steeltoe.Logging.DynamicConsole;
 using Steeltoe.NetCoreToolService.Models;
 using System.Reflection;
 
@@ -19,15 +19,11 @@ static Program()
         {
             var versionAttr =
                 typeof(Program).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
-            var fields = versionAttr?.InformationalVersion.Split('+');
-            if (fields is null)
-            {
-                fields = new[] { "unknown" };
-            }
+            var fields = versionAttr?.InformationalVersion.Split('+') ?? ["unknown"];
 
             if (fields.Length == 1)
             {
-                fields = new[] { fields[0], "unknown" };
+                fields = [fields[0], "unknown"];
             }
 
             About = new About

src/NetCoreToolService/Startup.cs

@@ -10,7 +10,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
 using Steeltoe.Common.Utils.Diagnostics;
-using Steeltoe.Management.Endpoint;
+using Steeltoe.Management.Endpoint.Actuators.All;
 using System.Text.Json.Serialization;
 
 namespace Steeltoe.NetCoreToolService
@@ -47,7 +47,6 @@ public void ConfigureServices(IServiceCollection services)
             });
             services.AddTransient<ICommandExecutor, CommandExecutor>();
             services.AddAllActuators();
-            services.ActivateActuatorEndpoints();
             services.AddSwaggerGen(c =>
             {
                 c.SwaggerDoc("v1", new OpenApiInfo { Title = "Steeltoe.NetCoreToolService", Version = "v0" });

src/NetCoreToolService/Steeltoe.NetCoreToolService.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <Authors>Steeltoe,VMware</Authors>
+    <Authors>Steeltoe,Broadcom</Authors>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -23,11 +23,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Steeltoe.Management.EndpointCore" Version="$(SteeltoeVersion)" />
-    <PackageReference Include="Steeltoe.Common.Utils" Version="$(SteeltoeVersion)" />
+    <PackageReference Include="Steeltoe.Management.Endpoint" Version="$(SteeltoeVersion)" />
+    <PackageReference Include="Steeltoe.Common.Utils" Version="$(SteeltoeUtilsVersion)" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleVersion)" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)\..\..\stylecop.json" />