From 003cd894f87dc64a519392b7ba73d011b490463c Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 28 May 2026 18:25:36 +0200 Subject: [PATCH 1/3] Update target Steeltoe versions to 3.4.0 / 4.2.0 / unstable --- .../CSharp/.template.config/ide.host.json | 16 +++++----------- .../CSharp/.template.config/template.json | 9 +++------ .../CircuitBreakerHystrixOptionTest.cs | 6 +++--- .../ConfigurationCloudConfigOptionTest.cs | 4 ++-- .../ConfigurationEncryptionOptionTest.cs | 4 ++-- .../ConfigurationPlaceholderOptionTest.cs | 6 +++--- .../ConfigurationRandomValueOptionTest.cs | 4 ++-- .../ConfigurationSpringBootOptionTest.cs | 6 +++--- .../ConnectorCosmosDbOptionTest.cs | 8 ++++---- .../ConnectorMongoDbOptionTest.cs | 8 ++++---- .../ConnectorMySqlEfCoreOptionTest.cs | 8 ++++---- .../ConnectorMySqlOptionTest.cs | 8 ++++---- .../ConnectorOAuthOptionTest.cs | 4 ++-- .../ConnectorPostgreSqlEfCoreOptionTest.cs | 8 ++++---- .../ConnectorPostgreSqlOptionTest.cs | 8 ++++---- .../ConnectorRabbitMqOptionTest.cs | 10 +++++----- .../ConnectorRedisOptionTest.cs | 8 ++++---- .../ConnectorSqlServerEfCoreOptionTest.cs | 8 ++++---- .../ConnectorSqlServerOptionTest.cs | 8 ++++---- .../DataProtectionRedisOptionTest.cs | 8 ++++---- .../DefaultsTest.cs | 9 ++++----- .../DiscoveryConsulOptionTest.cs | 4 ++-- .../DiscoveryEurekaOptionTest.cs | 4 ++-- .../DistributedTracingOptionTest.cs | 4 ++-- .../HostingAzureSpringCloudOptionTest.cs | 4 ++-- .../HostingCloudFoundryOptionTest.cs | 6 +++--- .../HostingCloudOptionTest.cs | 4 ++-- .../LoggingDynamicConsoleOptionTest.cs | 4 ++-- .../LoggingDynamicSerilogOptionTest.cs | 6 +++--- .../ManagementEndpointsOptionTest.cs | 6 +++--- .../ManagementTasksOptionTest.cs | 6 +++--- .../MessagingRabbitMqClientOptionTest.cs | 4 ++-- .../MessagingRabbitMqListenerOptionTest.cs | 6 +++--- .../Models/SteeltoeVersion.cs | 5 ++--- .../Models/TemplateOptions.cs | 12 +++++------- .../ProjectOptionTest.cs | 18 ++++++++---------- .../SteeltoeParameterTest.cs | 5 ++--- 37 files changed, 120 insertions(+), 136 deletions(-) diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json index 31f05c8..0584921 100644 --- a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json +++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json @@ -18,21 +18,15 @@ }, "choices": [ { - "id": "3.3.*", + "id": "3.4.*", "name": { - "text": "Steeltoe 3.3" + "text": "Steeltoe 3.4" } }, { - "id": "4.0.*", + "id": "4.2.*", "name": { - "text": "Steeltoe 4.0" - } - }, - { - "id": "4.1.*", - "name": { - "text": "Steeltoe 4.1" + "text": "Steeltoe 4.2" } }, { @@ -42,7 +36,7 @@ } } ], - "defaultValue": "4.1.*" + "defaultValue": "4.2.*" }, { "id": "DescriptionOption", diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json index 762e927..a627081 100644 --- a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json +++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json @@ -121,7 +121,7 @@ "description": "The Steeltoe version to use.", "type": "parameter", "datatype": "string", - "defaultValue": "4.1.*", + "defaultValue": "4.2.*", "replaces": "$(SteeltoeVersionInCLI)" }, "IsSteeltoeV3InCLI": { @@ -156,13 +156,10 @@ "datatype": "choice", "choices": [ { - "choice": "3.3.*" + "choice": "3.4.*" }, { - "choice": "4.0.*" - }, - { - "choice": "4.1.*" + "choice": "4.2.*" }, { "choice": "4.*-main-*" diff --git a/test/NetCoreTool.Template.WebApi.Test/CircuitBreakerHystrixOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/CircuitBreakerHystrixOptionTest.cs index a839734..f65851e 100644 --- a/test/NetCoreTool.Template.WebApi.Test/CircuitBreakerHystrixOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/CircuitBreakerHystrixOptionTest.cs @@ -23,7 +23,7 @@ protected override async Task AssertProjectGeneration(ProjectOptions options) { await base.AssertProjectGeneration(options); - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { Logger.WriteLine("asserting HelloHystrixCommand"); var sourceFile = GetSourceFileForLanguage("HelloHystrixCommand", options.Language); @@ -34,7 +34,7 @@ protected override async Task AssertProjectGeneration(ProjectOptions options) protected override void AssertPackageReferencesHook(ProjectOptions options, List<(string, string)> packages) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { packages.Add(("Steeltoe.CircuitBreaker.HystrixCore", "$(SteeltoeVersion)")); packages.Add(("Steeltoe.CircuitBreaker.Hystrix.MetricsStreamCore", "$(SteeltoeVersion)")); @@ -43,7 +43,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { snippets.Add("using Steeltoe.CircuitBreaker.Hystrix;"); snippets.Add($"using {Sandbox.Name};"); diff --git a/test/NetCoreTool.Template.WebApi.Test/ConfigurationCloudConfigOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ConfigurationCloudConfigOptionTest.cs index 83480d1..464d942 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ConfigurationCloudConfigOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ConfigurationCloudConfigOptionTest.cs @@ -14,7 +14,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Extensions.Configuration.ConfigServerCore" : "Steeltoe.Configuration.ConfigServer"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Extensions.Configuration.ConfigServerCore" : "Steeltoe.Configuration.ConfigServer"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -25,7 +25,7 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List packages) { - if (options.SteeltoeVersion != SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion != SteeltoeVersion.Steeltoe34) { packages.Add(("Steeltoe.Configuration.Encryption", "$(SteeltoeVersion)")); } @@ -17,7 +17,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) { - if (options.SteeltoeVersion != SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion != SteeltoeVersion.Steeltoe34) { snippets.Add("using Steeltoe.Configuration.Encryption;"); diff --git a/test/NetCoreTool.Template.WebApi.Test/ConfigurationPlaceholderOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ConfigurationPlaceholderOptionTest.cs index 494a90e..7cbf584 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ConfigurationPlaceholderOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ConfigurationPlaceholderOptionTest.cs @@ -16,7 +16,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Extensions.Configuration.PlaceholderCore" : "Steeltoe.Configuration.Placeholder"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Extensions.Configuration.PlaceholderCore" : "Steeltoe.Configuration.Placeholder"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -27,12 +27,12 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List> assertions) diff --git a/test/NetCoreTool.Template.WebApi.Test/ConfigurationRandomValueOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ConfigurationRandomValueOptionTest.cs index 37f7393..652a439 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ConfigurationRandomValueOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ConfigurationRandomValueOptionTest.cs @@ -14,7 +14,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Extensions.Configuration.RandomValueBase" : "Steeltoe.Configuration.RandomValue"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Extensions.Configuration.RandomValueBase" : "Steeltoe.Configuration.RandomValue"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -25,7 +25,7 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -25,12 +25,12 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List GetSetupCodeFragments(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "builder.Configuration.AddSpringBootEnv();"; yield return "builder.Configuration.AddSpringBootCmd(builder.Configuration);"; diff --git a/test/NetCoreTool.Template.WebApi.Test/ConnectorCosmosDbOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ConnectorCosmosDbOptionTest.cs index 8f25ada..fa93c55 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ConnectorCosmosDbOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ConnectorCosmosDbOptionTest.cs @@ -16,7 +16,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -28,19 +28,19 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List GetSetupCodeFragments(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "var manager = new ConnectionStringManager(builder.Configuration);"; yield return "var cosmosInfo = manager.Get();"; diff --git a/test/NetCoreTool.Template.WebApi.Test/ConnectorMongoDbOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ConnectorMongoDbOptionTest.cs index 0fe59be..8ee8d32 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ConnectorMongoDbOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ConnectorMongoDbOptionTest.cs @@ -15,7 +15,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -27,19 +27,19 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -48,7 +48,7 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List GetNamespaceImports(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "using Steeltoe.Connector.MySql.EFCore;"; } @@ -61,14 +61,14 @@ private static IEnumerable GetNamespaceImports(SteeltoeVersion steeltoeV private static string GetSetupComment(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "// TODO: Add your connection string at configuration key: MySql:Client:ConnectionString" : "// TODO: Add your connection string at configuration key: Steeltoe:Client:MySql:Default:ConnectionString"; } private static IEnumerable GetSetupCodeFragments(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "builder.Services.AddDbContext(options => options.UseMySql(builder.Configuration));"; } diff --git a/test/NetCoreTool.Template.WebApi.Test/ConnectorMySqlOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ConnectorMySqlOptionTest.cs index ee24016..594b16f 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ConnectorMySqlOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ConnectorMySqlOptionTest.cs @@ -24,7 +24,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -36,19 +36,19 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List packages) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { packages.Add(("Steeltoe.Connector.ConnectorCore", "$(SteeltoeVersion)")); } @@ -17,7 +17,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { snippets.Add("using Steeltoe.Connector.OAuth;"); snippets.Add("builder.Services.AddOAuthServiceOptions(builder.Configuration);"); diff --git a/test/NetCoreTool.Template.WebApi.Test/ConnectorPostgreSqlEfCoreOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ConnectorPostgreSqlEfCoreOptionTest.cs index abdb322..80a6556 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ConnectorPostgreSqlEfCoreOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ConnectorPostgreSqlEfCoreOptionTest.cs @@ -35,7 +35,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Connector.EFCore" : "Steeltoe.Connectors.EntityFrameworkCore"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Connector.EFCore" : "Steeltoe.Connectors.EntityFrameworkCore"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -48,7 +48,7 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List GetNamespaceImports(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "using Steeltoe.Connector.PostgreSql.EFCore;"; } @@ -61,14 +61,14 @@ private static IEnumerable GetNamespaceImports(SteeltoeVersion steeltoeV private static string GetSetupComment(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "// TODO: Add your connection string at configuration key: Postgres:Client:ConnectionString" : "// TODO: Add your connection string at configuration key: Steeltoe:Client:PostgreSql:Default:ConnectionString"; } private static IEnumerable GetSetupCodeFragments(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "builder.Services.AddDbContext(options => options.UseNpgsql(builder.Configuration));"; } diff --git a/test/NetCoreTool.Template.WebApi.Test/ConnectorPostgreSqlOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ConnectorPostgreSqlOptionTest.cs index 232ef51..8270c7c 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ConnectorPostgreSqlOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ConnectorPostgreSqlOptionTest.cs @@ -15,7 +15,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -27,19 +27,19 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List "5.2.*", + SteeltoeVersion.Steeltoe34 => "5.2.*", _ => "7.2.*" }; @@ -21,7 +21,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -33,19 +33,19 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -27,19 +27,19 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -48,7 +48,7 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List GetNamespaceImports(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "using Steeltoe.Connector.SqlServer.EFCore;"; } @@ -61,14 +61,14 @@ private static IEnumerable GetNamespaceImports(SteeltoeVersion steeltoeV private static string GetSetupComment(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "// TODO: Add your connection string at configuration key: SqlServer:Credentials:ConnectionString" : "// TODO: Add your connection string at configuration key: Steeltoe:Client:SqlServer:Default:ConnectionString"; } private static IEnumerable GetSetupCodeFragments(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "builder.Services.AddDbContext(options => options.UseSqlServer(builder.Configuration));"; } diff --git a/test/NetCoreTool.Template.WebApi.Test/ConnectorSqlServerOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ConnectorSqlServerOptionTest.cs index 60b7033..e7ec57d 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ConnectorSqlServerOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ConnectorSqlServerOptionTest.cs @@ -24,7 +24,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Connector.ConnectorCore" : "Steeltoe.Connectors"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -36,19 +36,19 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List GetPackageNames(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "Steeltoe.Connector.ConnectorCore"; yield return "Steeltoe.Security.DataProtection.RedisCore"; @@ -35,7 +35,7 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List GetNamespaceImports(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "using Microsoft.AspNetCore.DataProtection;"; yield return "using Steeltoe.Connector.Redis;"; @@ -51,14 +51,14 @@ private static IEnumerable GetNamespaceImports(SteeltoeVersion steeltoeV private static string GetSetupComment(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "// TODO: Add your connection string at configuration key: Redis:Client:ConnectionString" : "// TODO: Add your connection string at configuration key: Steeltoe:Client:Redis:Default:ConnectionString"; } private IEnumerable GetSetupCodeFragments(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "builder.Services.AddRedisConnectionMultiplexer(builder.Configuration);"; } diff --git a/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs b/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs index 8fac1e4..d69970e 100644 --- a/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs @@ -72,9 +72,8 @@ private static void AssertSteeltoeVersion(SteeltoeVersion steeltoeVersion) { switch (steeltoeVersion) { - case SteeltoeVersion.Steeltoe32: - case SteeltoeVersion.Steeltoe40: - case SteeltoeVersion.Steeltoe41: + case SteeltoeVersion.Steeltoe34: + case SteeltoeVersion.Steeltoe42: case SteeltoeVersion.SteeltoeUnstable: break; default: @@ -89,7 +88,7 @@ protected override void AssertAppSettingsJsonHook(List snippets) @@ -25,7 +25,7 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List GetSetupCodeFragments(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "builder.Services.AddDistributedTracingAspNetCore();"; yield return "builder.Services.AddDistributedTracing();"; diff --git a/test/NetCoreTool.Template.WebApi.Test/HostingAzureSpringCloudOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/HostingAzureSpringCloudOptionTest.cs index 03de01e..28a2a1b 100644 --- a/test/NetCoreTool.Template.WebApi.Test/HostingAzureSpringCloudOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/HostingAzureSpringCloudOptionTest.cs @@ -9,7 +9,7 @@ public class HostingAzureSpringCloudOptionTest(ITestOutputHelper logger) { protected override void AssertPackageReferencesHook(ProjectOptions options, List<(string, string)> packages) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { packages.Add(("Microsoft.Azure.SpringCloud.Client", "2.0.0-preview.3")); } @@ -17,7 +17,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { snippets.Add("using Microsoft.Azure.SpringCloud.Client;"); snippets.Add("builder.WebHost.UseAzureSpringCloudService();"); diff --git a/test/NetCoreTool.Template.WebApi.Test/HostingCloudFoundryOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/HostingCloudFoundryOptionTest.cs index 66fd746..cda90a7 100644 --- a/test/NetCoreTool.Template.WebApi.Test/HostingCloudFoundryOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/HostingCloudFoundryOptionTest.cs @@ -10,7 +10,7 @@ public class HostingCloudFoundryOptionTest(ITestOutputHelper logger) { protected override void AssertPackageReferencesHook(ProjectOptions options, List<(string, string)> packages) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { packages.Add(("Steeltoe.Extensions.Configuration.CloudFoundryCore", "$(SteeltoeVersion)")); packages.Add(("Steeltoe.Common.Hosting", "$(SteeltoeVersion)")); @@ -30,7 +30,7 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List GetNamespaceImports(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "using Steeltoe.Common.Hosting;"; yield return "using Steeltoe.Extensions.Configuration.CloudFoundry;"; @@ -43,7 +43,7 @@ private static IEnumerable GetNamespaceImports(SteeltoeVersion steeltoeV private static IEnumerable GetSetupCodeFragments(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return "builder.UseCloudHosting();"; yield return "builder.AddCloudFoundryConfiguration();"; diff --git a/test/NetCoreTool.Template.WebApi.Test/HostingCloudOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/HostingCloudOptionTest.cs index 8354f69..0af2f35 100644 --- a/test/NetCoreTool.Template.WebApi.Test/HostingCloudOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/HostingCloudOptionTest.cs @@ -10,7 +10,7 @@ public class HostingCloudOptionTest(ITestOutputHelper logger) { protected override void AssertPackageReferencesHook(ProjectOptions options, List<(string, string)> packages) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { packages.Add(("Steeltoe.Common.Hosting", "$(SteeltoeVersion)")); } @@ -18,7 +18,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { snippets.Add("using Steeltoe.Common.Hosting;"); snippets.Add("builder.UseCloudHosting();"); diff --git a/test/NetCoreTool.Template.WebApi.Test/LoggingDynamicConsoleOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/LoggingDynamicConsoleOptionTest.cs index f4c1ae1..9ce2860 100644 --- a/test/NetCoreTool.Template.WebApi.Test/LoggingDynamicConsoleOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/LoggingDynamicConsoleOptionTest.cs @@ -14,7 +14,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List private static string GetPackageName(SteeltoeVersion steeltoeVersion) { - return steeltoeVersion == SteeltoeVersion.Steeltoe32 ? "Steeltoe.Extensions.Logging.DynamicLogger" : "Steeltoe.Logging.DynamicConsole"; + return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Extensions.Logging.DynamicLogger" : "Steeltoe.Logging.DynamicConsole"; } protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -25,7 +25,7 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -25,11 +25,11 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -25,12 +25,12 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) @@ -25,12 +25,12 @@ protected override void AssertProgramSnippetsHook(ProjectOptions options, List GetSetupCodeFragments(SteeltoeVersion steeltoeVersion) { - if (steeltoeVersion == SteeltoeVersion.Steeltoe32) + if (steeltoeVersion == SteeltoeVersion.Steeltoe34) { yield return @"builder.Services.AddTask(""run-me"", _ =>"; yield return "// Run this app with command-line argument: runtask=run-me"; diff --git a/test/NetCoreTool.Template.WebApi.Test/MessagingRabbitMqClientOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/MessagingRabbitMqClientOptionTest.cs index 8f9480f..91a6ba8 100644 --- a/test/NetCoreTool.Template.WebApi.Test/MessagingRabbitMqClientOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/MessagingRabbitMqClientOptionTest.cs @@ -9,7 +9,7 @@ public class MessagingRabbitMqClientOptionTest(ITestOutputHelper logger) { protected override void AssertPackageReferencesHook(ProjectOptions options, List<(string, string)> packages) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { packages.Add(("Steeltoe.Messaging.RabbitMQ", "$(SteeltoeVersion)")); } @@ -17,7 +17,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { snippets.Add("using Steeltoe.Messaging.RabbitMQ.Config;"); snippets.Add("using Steeltoe.Messaging.RabbitMQ.Extensions;"); diff --git a/test/NetCoreTool.Template.WebApi.Test/MessagingRabbitMqListenerOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/MessagingRabbitMqListenerOptionTest.cs index e7ff72a..ae679fb 100644 --- a/test/NetCoreTool.Template.WebApi.Test/MessagingRabbitMqListenerOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/MessagingRabbitMqListenerOptionTest.cs @@ -22,7 +22,7 @@ protected override async Task AssertProjectGeneration(ProjectOptions options) { await base.AssertProjectGeneration(options); - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { await base.AssertProjectGeneration(options); Logger.WriteLine("asserting Services"); @@ -32,7 +32,7 @@ protected override async Task AssertProjectGeneration(ProjectOptions options) protected override void AssertPackageReferencesHook(ProjectOptions options, List<(string, string)> packages) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { packages.Add(("Steeltoe.Messaging.RabbitMQ", "$(SteeltoeVersion)")); } @@ -40,7 +40,7 @@ protected override void AssertPackageReferencesHook(ProjectOptions options, List protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets) { - if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32) + if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe34) { snippets.Add("using Steeltoe.Messaging.RabbitMQ.Config;"); snippets.Add("using Steeltoe.Messaging.RabbitMQ.Extensions;"); diff --git a/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs b/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs index c127d43..5f918de 100644 --- a/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs +++ b/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs @@ -2,9 +2,8 @@ namespace Steeltoe.NetCoreTool.Template.WebApi.Test.Models { public enum SteeltoeVersion { - Steeltoe32, - Steeltoe40, - Steeltoe41, + Steeltoe34, + Steeltoe42, SteeltoeUnstable } } diff --git a/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs b/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs index ebbb683..4671e89 100644 --- a/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs +++ b/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs @@ -11,13 +11,11 @@ public IEnumerator GetEnumerator() { return new List { - new object[] { "3.2.8", "net8.0", "C#" }, - new object[] { "3.2.8", "net9.0", "C#" }, - new object[] { "4.0.*", "net8.0", "C#" }, - new object[] { "4.0.*", "net9.0", "C#" }, - new object[] { "4.1.*", "net8.0", "C#" }, - new object[] { "4.1.*", "net9.0", "C#" }, - new object[] { "4.1.*", "net10.0", "C#" }, + new object[] { "3.4.*", "net8.0", "C#" }, + new object[] { "3.4.*", "net9.0", "C#" }, + new object[] { "4.2.*", "net8.0", "C#" }, + new object[] { "4.2.*", "net9.0", "C#" }, + new object[] { "4.2.*", "net10.0", "C#" }, new object[] { "4.*-main-*", "net8.0", "C#" }, new object[] { "4.*-main-*", "net9.0", "C#" }, new object[] { "4.*-main-*", "net10.0", "C#" } diff --git a/test/NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs index 3cac935..be0ce1f 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs @@ -42,13 +42,13 @@ public virtual async Task Project_Should_Be_Built(string steeltoeOption, string sandbox.CommandExitCode.Should().Be(0, $"generation should succeed, while output was:{Environment.NewLine}{sandbox.CommandOutput}"); Logger.WriteLine("building project"); - await CreateEditorConfigForUnnecessaryUsings(sandbox); + await CreateEditorConfigForWarningSuppressions(sandbox); var buildCmd = "dotnet build /p:TreatWarningsAsErrors=True /p:EnforceCodeStyleInBuild=True /p:GenerateDocumentationFile=True /p:NuGetAuditMode=direct"; await sandbox.ExecuteCommandAsync(buildCmd, false); sandbox.CommandExitCode.Should().Be(0, $"build should succeed, while output was:{Environment.NewLine}{sandbox.CommandOutput}"); } - private static async Task CreateEditorConfigForUnnecessaryUsings(Sandbox sandbox) + private static async Task CreateEditorConfigForWarningSuppressions(Sandbox sandbox) { await File.WriteAllTextAsync(Path.Combine(sandbox.Path, ".editorconfig"), """ @@ -58,6 +58,8 @@ await File.WriteAllTextAsync(Path.Combine(sandbox.Path, ".editorconfig"), dotnet_diagnostic.IDE0005.severity = warning # Missing XML comment for publicly visible type or member dotnet_diagnostic.CS1591.severity = none + # Obsolete types/members + dotnet_diagnostic.CS0618.severity = none """); } @@ -256,17 +258,13 @@ private static ProjectOptions ToProjectOptions(string steeltoeVersion, string fr private static SteeltoeVersion ToSteeltoeEnum(string steeltoe) { - if (steeltoe.StartsWith("3.2")) + if (steeltoe.StartsWith("3.4")) { - return SteeltoeVersion.Steeltoe32; + return SteeltoeVersion.Steeltoe34; } - if (steeltoe.StartsWith("4.0")) + if (steeltoe.StartsWith("4.2")) { - return SteeltoeVersion.Steeltoe40; - } - if (steeltoe.StartsWith("4.1")) - { - return SteeltoeVersion.Steeltoe41; + return SteeltoeVersion.Steeltoe42; } if (steeltoe.StartsWith("4.*")) { diff --git a/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs b/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs index 7b76e33..78acd28 100644 --- a/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs @@ -6,9 +6,8 @@ public class SteeltoeParameterTest : ParameterTest { public SteeltoeParameterTest(ITestOutputHelper logger) : base("steeltoe", "The Steeltoe version to use.", logger) { - Values.Add("3.2.*"); - Values.Add("4.0.*"); - Values.Add("4.1.*"); + Values.Add("3.4.*"); + Values.Add("4.2.*"); Values.Add("4.*-main-*"); } } From 75d15e0b21c5896629fe7fb0b6230d53dccc1172 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 28 May 2026 18:25:53 +0200 Subject: [PATCH 2/3] Update version to 1.6.0 --- src/Steeltoe.NetCoreTool.Templates.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Steeltoe.NetCoreTool.Templates.csproj b/src/Steeltoe.NetCoreTool.Templates.csproj index 36c5358..029c28d 100644 --- a/src/Steeltoe.NetCoreTool.Templates.csproj +++ b/src/Steeltoe.NetCoreTool.Templates.csproj @@ -3,7 +3,7 @@ net8.0 Template Steeltoe.NetCoreTool.Templates - 1.5.1 + 1.6.0 pre Steeltoe .NET Project Templates Broadcom From c04f024634a59c3015a641f622ceb687343d2801 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 28 May 2026 18:46:31 +0200 Subject: [PATCH 3/3] Remove net9.0 from test matrix for Steeltoe 3.x --- test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs b/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs index 4671e89..db2555f 100644 --- a/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs +++ b/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs @@ -12,7 +12,6 @@ public IEnumerator GetEnumerator() return new List { new object[] { "3.4.*", "net8.0", "C#" }, - new object[] { "3.4.*", "net9.0", "C#" }, new object[] { "4.2.*", "net8.0", "C#" }, new object[] { "4.2.*", "net9.0", "C#" }, new object[] { "4.2.*", "net10.0", "C#" },