Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,20 @@
"text": "Steeltoe 4.0"
}
},
{
"id": "4.1.*",
"name": {
"text": "Steeltoe 4.1"
}
},
{
"id": "4.*-main-*",
"name": {
"text": "Steeltoe 4.x (unstable)"
}
}
],
"defaultValue": "4.0.*"
"defaultValue": "4.1.*"
},
{
"id": "DescriptionOption",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"description": "Target net10.0"
}
],
"defaultValue": "net8.0",
"defaultValue": "net10.0",
"replaces": "$(FrameworkOption)"
},
"IsFrameworkNet60": {
Expand Down Expand Up @@ -134,7 +134,7 @@
"description": "The Steeltoe version to use.",
"type": "parameter",
"datatype": "string",
"defaultValue": "4.0.*",
"defaultValue": "4.1.*",
"replaces": "$(SteeltoeVersionInCLI)"
},
"IsSteeltoeV3InCLI": {
Expand Down Expand Up @@ -174,6 +174,9 @@
{
"choice": "4.0.*"
},
{
"choice": "4.1.*"
},
{
"choice": "4.*-main-*"
}
Expand Down
1 change: 1 addition & 0 deletions test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ private static void AssertSteeltoeVersion(SteeltoeVersion steeltoeVersion)
{
case SteeltoeVersion.Steeltoe32:
case SteeltoeVersion.Steeltoe40:
case SteeltoeVersion.Steeltoe41:
case SteeltoeVersion.SteeltoeUnstable:
break;
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public enum SteeltoeVersion
{
Steeltoe32,
Steeltoe40,
Steeltoe41,
SteeltoeUnstable
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ public IEnumerator<object[]> 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#" }
Expand Down
4 changes: 4 additions & 0 deletions test/NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-*");
}
}
Expand Down