From f9f9d51fbbd566f485585714651a5f329bacce7f Mon Sep 17 00:00:00 2001
From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
Date: Fri, 11 Jul 2025 17:10:03 +0200
Subject: [PATCH 1/5] Adapt for GHA environment variables

---
 shared-package.props                                   | 2 +-
 src/Common/test/TestResources/TestContextExtensions.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-package.props b/shared-package.props
index 21a8eaf032..66904b1008 100644
--- a/shared-package.props
+++ b/shared-package.props
@@ -31,7 +31,7 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+  <PropertyGroup Condition="'$(CI)' != ''">
     <!--
       While deterministic builds are enabled by default in .NET SDK projects, there is an extra property, ContinuousIntegrationBuild,
       to set on the build server to normalize stored file paths. These should not be enabled during local dev or the debugger won't
diff --git a/src/Common/test/TestResources/TestContextExtensions.cs b/src/Common/test/TestResources/TestContextExtensions.cs
index 930cfe12e1..5aefeaa5b1 100644
--- a/src/Common/test/TestResources/TestContextExtensions.cs
+++ b/src/Common/test/TestResources/TestContextExtensions.cs
@@ -12,6 +12,6 @@ public static bool IsRunningOnBuildServer(this ITestContext testContext)
     {
         ArgumentNullException.ThrowIfNull(testContext);
 
-        return Environment.GetEnvironmentVariable("CI") == "true" || !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("SYSTEM_TEAMPROJECT"));
+        return Environment.GetEnvironmentVariable("CI") == "true";
     }
 }

From db877a47e28292f536a8974420c14af3986ce88e Mon Sep 17 00:00:00 2001
From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
Date: Fri, 11 Jul 2025 17:46:15 +0200
Subject: [PATCH 2/5] Remove nbgv

---
 .github/workflows/Steeltoe.All.yml              |  9 ---------
 .github/workflows/component-shared-workflow.yml |  9 ---------
 .github/workflows/sonarcube.yml                 |  3 ---
 .github/workflows/verify-code-style.yml         |  5 +----
 shared-package.props                            |  2 ++
 shared.props                                    |  1 -
 src/Steeltoe.All.sln                            | 12 ++++--------
 version.json                                    | 12 ------------
 versions.props                                  |  1 -
 9 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 version.json

diff --git a/.github/workflows/Steeltoe.All.yml b/.github/workflows/Steeltoe.All.yml
index ea38174144..529dcccf27 100644
--- a/.github/workflows/Steeltoe.All.yml
+++ b/.github/workflows/Steeltoe.All.yml
@@ -77,21 +77,12 @@ jobs:
       shell: bash
       run: echo "DOTNET_GENERATE_ASPNET_CERTIFICATE=false" >> $GITHUB_ENV
 
-    - name: Install Nerdbank.GitVersioning (macOS only)
-      if: ${{ matrix.os == 'macos-latest' }}
-      run: dotnet tool install --global nbgv
-
     - name: Git checkout
       uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
 
     - name: Restore packages
       run: dotnet restore ${{ env.SOLUTION_FILE }} --verbosity minimal
 
-    - name: Set package version
-      run: nbgv cloud
-
     - name: Build solution
       run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release --verbosity minimal
 
diff --git a/.github/workflows/component-shared-workflow.yml b/.github/workflows/component-shared-workflow.yml
index ee58120980..fd4cb781d7 100644
--- a/.github/workflows/component-shared-workflow.yml
+++ b/.github/workflows/component-shared-workflow.yml
@@ -74,21 +74,12 @@ jobs:
       shell: bash
       run: echo "DOTNET_GENERATE_ASPNET_CERTIFICATE=false" >> $GITHUB_ENV
 
-    - name: Install Nerdbank.GitVersioning (macOS only)
-      if: ${{ inputs.OS == 'macos' }}
-      run: dotnet tool install --global nbgv
-
     - name: Git checkout
       uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
 
     - name: Restore packages
       run: dotnet restore ${{ env.SOLUTION_FILE }} --verbosity minimal
 
