diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 87f2e6c..fe9f46a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -233,6 +233,8 @@ jobs:
if: ${{ github.event_name == 'release' }}
environment: nuget.org
runs-on: ubuntu-latest
+ permissions:
+ id-token: write
steps:
- name: Setup .NET
@@ -246,8 +248,14 @@ jobs:
name: signed-packages
path: packages
+ - name: NuGet login
+ uses: NuGet/login@v1
+ id: nuget-login
+ with:
+ user: ${{ secrets.NUGET_USER }}
+
- name: Push packages to nuget.org
- run: dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --skip-duplicate --api-key '${{ secrets.STEELTOE_NUGET_API_KEY }}' --source 'nuget.org'
+ run: dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --skip-duplicate --api-key '${{ steps.nuget-login.outputs.NUGET_API_KEY }}' --source 'nuget.org'
open_pr:
name: Open pull request to bump templates version after stable release
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 0584921..360be03 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
@@ -24,9 +24,9 @@
}
},
{
- "id": "4.2.*",
+ "id": "4.3.*",
"name": {
- "text": "Steeltoe 4.2"
+ "text": "Steeltoe 4.3"
}
},
{
@@ -36,7 +36,7 @@
}
}
],
- "defaultValue": "4.2.*"
+ "defaultValue": "4.3.*"
},
{
"id": "DescriptionOption",
diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/Company.WebApplication.CS.csproj b/src/Content/NetCoreTool.Template.WebApi/CSharp/Company.WebApplication.CS.csproj
index 8a6bb8d..3dcfd2f 100644
--- a/src/Content/NetCoreTool.Template.WebApi/CSharp/Company.WebApplication.CS.csproj
+++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/Company.WebApplication.CS.csproj
@@ -73,6 +73,7 @@
+
diff --git a/src/Steeltoe.NetCoreTool.Templates.csproj b/src/Steeltoe.NetCoreTool.Templates.csproj
index 20dae85..41fa66a 100644
--- a/src/Steeltoe.NetCoreTool.Templates.csproj
+++ b/src/Steeltoe.NetCoreTool.Templates.csproj
@@ -3,7 +3,7 @@
net8.0
Template
Steeltoe.NetCoreTool.Templates
- 1.6.1
+ 1.7.0
pre
Steeltoe .NET Project Templates
Broadcom
diff --git a/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs b/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs
index d69970e..8a32f90 100644
--- a/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs
+++ b/test/NetCoreTool.Template.WebApi.Test/DefaultsTest.cs
@@ -73,7 +73,7 @@ private static void AssertSteeltoeVersion(SteeltoeVersion steeltoeVersion)
switch (steeltoeVersion)
{
case SteeltoeVersion.Steeltoe34:
- case SteeltoeVersion.Steeltoe42:
+ case SteeltoeVersion.Steeltoe43:
case SteeltoeVersion.SteeltoeUnstable:
break;
default:
diff --git a/test/NetCoreTool.Template.WebApi.Test/ManagementEndpointsOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/ManagementEndpointsOptionTest.cs
index 5cdc126..831633b 100644
--- a/test/NetCoreTool.Template.WebApi.Test/ManagementEndpointsOptionTest.cs
+++ b/test/NetCoreTool.Template.WebApi.Test/ManagementEndpointsOptionTest.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
using Steeltoe.NetCoreTool.Template.WebApi.Test.Models;
+using System.Collections.Generic;
+using System.Linq;
using Xunit.Abstractions;
namespace Steeltoe.NetCoreTool.Template.WebApi.Test
@@ -9,12 +10,20 @@ public class ManagementEndpointsOptionTest(ITestOutputHelper logger)
{
protected override void AssertPackageReferencesHook(ProjectOptions options, List<(string, string)> packages)
{
- packages.Add((GetPackageName(options.SteeltoeVersion), "$(SteeltoeVersion)"));
+ packages.AddRange(GetPackageNames(options.SteeltoeVersion).Select(packageName => (packageName, "$(SteeltoeVersion)")));
}
- private static string GetPackageName(SteeltoeVersion steeltoeVersion)
+ private static IEnumerable GetPackageNames(SteeltoeVersion steeltoeVersion)
{
- return steeltoeVersion == SteeltoeVersion.Steeltoe34 ? "Steeltoe.Management.EndpointCore" : "Steeltoe.Management.Endpoint";
+ if (steeltoeVersion == SteeltoeVersion.Steeltoe34)
+ {
+ yield return "Steeltoe.Management.EndpointCore";
+ }
+ else
+ {
+ yield return "Steeltoe.Management.Endpoint";
+ yield return "Steeltoe.Management.GitProperties.Build";
+ }
}
protected override void AssertProgramSnippetsHook(ProjectOptions options, List snippets)
diff --git a/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs b/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs
index 5f918de..109d0d7 100644
--- a/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs
+++ b/test/NetCoreTool.Template.WebApi.Test/Models/SteeltoeVersion.cs
@@ -3,7 +3,7 @@ namespace Steeltoe.NetCoreTool.Template.WebApi.Test.Models
public enum SteeltoeVersion
{
Steeltoe34,
- Steeltoe42,
+ Steeltoe43,
SteeltoeUnstable
}
}
diff --git a/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs b/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs
index db2555f..d81b496 100644
--- a/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs
+++ b/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs
@@ -12,9 +12,9 @@ public IEnumerator GetEnumerator()
return new List
{
new object[] { "3.4.*", "net8.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.3.*", "net8.0", "C#" },
+ new object[] { "4.3.*", "net9.0", "C#" },
+ new object[] { "4.3.*", "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 be0ce1f..799da70 100644
--- a/test/NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs
+++ b/test/NetCoreTool.Template.WebApi.Test/ProjectOptionTest.cs
@@ -262,9 +262,9 @@ private static SteeltoeVersion ToSteeltoeEnum(string steeltoe)
{
return SteeltoeVersion.Steeltoe34;
}
- if (steeltoe.StartsWith("4.2"))
+ if (steeltoe.StartsWith("4.3"))
{
- return SteeltoeVersion.Steeltoe42;
+ return SteeltoeVersion.Steeltoe43;
}
if (steeltoe.StartsWith("4.*"))
{