Update to Steeltoe v4.0-rc1

Author: bart-vmware

Directory.Build.props

@@ -14,9 +14,4 @@
 
   <Import Project="Version.props" />
 
-  <Target Name="Pristine" AfterTargets="Clean">
-    <RemoveDir Directories="$(BaseIntermediateOutputPath)" />
-    <RemoveDir Directories="$(BaseOutputPath)" />
-  </Target>
-
 </Project>

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"
 }
 ```

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>

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>
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <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" />

src/InitializrService.Config/UiConfig.cs

@@ -51,7 +51,7 @@ public sealed class UiConfig
         /// <summary>
         /// Gets or sets the project dependencies.
         /// </summary>
-        public GroupList Dependencies { get; set; } = new ();
+        public GroupList Dependencies { get; set; } = new();
 
         /// <summary>
         /// HTML form text data.

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();
         }

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);
         }
 

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;

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;
@@ -73,23 +72,23 @@ public IActionResult GetHelp()
             help.Add("The URI templates take a set of parameters to customize the result of a request.");
             var table = new List<List<string>>
             {
-                new () { "Parameter", "Description", "Default Value" },
-                new () { "name", "project name", uiConfig.Name.Default },
-                new () { "namespace", "namespace", uiConfig.Namespace.Default },
-                new () { "description", "project description", uiConfig.Description.Default },
-                new () { "steeltoeVersion", "Steeltoe version", uiConfig.SteeltoeVersion.Default },
-                new () { "dotNetFramework", ".NET framework", uiConfig.DotNetFramework.Default },
-                new () { "language", "programming language", uiConfig.Language.Default },
-                new () { "packaging", "project packaging", uiConfig.Packaging.Default },
+                new() { "Parameter", "Description", "Default Value" },
+                new() { "name", "project name", uiConfig.Name.Default },
+                new() { "namespace", "namespace", uiConfig.Namespace.Default },
+                new() { "description", "project description", uiConfig.Description.Default },
+                new() { "steeltoeVersion", "Steeltoe version", uiConfig.SteeltoeVersion.Default },
+                new() { "dotNetFramework", ".NET framework", uiConfig.DotNetFramework.Default },
+                new() { "language", "programming language", uiConfig.Language.Default },
+                new() { "packaging", "project packaging", uiConfig.Packaging.Default },
             };
             help.AddRange(ToTable(table));
             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)

src/InitializrService/Generators/NetCoreToolProjectGenerator.cs

@@ -19,7 +19,7 @@ namespace Steeltoe.InitializrService.Generators
     /// </summary>
     public class NetCoreToolProjectGenerator : InitializrServiceBase, IProjectGenerator
     {
-        private static readonly HttpClient Client = new ();
+        private static readonly HttpClient Client = new();
 
         private readonly string _netCoreToolServiceUri;