-    - name: Set package version
-      run: nbgv cloud
-
     - name: Build solution
       run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release --verbosity minimal
 
diff --git a/.github/workflows/sonarcube.yml b/.github/workflows/sonarcube.yml
index 493d9e5b2b..16fd24aae3 100644
--- a/.github/workflows/sonarcube.yml
+++ b/.github/workflows/sonarcube.yml
@@ -67,9 +67,6 @@ jobs:
     - name: Restore packages
       run: dotnet restore ${{ env.SOLUTION_FILE }} --verbosity minimal
 
-    - name: Set package version
-      run: nbgv cloud
-
     - name: Begin Sonar .NET scanner
       id: sonar_begin
       env:
diff --git a/.github/workflows/verify-code-style.yml b/.github/workflows/verify-code-style.yml
index 2da29b7889..a7b9ac1b79 100644
--- a/.github/workflows/verify-code-style.yml
+++ b/.github/workflows/verify-code-style.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Git checkout
       uses: actions/checkout@v4
       with:
-        fetch-depth: 0
+        fetch-depth: 2
 
     - name: Restore tools
       run: dotnet tool restore --verbosity minimal
@@ -45,9 +45,6 @@ jobs:
     - name: Restore packages
       run: dotnet restore ${{ env.SOLUTION_FILE }} --verbosity minimal
 
-    - name: Set package version
-      run: nbgv cloud
-
     - name: CleanupCode (on PR diff)
       if: ${{ github.event_name == 'pull_request' }}
       shell: pwsh
diff --git a/shared-package.props b/shared-package.props
index 66904b1008..721a23607d 100644
--- a/shared-package.props
+++ b/shared-package.props
@@ -12,6 +12,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <VersionPrefix>4.0.0</VersionPrefix>
+    <VersionSuffix>pre</VersionSuffix>
     <Authors>Broadcom</Authors>
     <PackageIcon>PackageIcon.png</PackageIcon>
     <PackageProjectUrl>https://steeltoe.io</PackageProjectUrl>
diff --git a/shared.props b/shared.props
index faa0a95dcb..84124a78d7 100644
--- a/shared.props
+++ b/shared.props
@@ -50,6 +50,5 @@
   <ItemGroup>
     <PackageReference Include="SonarAnalyzer.CSharp" Version="$(SonarAnalyzerVersion)" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="$(NerdbankGitVersioningVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/Steeltoe.All.sln b/src/Steeltoe.All.sln
index c05825920c..23230b91f9 100644
--- a/src/Steeltoe.All.sln
+++ b/src/Steeltoe.All.sln
@@ -26,9 +26,13 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_shared", "_shared", "{DC1BC61A-E0FA-4CF9-9F24-D4C564A07836}"
 	ProjectSection(SolutionItems) = preProject
 		..\.editorconfig = ..\.editorconfig
+		..\.gitattributes = ..\.gitattributes
 		..\.gitignore = ..\.gitignore
+		..\cleanupcode.ps1 = ..\cleanupcode.ps1
+		..\coverlet.runsettings = ..\coverlet.runsettings
 		..\Directory.Build.targets = ..\Directory.Build.targets
 		..\nuget.config = ..\nuget.config
+		..\PackageReadme.md = ..\PackageReadme.md
 		..\shared-package.props = ..\shared-package.props
 		..\shared-project.props = ..\shared-project.props
 		..\shared-test.props = ..\shared-test.props
