From 1932b1d55707bf20af88e098ffa52a43c49edc7d Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Wed, 28 Jan 2026 23:28:46 +0100 Subject: [PATCH] Add Steeltoe 4.1 --- .../CSharp/.template.config/ide.host.json | 8 +++++++- .../CSharp/.template.config/template.json | 7 +++++-- test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs | 1 + .../Models/SteeltoeVersion.cs | 1 + .../Models/TemplateOptions.cs | 7 +++++-- .../NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs | 4 ++++ .../SteeltoeParameterTest.cs | 3 ++- 7 files changed, 25 insertions(+), 6 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 2a92e3d..31f05c8 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 @@ -29,6 +29,12 @@ "text": "Steeltoe 4.0" } }, + { + "id": "4.1.*", + "name": { + "text": "Steeltoe 4.1" + } + }, { "id": "4.*-main-*", "name": { @@ -36,7 +42,7 @@ } } ], - "defaultValue": "4.0.*" + "defaultValue": "4.1.*" }, { "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 658cc58..1864ed7 100644 --- a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json +++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json @@ -91,7 +91,7 @@ "description": "Target net10.0" } ], - "defaultValue": "net8.0", + "defaultValue": "net10.0", "replaces": "$(FrameworkOption)" }, "IsFrameworkNet60": { @@ -134,7 +134,7 @@ "description": "The Steeltoe version to use.", "type": "parameter", "datatype": "string", - "defaultValue": "4.0.*", + "defaultValue": "4.1.*", "replaces": "$(SteeltoeVersionInCLI)" }, "IsSteeltoeV3InCLI": { @@ -174,6 +174,9 @@ { "choice": "4.0.*" }, + { + "choice": "4.1.*" + }, { "choice": "4.*-main-*" } diff --git a/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs b/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs index c4c2995..f6ef0c1 100644 --- a/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs @@ -78,6 +78,7 @@ private static void AssertSteeltoeVersion(SteeltoeVersion steeltoeVersion) { case SteeltoeVersion.Steeltoe32: case SteeltoeVersion.Steeltoe40: + case SteeltoeVersion.Steeltoe41: case SteeltoeVersion.SteeltoeUnstable: break; default: diff --git a/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs b/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs index d919e36..c127d43 100644 --- a/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs +++ b/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs @@ -4,6 +4,7 @@ public enum SteeltoeVersion { Steeltoe32, Steeltoe40, + Steeltoe41, SteeltoeUnstable } } diff --git a/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs b/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs index ffc8b5c..f3d1776 100644 --- a/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs +++ b/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs @@ -14,8 +14,11 @@ public IEnumerator GetEnumerator() new object[] { "3.2.8", "net6.0", "C#" }, 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.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[] { "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 cc0274e..757f30f 100644 --- a/test/NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs @@ -264,6 +264,10 @@ private static SteeltoeVersion ToSteeltoeEnum(string steeltoe) { return SteeltoeVersion.Steeltoe40; } + if (steeltoe.StartsWith("4.1")) + { + return SteeltoeVersion.Steeltoe41; + } if (steeltoe.StartsWith("4.*")) { return SteeltoeVersion.SteeltoeUnstable; diff --git a/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs b/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs index a064b59..7b76e33 100644 --- a/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs @@ -7,7 +7,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.0.*"); + Values.Add("4.1.*"); Values.Add("4.*-main-*"); } }