Skip to content

Update to Steeltoe v4.0-rc1 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bart-vmware merged 1 commit into from
Jul 28, 2025
Merged

Update to Steeltoe v4.0-rc1 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions src/NetCoreToolService/Controllers/NewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() },
};
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 3 additions & 7 deletions src/NetCoreToolService/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/NetCoreToolService/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" });
Expand Down
8 changes: 4 additions & 4 deletions src/NetCoreToolService/Steeltoe.NetCoreToolService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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" />
Expand Down