@@ -36,7 +40,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_shared", "_shared", "{DC1B
 		..\Steeltoe.Debug.ruleset = ..\Steeltoe.Debug.ruleset
 		..\Steeltoe.Release.ruleset = ..\Steeltoe.Release.ruleset
 		..\stylecop.json = ..\stylecop.json
-		..\version.json = ..\version.json
 		..\versions.props = ..\versions.props
 	EndProjectSection
 EndProject
@@ -154,13 +157,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Bootstrap.AutoConf
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Bootstrap.AutoConfiguration.Test", "Bootstrap\test\AutoConfiguration.Test\Steeltoe.Bootstrap.AutoConfiguration.Test.csproj", "{6499285A-88CF-426A-909D-307382B91AA3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_build", "_build", "{656A7881-FE4F-4EE0-81C8-DA1DE6CDF29E}"
-	ProjectSection(SolutionItems) = preProject
-		..\coverlet.runsettings = ..\coverlet.runsettings
-		..\build\package.yml = ..\build\package.yml
-		..\build\pr-code-cleanup.yml = ..\build\pr-code-cleanup.yml
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Configuration.Kubernetes.ServiceBindings", "Configuration\src\Kubernetes.ServiceBindings\Steeltoe.Configuration.Kubernetes.ServiceBindings.csproj", "{6A064B5A-21F7-452A-AAFF-3C0A68286FDF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Configuration.Kubernetes.ServiceBindings.Test", "Configuration\test\Kubernetes.ServiceBindings.Test\Steeltoe.Configuration.Kubernetes.ServiceBindings.Test.csproj", "{0D68FC03-7FD4-4280-852B-0E620872CE22}"
diff --git a/version.json b/version.json
deleted file mode 100644
index cf663c5c85..0000000000
--- a/version.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "4.0-beta",
-  "publicReleaseRefSpec": [
-    "^refs/heads/main$",
-    "^refs/heads/release/[0-9]+.*$"
-  ],
-  "cloudBuild": {
-    // https://github.com/dotnet/Nerdbank.GitVersioning/blob/main/doc/cloudbuild.md#set-cloud-build-variables-only-once-in-a-build
-    "setVersionVariables": false
-  }
-}
diff --git a/versions.props b/versions.props
index 908d2e972f..a11c13fea6 100644
--- a/versions.props
+++ b/versions.props
@@ -16,7 +16,6 @@
     <MoqVersion>4.20.69</MoqVersion>
     <MySqlConnectorVersion>2.4.*</MySqlConnectorVersion>
     <MySqlDataVersion>9.3.*</MySqlDataVersion>
-    <NerdbankGitVersioningVersion>3.7.*</NerdbankGitVersioningVersion>
     <NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
     <PublicApiAnalyzersVersion>4.14.*</PublicApiAnalyzersVersion>
     <RabbitClientTestVersion>7.1.*</RabbitClientTestVersion>

From c154c4ff381f423f0c45da7a3792f11ed7eacad8 Mon Sep 17 00:00:00 2001
From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
Date: Mon, 14 Jul 2025 13:57:07 +0200
Subject: [PATCH 3/5] Fix invalid assembly version in tests

---
 .../Services/ServicesActuatorTest.cs          | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Management/test/Endpoint.Test/Actuators/Services/ServicesActuatorTest.cs b/src/Management/test/Endpoint.Test/Actuators/Services/ServicesActuatorTest.cs
index 4e2e178376..5dfae76140 100644
--- a/src/Management/test/Endpoint.Test/Actuators/Services/ServicesActuatorTest.cs
+++ b/src/Management/test/Endpoint.Test/Actuators/Services/ServicesActuatorTest.cs
@@ -17,7 +17,7 @@ namespace Steeltoe.Management.Endpoint.Test.Actuators.Services;
 
 public sealed class ServicesActuatorTest
 {
-    private static readonly string SteeltoeAssemblyVersion = typeof(IServicesEndpointHandler).Assembly.GetName().Version!.ToString();
+    private static readonly string SteeltoeTestAssemblyVersion = typeof(ServicesActuatorTest).Assembly.GetName().Version!.ToString();
     private static readonly string MicrosoftOptionsAssemblyName = typeof(Options).Assembly.ToString();
     private static readonly string MicrosoftLoggingAssemblyName = typeof(LoggerFilterOptions).Assembly.ToString();
     private static readonly string MicrosoftLoggingAbstractionsAssemblyName = typeof(ILogger).Assembly.ToString();
@@ -219,7 +219,7 @@ public async Task Can_resolve_transient_for_implementation_type()
                     "{{typeof(ServicesActuatorTest)}}+ExampleService": {
                       "scope": "Transient",
                       "type": "{{typeof(ServicesActuatorTest)}}+ExampleService",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -246,7 +246,7 @@ public async Task Can_resolve_keyed_transient_for_implementation_type()
                       "scope": "Transient",
                       "type": "{{typeof(ServicesActuatorTest)}}+ExampleService",
                       "key": "exampleKey",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -272,7 +272,7 @@ public async Task Can_resolve_transient_for_interface_type_with_implementation_t
                     "{{typeof(ServicesActuatorTest)}}+IExampleService": {
                       "scope": "Transient",
                       "type": "{{typeof(ServicesActuatorTest)}}+ExampleService",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -299,7 +299,7 @@ public async Task Can_resolve_keyed_transient_for_interface_type_with_implementa
                       "scope": "Transient",
                       "type": "{{typeof(ServicesActuatorTest)}}+ExampleService",
                       "key": "exampleKey",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -325,7 +325,7 @@ public async Task Can_resolve_scoped_for_implementation_factory()
                     "{{typeof(ServicesActuatorTest)}}+ExampleService": {
                       "scope": "Scoped",
                       "type": "{{typeof(ServicesActuatorTest)}}+ExampleService",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -352,7 +352,7 @@ public async Task Can_resolve_keyed_scoped_for_implementation_factory()
                       "scope": "Scoped",
                       "type": "{{typeof(ServicesActuatorTest)}}+ExampleService",
                       "key": "exampleKey",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -378,7 +378,7 @@ public async Task Can_resolve_scoped_for_interface_type_with_implementation_fact
                     "{{typeof(ServicesActuatorTest)}}+IExampleService": {
                       "scope": "Scoped",
                       "type": "{{typeof(ServicesActuatorTest)}}+IExampleService",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -405,7 +405,7 @@ public async Task Can_resolve_keyed_scoped_for_interface_type_with_implementatio
                       "scope": "Scoped",
                       "type": "{{typeof(ServicesActuatorTest)}}+IExampleService",
                       "key": "exampleKey",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -431,7 +431,7 @@ public async Task Can_resolve_singleton_for_implementation_instance()
                     "{{typeof(ServicesActuatorTest)}}+ExampleService": {
                       "scope": "Singleton",
                       "type": "{{typeof(ServicesActuatorTest)}}+ExampleService",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -458,7 +458,7 @@ public async Task Can_resolve_keyed_singleton_for_implementation_instance()
                       "scope": "Singleton",
                       "type": "{{typeof(ServicesActuatorTest)}}+ExampleService",
                       "key": "exampleKey",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -484,7 +484,7 @@ public async Task Can_resolve_singleton_for_interface_with_implementation_instan
                     "{{typeof(ServicesActuatorTest)}}+IExampleService": {
                       "scope": "Singleton",
                       "type": "{{typeof(ServicesActuatorTest)}}+ExampleService",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }
@@ -511,7 +511,7 @@ public async Task Can_resolve_keyed_singleton_for_interface_with_implementation_
                       "scope": "Singleton",
                       "type": "{{typeof(ServicesActuatorTest)}}+ExampleService",
                       "key": "exampleKey",
-                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
+                      "resource": "Steeltoe.Management.Endpoint.Test, Version={{SteeltoeTestAssemblyVersion}}, Culture=neutral, PublicKeyToken=null",
                       "dependencies": []
                     }
                   }

From 1f41e34decc41d328b4115736e53deb84711b01c Mon Sep 17 00:00:00 2001
From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
Date: Mon, 14 Jul 2025 13:38:01 +0200
Subject: [PATCH 4/5] Create package.yml, fix build for stable release

---
 .github/workflows/Steeltoe.All.yml            |   1 +
 .github/workflows/package.yml                 | 276 +++++++++++++++++-
 .github/workflows/verify-code-style.yml       |   2 +-
 build/package.yml                             |  96 ------
 .../Steeltoe.Management.Prometheus.csproj     |   2 +-
 5 files changed, 275 insertions(+), 102 deletions(-)
 delete mode 100644 build/package.yml

diff --git a/.github/workflows/Steeltoe.All.yml b/.github/workflows/Steeltoe.All.yml
index 529dcccf27..6fcf039cbb 100644
--- a/.github/workflows/Steeltoe.All.yml
+++ b/.github/workflows/Steeltoe.All.yml
@@ -30,6 +30,7 @@ jobs:
     name: Build and Test
     timeout-minutes: 30
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         include:
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 992d8c4574..6b6dffa26a 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -8,16 +8,284 @@ on:
     - '[0-9]+.x'
     - 'release/*'
   pull_request:
+  release:
+    types:
+    - published
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: true
+  SOLUTION_FILE: 'src/Steeltoe.All.sln'
+  VERSION_FILE: 'shared-package.props'
+
 jobs:
-  empty:
-    name: Empty job
+  build:
+    name: Build
+    timeout-minutes: 15
     runs-on: ubuntu-latest
 
     steps:
-    - name: Empty step
-      run: echo "Packaging using GitHub Actions is not yet implemented."
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: |
+          8.0.*
+          9.0.*
+
+    - name: Git checkout
+      uses: actions/checkout@v4
+
+    - name: Restore packages
+      run: dotnet restore ${{ env.SOLUTION_FILE }} --verbosity minimal
+
+    - name: Calculate package version (for release)
+      if: ${{ github.event_name == 'release' }}
+      env:
+        TAG_NAME: ${{ github.ref_name }}
+      shell: pwsh
+      run: |
+        # Get the version suffix from the git tag. For example: '1.2.3-preview1-final' => 'preview1-final'
+        $tagSegments = '${{ env.TAG_NAME }}' -split '-'
+        $versionPrefix = $tagSegments[0]
+        $versionSuffix = $tagSegments.Length -eq 1 ? '' : $tagSegments[1..$($tagSegments.Length - 1)] -join '-'
+
+        [xml]$xml = Get-Content $env:VERSION_FILE
+        $configuredVersionPrefix = $xml.Project.PropertyGroup.VersionPrefix | Select-Object -First 1
+
+        if ($configuredVersionPrefix -ne $versionPrefix) {
+            Write-Error "Version prefix from git release tag '$versionPrefix' does not match version prefix '$configuredVersionPrefix' stored in $env:VERSION_FILE."
+            # To recover from this:
+            # - Delete the GitHub release
+            # - Run: git push --delete origin the-invalid-tag-name
+            # - Adjust VersionPrefix in file, commit and push
+            # - Recreate the GitHub release
+        }
+
+        Write-Output "Using version suffix: $versionSuffix"
+        Write-Output "PACKAGE_VERSION_SUFFIX=$versionSuffix" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+    - name: Calculate package version (for branch)
+      if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+      env:
+        BRANCH_NAME: ${{ github.ref_name }}
+      shell: pwsh
+      run: |
+        # Get the version suffix from the branch name and auto-incrementing build number. For example: 'main' and '123' => 'main-00123'
+        $revision = "{0:D5}" -f ${{ github.run_number }}
+        $branchName = '${{ env.BRANCH_NAME }}'
+        $safeBranchName = $branchName -Replace '[^a-zA-Z0-9-]', '-'
+        $versionSuffix = "$safeBranchName-$revision"
+
+        Write-Output "Using version suffix: $versionSuffix"
+        Write-Output "PACKAGE_VERSION_SUFFIX=$versionSuffix" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+    - name: Calculate package version (for pr)
+      if: ${{ github.event_name == 'pull_request' }}
+      shell: pwsh
+      run: |
+        # Get the version suffix from the PR number and auto-incrementing build number. For example: '18' and '123' => 'pr18-00123'
+        $revision = "{0:D5}" -f ${{ github.run_number }}
+        $versionSuffix = "pr${{ github.event.number }}-$revision"
+
+        Write-Output "Using version suffix: $versionSuffix"
+        Write-Output "PACKAGE_VERSION_SUFFIX=$versionSuffix" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+    - name: Verify package version
+      if: ${{ !env.PACKAGE_VERSION_SUFFIX && github.event_name != 'release' }}
+      run: |
+        echo "Package version suffix is empty. This should never happen."
+        exit 1
+
+    - name: Build solution
+      run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release --verbosity minimal /p:VersionSuffix=${{ env.PACKAGE_VERSION_SUFFIX }}
+
+    - name: Collect packages
+      run: dotnet pack ${{ env.SOLUTION_FILE }} --no-build --configuration Release --output ${{ github.workspace }}/packages /p:VersionSuffix=${{ env.PACKAGE_VERSION_SUFFIX }}
+
+    - name: Upload unsigned packages
+      uses: actions/upload-artifact@v4
+      with:
+        if-no-files-found: error
+        name: unsigned-packages
+        path: ${{ github.workspace }}/packages/**/*.nupkg
+
+  sign:
+    name: Sign
+    if: ${{ github.event_name != 'pull_request' }}
+    timeout-minutes: 15
+    needs: build
+    runs-on: windows-latest
+    environment: signing
+    permissions:
+      id-token: write
+
+    steps:
+      - name: Download unsigned packages
+        uses: actions/download-artifact@v4
+        with:
+          name: unsigned-packages
+          path: packages
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.*
+
+      - name: Install code signing tool
+        run: dotnet tool install --global sign --prerelease
+
+      - name: Azure login
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+      - name: Sign packages
+        run: >-
+          sign code azure-key-vault '**/*.nupkg'
+          --base-directory '${{ github.workspace }}/packages'
+          --azure-key-vault-managed-identity true
+          --azure-credential-type 'azure-cli'
+          --azure-key-vault-url '${{ secrets.AZURE_KEY_VAULT_URL }}'
+          --azure-key-vault-certificate '${{ secrets.AZURE_SIGN_CERTIFICATE_ID }}'
+          --publisher-name 'Steeltoe'
+          --description 'Steeltoe'
+          --description-url 'https://steeltoe.io/'
+
+      - name: Upload signed packages
+        uses: actions/upload-artifact@v4
+        with:
+          if-no-files-found: error
+          name: signed-packages
+          path: ${{ github.workspace }}/packages/**/*.nupkg
+
+  dev-feed-deploy:
+    name: Deploy packages to development feed
+    timeout-minutes: 15
+    needs: sign
+    if: ${{ github.event_name != 'pull_request' }}
+    environment: azdo
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    env:
+      VSS_NUGET_URI_PREFIXES: https://pkgs.dev.azure.com/dotnet/
+
+    steps:
+      - name: Azure login
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+      - name: Download signed packages
+        uses: actions/download-artifact@v4
+        with:
+          name: signed-packages
+          path: packages
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+          source-url: ${{ vars.AZURE_ARTIFACTS_FEED_URL }}
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install credential provider for Azure Artifacts
+        run: sh -c "$(curl -fsSL https://aka.ms/install-artifacts-credprovider.sh)"
+
+      - name: Extract access token
+        run: |
+          accessToken=$(az account get-access-token --query accessToken --resource 499b84ac-1321-427f-aa17-267ca6975798 -o tsv)
+          echo "::add-mask::$accessToken"
+          echo "ACCESS_TOKEN=$accessToken" >> $GITHUB_ENV
+
+      - name: Configure authentication provider to use Azure DevOps token
+        run: echo "VSS_NUGET_ACCESSTOKEN=$ACCESS_TOKEN" >> $GITHUB_ENV
+
+      - name: Push packages to Azure Artifacts
+        run: dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --api-key 'azdo-placeholder' --source '${{ vars.AZURE_ARTIFACTS_FEED_URL }}'
+
+  nuget-org-deploy:
+    name: Deploy packages to nuget.org
+    needs: sign
+    if: ${{ github.event_name == 'release' }}
+    environment: nuget.org
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Download signed packages
+        uses: actions/download-artifact@v4
+        with:
+          name: signed-packages
+          path: packages
+
+      - name: Push packages to nuget.org
+        run: dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --api-key '${{ secrets.STEELTOE_NUGET_API_KEY }}' --source 'nuget.org'
+
+  open_pr:
+    name: Open pull request to bump Steeltoe version after release
+    needs: nuget-org-deploy
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+    - name: Git checkout
+      uses: actions/checkout@v4
+
+    - name: Calculate next package version
+      shell: pwsh
+      run: |
+        [xml]$xml = Get-Content $env:VERSION_FILE
+        $oldVersionPrefix = $xml.Project.PropertyGroup.VersionPrefix | Select-Object -First 1
+
+        $versionSegments = $oldVersionPrefix.split('.')
+        ([int]$versionSegments[-1])++
+        $newVersionPrefix = $versionSegments -join('.')
+
+        Write-Output "OLD_PACKAGE_VERSION_PREFIX=$oldVersionPrefix" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        Write-Output "NEW_PACKAGE_VERSION_PREFIX=$newVersionPrefix" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+    - name: Open pull request
+      env:
+        GH_TOKEN: ${{ github.token }}
+      shell: pwsh
+      run: |
+        $oldVersionPrefix = '${{ env.OLD_PACKAGE_VERSION_PREFIX }}'
+        $newVersionPrefix = '${{ env.NEW_PACKAGE_VERSION_PREFIX }}'
+        $prBranchName = "bump-version-to-$newVersionPrefix-${{ github.run_number }}"
+        $commitMessage = "Bump Steeltoe version from $oldVersionPrefix to $newVersionPrefix."
+
+        $pattern = '(?<left>^\s*\<VersionPrefix\>)[^>]+(?<right>\<\/VersionPrefix\>)\s*$'
+        $fileContent = Get-Content $env:VERSION_FILE
+        $fileContent = $fileContent -Replace $pattern,"`${left}$newVersionPrefix`${right}"
+        Set-Content $fileContent -Path $env:VERSION_FILE
+
+        Write-Output "Creating pull request for commit: $commitMessage"
+        git config --local user.name "github-actions[bot]"
+        git config --local user.email "github-actions[bot]@users.noreply.github.com"
+        git checkout -b $prBranchName
+        git add -A
+        git commit -m $commitMessage
+        git push --set-upstream origin $prBranchName
+
+        Write-Output "Opening pull request to merge $prBranchName."
+        gh pr create --head $prBranchName --title 'Bump Steeltoe version' --body $commitMessage
diff --git a/.github/workflows/verify-code-style.yml b/.github/workflows/verify-code-style.yml
index a7b9ac1b79..d156a08ebf 100644
--- a/.github/workflows/verify-code-style.yml
+++ b/.github/workflows/verify-code-style.yml
@@ -58,7 +58,7 @@ jobs:
         dotnet regitlint -s ${{ env.SOLUTION_FILE }} --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
 
     - name: CleanupCode (on branch)
-      if: ${{ github.event_name == 'push' || github.event_name == 'release' }}
+      if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' }}
       shell: pwsh
       run: |
         Write-Output "Running code cleanup on all files."
diff --git a/build/package.yml b/build/package.yml
deleted file mode 100644
index 56b1c3e9cd..0000000000
--- a/build/package.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-trigger:
-  branches:
-    include:
-    - main
-    - release/*
-  paths:
-    exclude:
-    - README.md
-    - roadmaps/*
-
-jobs:
-- job: Steeltoe_Package
-  pool:
-    vmImage: windows-latest
-  variables:
-    DOTNET_NOLOGO: true
-    DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  steps:
-  - checkout: self
-    fetchDepth: 0
-  - task: UseDotNet@2
-    displayName: Install .NET 8
-    inputs:
-      version: 8.0.x
-  - task: UseDotNet@2
-    displayName: Install .NET 9
-    inputs:
-      version: 9.0.x
-  - task: PowerShell@2
-    displayName: Set package version
-    env:
-      PackageVersionOverride: $(PackageVersionOverride)
-    inputs:
-      targetType: 'inline'
-      script: |
-        if ($env:PackageVersionOverride) {
-            Write-Host "Overriding package version with: $env:PackageVersionOverride"
-            Write-Warning "Always provide a 4-segment version (such as 1.2.3.0 or 1.2.3.0-rc1), to prevent an increment in patch number."
-            Write-Warning "The commit hash may still be added to the version, depending on the source branch or PR being built."
-            nbgv set-version $env:PackageVersionOverride
-
-            Write-Host "Contents of version.json after update:"
-            get-content version.json
-
-            git config --global user.email "cibuild@steeltoe.io"
-            git config --global user.name "steeltoe-cibuild"
-            git commit --allow-empty -m "Activating version override by locally committing changes to version.json."
-        }
-
-        nbgv cloud
-  - task: DotNetCoreCLI@2
-    displayName: dotnet restore
-    inputs:
-      command: restore
-      verbosityRestore: Minimal
-      projects: src/Steeltoe.All.sln
-      feedsToUse: config
-      nugetConfigPath: nuget.config
-  - task: DotNetCoreCLI@2
-    displayName: dotnet build
-    inputs:
-      command: build
-      projects: src/Steeltoe.All.sln
-      arguments: --no-restore -c Release -v minimal
-  - task: DotNetCoreCLI@2
-    displayName: dotnet pack
-    inputs:
-      command: pack
-      verbosityPack: Minimal
-      packagesToPack: src/Steeltoe.All.sln
-      configuration: Release
-      packDirectory: $(Build.ArtifactStagingDirectory)/packages
-      nobuild: true
-  - task: DotNetCoreCLI@2
-    condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')))
-    inputs:
-      command: custom
-      custom: tool
-      arguments: install --tool-path . sign --prerelease
-    displayName: Install code signing tool
-  - pwsh: |
-      .\sign code azure-key-vault "**/*.nupkg" `
-        --base-directory "$(Build.ArtifactStagingDirectory)/packages" `
-        --azure-key-vault-url "$(SignKeyVaultUrl)" `
-        --azure-key-vault-tenant-id "$(SignTenantId)" `
-        --azure-key-vault-client-id "$(SignClientId)" `
-        --azure-key-vault-client-secret "$(SignClientSecret)" `
-        --azure-key-vault-certificate "$(SignKeyVaultCertificate)" `
-        --description "Steeltoe" `
-        --description-url "https://github.com/SteeltoeOSS"
-    condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')))
-    displayName: Sign packages
-  - publish: $(Build.ArtifactStagingDirectory)/packages
-    condition: succeeded()
-    displayName: Publish build artifacts
-    artifact: Packages
diff --git a/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj b/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj
index d360dc1581..d87c77ba03 100644
--- a/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj
+++ b/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(FoundationalVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(FoundationalVersion)" />
-    <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="$(OpenTelemetryExporterPrometheusVersion)" />
+    <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="$(OpenTelemetryExporterPrometheusVersion)" NoWarn="NU5104" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryVersion)" />
   </ItemGroup>
 

From ce6bdec01605e08242df124b8acbdaf05d56671c Mon Sep 17 00:00:00 2001
From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
Date: Wed, 16 Jul 2025 17:49:46 +0200
Subject: [PATCH 5/5] Update dev feed

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e479a694fc..b261d6d006 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ If you want to try the latest bits from the `main` branch, use the Steeltoe deve
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="Steeltoe-dev" value="https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/dev/nuget/v3/index.json" />
+    <add key="Steeltoe-dev" value="https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/ci/nuget/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>