diff --git a/Version.props b/Version.props
index 0e92de6..fb6f37f 100644
--- a/Version.props
+++ b/Version.props
@@ -5,7 +5,8 @@
- 3.2.*
+ 4.0.0-rc1
+ 3.2.8
6.5.0
diff --git a/src/NetCoreToolService/Controllers/NewController.cs b/src/NetCoreToolService/Controllers/NewController.cs
index ca835b7..1763601 100644
--- a/src/NetCoreToolService/Controllers/NewController.cs
+++ b/src/NetCoreToolService/Controllers/NewController.cs
@@ -33,7 +33,7 @@ public class NewController : ControllerBase
private readonly ILogger _logger;
- private readonly Dictionary _packagers = new ()
+ private readonly Dictionary _packagers = new()
{
{ "zip", new ZipPackager() },
};
@@ -260,7 +260,7 @@ private async Task 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;
diff --git a/src/NetCoreToolService/Program.cs b/src/NetCoreToolService/Program.cs
index 5baa8a9..78047e9 100644
--- a/src/NetCoreToolService/Program.cs
+++ b/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();
- 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
diff --git a/src/NetCoreToolService/Startup.cs b/src/NetCoreToolService/Startup.cs
index 59b162d..3ebfdbe 100644
--- a/src/NetCoreToolService/Startup.cs
+++ b/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();
services.AddAllActuators();
- services.ActivateActuatorEndpoints();
services.AddSwaggerGen(c =>
{
c.SwaggerDoc("v1", new OpenApiInfo { Title = "Steeltoe.NetCoreToolService", Version = "v0" });
diff --git a/src/NetCoreToolService/Steeltoe.NetCoreToolService.csproj b/src/NetCoreToolService/Steeltoe.NetCoreToolService.csproj
index 15bc5f0..9d78c2b 100644
--- a/src/NetCoreToolService/Steeltoe.NetCoreToolService.csproj
+++ b/src/NetCoreToolService/Steeltoe.NetCoreToolService.csproj
@@ -1,6 +1,6 @@
- Steeltoe,VMware
+ Steeltoe,Broadcom
true
true
true
@@ -23,11 +23,11 @@
-
-
+
+
-
+
All