Update to Steeltoe v4.0-rc1

bart-vmware · bart-vmware · commit e857b6dff72b · 2025-07-22T12:37:14.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,9 +14,4 @@
 
   <Import Project="Version.props" />
 
-  <Target Name="Pristine" AfterTargets="Clean">
-    <RemoveDir Directories="$(BaseIntermediateOutputPath)" />
-    <RemoveDir Directories="$(BaseOutputPath)" />
-  </Target>
-
 </Project>
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ $ http -p b https://start.steeltoe.io/api/about
     "commit": "381bbd2a1e30d621ed6ad4a07790955447ffe468",
     "name": "Steeltoe.InitializrService",
     "url": "https://github.com/SteeltoeOSS/InitializrService/",
-    "vendor": "SteeltoeOSS/VMware",
+    "vendor": "SteeltoeOSS/Broadcom",
     "version": "0.8.0"
 }
 ```
diff --git a/Version.props b/Version.props
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <GoogleAnalyticsTrackerVersion>7.0.1</GoogleAnalyticsTrackerVersion>
-    <SteeltoeVersion>3.2.*</SteeltoeVersion>
-    <YamlDotNetVersion>8.1.2</YamlDotNetVersion>
+    <SteeltoeVersion>4.0.*-*</SteeltoeVersion>
+    <YamlDotNetVersion>16.3.0</YamlDotNetVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,7 +3,7 @@
   <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
-    <Authors>Steeltoe,VMware</Authors>
+    <Authors>Steeltoe,Broadcom</Authors>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
diff --git a/src/InitializrService.Config/Utilities/ReleaseRangeYamlConverter.cs b/src/InitializrService.Config/Utilities/ReleaseRangeYamlConverter.cs
@@ -36,7 +36,7 @@ public bool Accepts(Type type)
         }
 
         /// <inheritdoc/>
-        public object? ReadYaml(IParser parser, Type type)
+        public object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
         {
             if (parser.TryConsume<Scalar>(out var expression))
             {
@@ -52,7 +52,7 @@ public bool Accepts(Type type)
         }
 
         /// <inheritdoc/>
-        public void WriteYaml(IEmitter emitter, object? value, Type type)
+        public void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer)
         {
             throw new NotImplementedException();
         }
diff --git a/src/InitializrService/Configuration/UiConfigService.cs b/src/InitializrService/Configuration/UiConfigService.cs
@@ -4,7 +4,7 @@
 
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Steeltoe.Extensions.Configuration.ConfigServer;
+using Steeltoe.Configuration.ConfigServer;
 using Steeltoe.InitializrService.Config;
 using Steeltoe.InitializrService.Services;
 
@@ -27,15 +27,15 @@ public class UiConfigService : InitializrServiceBase, IUiConfigService
         /// <param name="logger">Injected logger.</param>
         public UiConfigService(
             IOptionsSnapshot<UiConfig> configuration,
-            IOptions<ConfigServerClientSettingsOptions> settings,
+            IOptions<ConfigServerClientOptions> settings,
             ILogger<UiConfigService> logger)
             : base(logger)
         {
             UiConfig = configuration.Value;
             Logger.LogDebug(
                 "Config Server: uri={ConfigServer},env={Environment},label={Label}",
                 settings.Value.Uri,
-                settings.Value.Env,
+                settings.Value.Environment,
                 settings.Value.Label);
         }
 
diff --git a/src/InitializrService/Controllers/ProjectController.cs b/src/InitializrService/Controllers/ProjectController.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using Steeltoe.InitializrService.Config;
 using Steeltoe.InitializrService.Models;
 using Steeltoe.InitializrService.Services;
 using System;
diff --git a/src/InitializrService/Controllers/RootController.cs b/src/InitializrService/Controllers/RootController.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Steeltoe.InitializrService.Config;
 using Steeltoe.InitializrService.Services;
 using System;
 using System.Collections.Generic;
@@ -86,10 +85,10 @@ public IActionResult GetHelp()
             help.Add(string.Empty);
             help.Add("The following section has a list of supported identifiers for the comma-separated");
             help.Add("list of \"dependencies\".");
-            table = new List<List<string>>
-            {
-                new () { "Id", "Description", "Steeltoe Version", ".NET Framework" },
-            };
+            table =
+            [
+                ["Id", "Description", "Steeltoe Version", ".NET Framework"]
+            ];
             table.AddRange(
                 from @group in uiConfig.Dependencies.Values
                 from dependency in @group.Values
@@ -109,7 +108,7 @@ from dependency in @group.Values
             return Ok(string.Join(newline, help));
         }
 
-        private static IEnumerable<string> ToTable(IReadOnlyList<List<string>> rows)
+        private static List<string> ToTable(List<List<string>> rows)
         {
             var columnMaxWidth = new int[rows[0].Count];
             for (var column = 0; column < columnMaxWidth.Length; ++column)
diff --git a/src/InitializrService/Program.cs b/src/InitializrService/Program.cs
@@ -4,9 +4,9 @@
 
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
-using Steeltoe.Extensions.Configuration.ConfigServer;
-using Steeltoe.Extensions.Logging;
+using Steeltoe.Configuration.ConfigServer;
 using Steeltoe.InitializrService.Models;
+using Steeltoe.Logging.DynamicConsole;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
@@ -22,21 +22,17 @@ 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
             {
                 Name = typeof(Program).Namespace ?? "unknown",
-                Vendor = "SteeltoeOSS/VMware",
+                Vendor = "SteeltoeOSS/Broadcom",
                 Url = "https://github.com/SteeltoeOSS/InitializrService/",
                 Version = fields[0],
                 Commit = fields[1],
diff --git a/src/InitializrService/Startup.cs b/src/InitializrService/Startup.cs
@@ -8,12 +8,12 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Steeltoe.Extensions.Configuration.ConfigServer;
+using Steeltoe.Configuration.ConfigServer;
 using Steeltoe.InitializrService.Config;
 using Steeltoe.InitializrService.Configuration;
 using Steeltoe.InitializrService.Generators;
 using Steeltoe.InitializrService.Services;
-using Steeltoe.Management.Endpoint;
+using Steeltoe.Management.Endpoint.Actuators.All;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -81,7 +81,6 @@ public void ConfigureServices(IServiceCollection services)
             services.AddResponseCompression();
             services.AddTransient<IProjectGenerator, NetCoreToolProjectGenerator>();
             services.AddAllActuators();
-            services.ActivateActuatorEndpoints();
             services.AddGoogleAnalyticsTracker(trackerOptions => { trackerOptions.TrackerId = Configuration.GetValue<string>("GoogleAnalytics:TrackerId"); });
             services.AddControllers().AddJsonOptions(jsonOptions =>
             {
diff --git a/src/InitializrService/Steeltoe.InitializrService.csproj b/src/InitializrService/Steeltoe.InitializrService.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <ItemGroup>
     <PackageReference Include="GoogleAnalyticsTracker.AspNetCore" Version="$(GoogleAnalyticsTrackerVersion)" />
-    <PackageReference Include="Steeltoe.Extensions.Configuration.ConfigServerCore" Version="$(SteeltoeVersion)" />
-    <PackageReference Include="Steeltoe.Management.EndpointCore" Version="$(SteeltoeVersion)" />
+    <PackageReference Include="Steeltoe.Configuration.ConfigServer" Version="$(SteeltoeVersion)" />
+    <PackageReference Include="Steeltoe.Management.Endpoint" Version="$(SteeltoeVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/InitializrService.Test.Integration/ProgramTests.cs b/test/InitializrService.Test.Integration/ProgramTests.cs
@@ -18,7 +18,7 @@ public void About_Should_Contain_About_Details()
         {
             var about = Program.About;
             about.Name.Should().Be("Steeltoe.InitializrService");
-            about.Vendor.Should().Be("SteeltoeOSS/VMware");
+            about.Vendor.Should().Be("SteeltoeOSS/Broadcom");
             about.Url.Should().Be("https://github.com/SteeltoeOSS/InitializrService/");
             about.Version.Should().NotBeNull();
             about.Version.Should().Contain("1.0.0");
diff --git a/test/InitializrService.Test.Unit/Controllers/AboutControllerTests.cs b/test/InitializrService.Test.Unit/Controllers/AboutControllerTests.cs
@@ -31,7 +31,7 @@ public void GetAbout_Should_Return_About()
             indexResult.Value.Should().BeOfType<About>();
             var about = Assert.IsType<About>(indexResult.Value);
             about.Name.Should().Be("Steeltoe.InitializrService");
-            about.Vendor.Should().Be("SteeltoeOSS/VMware");
+            about.Vendor.Should().Be("SteeltoeOSS/Broadcom");
             about.Url.Should().Be("https://github.com/SteeltoeOSS/InitializrService/");
             /* about.Version.Should().StartWith("0.0.0"); */
             about.Commit.Should().NotBeNullOrWhiteSpace();

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ $ http -p b https://start.steeltoe.io/api/about`
`41`	`41`	`"commit": "381bbd2a1e30d621ed6ad4a07790955447ffe468",`
`42`	`42`	`"name": "Steeltoe.InitializrService",`
`43`	`43`	`"url": "https://github.com/SteeltoeOSS/InitializrService/",`
`44`		`- "vendor": "SteeltoeOSS/VMware",`
	`44`	`+ "vendor": "SteeltoeOSS/Broadcom",`
`45`	`45`	`"version": "0.8.0"`
`46`	`46`	`}`
`47`	`47`	```
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public bool Accepts(Type type)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/// <inheritdoc/>`
`39`		`- public object? ReadYaml(IParser parser, Type type)`
	`39`	`+ public object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)`
`40`	`40`	`{`
`41`	`41`	`if (parser.TryConsume<Scalar>(out var expression))`
`42`	`42`	`{`
`@@ -52,7 +52,7 @@ public bool Accepts(Type type)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/// <inheritdoc/>`
`55`		`- public void WriteYaml(IEmitter emitter, object? value, Type type)`
	`55`	`+ public void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer)`
`56`	`56`	`{`
`57`	`57`	`throw new NotImplementedException();`
`58`	`58`	`}`