Skip to content

Commit 1932b1d

Browse files
committed
Add Steeltoe 4.1
1 parent 94fcca3 commit 1932b1d

File tree

7 files changed

+25
-6
lines changed

7 files changed

+25
-6
lines changed

src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,20 @@
2929
"text": "Steeltoe 4.0"
3030
}
3131
},
32+
{
33+
"id": "4.1.*",
34+
"name": {
35+
"text": "Steeltoe 4.1"
36+
}
37+
},
3238
{
3339
"id": "4.*-main-*",
3440
"name": {
3541
"text": "Steeltoe 4.x (unstable)"
3642
}
3743
}
3844
],
39-
"defaultValue": "4.0.*"
45+
"defaultValue": "4.1.*"
4046
},
4147
{
4248
"id": "DescriptionOption",

src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"description": "Target net10.0"
9292
}
9393
],
94-
"defaultValue": "net8.0",
94+
"defaultValue": "net10.0",
9595
"replaces": "$(FrameworkOption)"
9696
},
9797
"IsFrameworkNet60": {
@@ -134,7 +134,7 @@
134134
"description": "The Steeltoe version to use.",
135135
"type": "parameter",
136136
"datatype": "string",
137-
"defaultValue": "4.0.*",
137+
"defaultValue": "4.1.*",
138138
"replaces": "$(SteeltoeVersionInCLI)"
139139
},
140140
"IsSteeltoeV3InCLI": {
@@ -174,6 +174,9 @@
174174
{
175175
"choice": "4.0.*"
176176
},
177+
{
178+
"choice": "4.1.*"
179+
},
177180
{
178181
"choice": "4.*-main-*"
179182
}

test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ private static void AssertSteeltoeVersion(SteeltoeVersion steeltoeVersion)
7878
{
7979
case SteeltoeVersion.Steeltoe32:
8080
case SteeltoeVersion.Steeltoe40:
81+
case SteeltoeVersion.Steeltoe41:
8182
case SteeltoeVersion.SteeltoeUnstable:
8283
break;
8384
default:

test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public enum SteeltoeVersion
44
{
55
Steeltoe32,
66
Steeltoe40,
7+
Steeltoe41,
78
SteeltoeUnstable
89
}
910
}

test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ public IEnumerator<object[]> GetEnumerator()
1414
new object[] { "3.2.8", "net6.0", "C#" },
1515
new object[] { "3.2.8", "net8.0", "C#" },
1616
new object[] { "3.2.8", "net9.0", "C#" },
17-
new object[] { "4.0.*-*", "net8.0", "C#" },
18-
new object[] { "4.0.*-*", "net9.0", "C#" },
17+
new object[] { "4.0.*", "net8.0", "C#" },
18+
new object[] { "4.0.*", "net9.0", "C#" },
19+
new object[] { "4.1.*", "net8.0", "C#" },
20+
new object[] { "4.1.*", "net9.0", "C#" },
21+
new object[] { "4.1.*", "net10.0", "C#" },
1922
new object[] { "4.*-main-*", "net8.0", "C#" },
2023
new object[] { "4.*-main-*", "net9.0", "C#" },
2124
new object[] { "4.*-main-*", "net10.0", "C#" }

test/NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,10 @@ private static SteeltoeVersion ToSteeltoeEnum(string steeltoe)
264264
{
265265
return SteeltoeVersion.Steeltoe40;
266266
}
267+
if (steeltoe.StartsWith("4.1"))
268+
{
269+
return SteeltoeVersion.Steeltoe41;
270+
}
267271
if (steeltoe.StartsWith("4.*"))
268272
{
269273
return SteeltoeVersion.SteeltoeUnstable;

test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ public class SteeltoeParameterTest : ParameterTest
77
public SteeltoeParameterTest(ITestOutputHelper logger) : base("steeltoe", "The Steeltoe version to use.", logger)
88
{
99
Values.Add("3.2.*");
10-
Values.Add("4.0.*-*");
10+
Values.Add("4.0.*");
11+
Values.Add("4.1.*");
1112
Values.Add("4.*-main-*");
1213
}
1314
}

0 commit comments

Comments
 (0)