Update templates for Steeltoe v4.3

.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

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",

src/Content/NetCoreTool.Template.WebApi/CSharp/Company.WebApplication.CS.csproj

@@ -73,6 +73,7 @@
     <PackageReference Include="Steeltoe.Logging.DynamicSerilog" Condition="'$(HasLoggingDynamicSerilogInSteeltoeV4)' == 'True'" Version="$(SteeltoeVersion)" />
     <PackageReference Include="Steeltoe.Management.Endpoint" Condition="'$(HasManagementEndpointsInSteeltoeV4)' == 'True'" Version="$(SteeltoeVersion)" />
     <PackageReference Include="Steeltoe.Management.EndpointCore" Condition="'$(HasManagementEndpointsInSteeltoeV3)' == 'True'" Version="$(SteeltoeVersion)" />
+    <PackageReference Include="Steeltoe.Management.GitProperties.Build" Condition="'$(HasManagementEndpointsInSteeltoeV4)' == 'True'" Version="$(SteeltoeVersion)" />
     <PackageReference Include="Steeltoe.Management.TaskCore" Condition="'$(HasManagementTasksInSteeltoeV3)' == 'True'" Version="$(SteeltoeVersion)" />
     <PackageReference Include="Steeltoe.Management.Tasks" Condition="'$(HasManagementTasksInSteeltoeV4)' == 'True'" Version="$(SteeltoeVersion)" />
     <PackageReference Include="Steeltoe.Management.Tracing" Condition="'$(HasDistributedTracingInSteeltoeV4)' == 'True'" Version="$(SteeltoeVersion)" />

src/Steeltoe.NetCoreTool.Templates.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <PackageType>Template</PackageType>
     <PackageId>Steeltoe.NetCoreTool.Templates</PackageId>
-    <VersionPrefix>1.6.1</VersionPrefix>
+    <VersionPrefix>1.7.0</VersionPrefix>
     <VersionSuffix>pre</VersionSuffix>
     <Title>Steeltoe .NET Project Templates</Title>
     <Authors>Broadcom</Authors>

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:

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<string> 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<string> snippets)

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
     }
 }

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

@@ -12,9 +12,9 @@ public IEnumerator<object[]> GetEnumerator()
                 return new List<object[]>
                 {
                     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#" }

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.*"))
             {