diff --git a/.github/workflows/build-and-stage.yml b/.github/workflows/build-and-stage.yml index e385d038..1f9cfc56 100644 --- a/.github/workflows/build-and-stage.yml +++ b/.github/workflows/build-and-stage.yml @@ -18,7 +18,6 @@ env: AZURE_WEBAPP_PACKAGE_PATH: '.' DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_NOLOGO: true - DOTNET_VERSION: '8.0.x' DOCFX_SOURCE_BRANCH_NAME: ${{ github.head_ref || github.ref_name }} jobs: @@ -26,12 +25,14 @@ jobs: name: Build and publish app runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 + with: + persist-credentials: false - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: ${{ env.DOTNET_VERSION }} + dotnet-version: 10.x - name: Generate API Browser docs shell: pwsh @@ -44,7 +45,7 @@ jobs: run: dotnet publish src/Steeltoe.io --configuration Release --no-build --output ${{ env.DOTNET_ROOT }}/mainsite - name: Upload artifact for deployment job - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: Steeltoe.io path: ${{ env.DOTNET_ROOT }}/mainsite diff --git a/build/build-metadata.ps1 b/build/build-metadata.ps1 index 4778c90e..80b2f411 100644 --- a/build/build-metadata.ps1 +++ b/build/build-metadata.ps1 @@ -55,6 +55,8 @@ function Clone-Source-Build-Metadata Write-Output "Setting DOCFX_SOURCE_BRANCH_NAME to '$branch'" $env:DOCFX_SOURCE_BRANCH_NAME = $branch + Write-Output "Setting DOTNET_CLI_VARIABLES_LANG_VERSION to 'latest'" + $env:DOTNET_CLI_VARIABLES_LANG_VERSION = "latest" Write-Output "Running command: dotnet docfx metadata $apiFile" dotnet docfx metadata $apiFile } diff --git a/docs/docs/v4/management/info.md b/docs/docs/v4/management/info.md index dc2dd42f..0fb6a219 100644 --- a/docs/docs/v4/management/info.md +++ b/docs/docs/v4/management/info.md @@ -74,6 +74,20 @@ This contributor exposes information from the `git.properties` Spring Boot file, > [!TIP] > For an example of how to use this contributor within MSBuild using [GitInfo](https://github.com/devlooped/GitInfo), see the [Steeltoe Management sample](https://github.com/SteeltoeOSS/Samples/tree/4.x/Management/src). +### Runtime info + +This contributor, added in Steeltoe 4.1.0, exposes information about the environment in which the application is running. It includes: + +| Property | Description | +| --- | --- | +| `runtimeName` | The name and version of the .NET runtime (for example, ".NET 10.0.0") | +| `runtimeVersion` | The version of the common language runtime | +| `runtimeIdentifier` | The runtime identifier (RID) of the platform (for example, "linux-x64", "win-x64") | +| `processArchitecture` | The process architecture (for example, "X64", "Arm64") | +| `osArchitecture` | The operating system architecture | +| `osDescription` | A description of the operating system | +| `osVersion` | The operating system version | + ## Sample Output The response is always returned as JSON: @@ -119,6 +133,15 @@ The response is always returned as JSON: }, "build": { "version": "1.0.0.0" + }, + "runtime": { + "runtimeName": ".NET 10.0.0", + "runtimeVersion": "10.0.0", + "runtimeIdentifier": "linux-x64", + "processArchitecture": "X64", + "osArchitecture": "X64", + "osDescription": "Ubuntu 22.04.3 LTS", + "osVersion": "Unix 5.15.0.88" } } ``` diff --git a/src/Steeltoe.io/Steeltoe.io.csproj b/src/Steeltoe.io/Steeltoe.io.csproj index 27a52c36..2f962604 100644 --- a/src/Steeltoe.io/Steeltoe.io.csproj +++ b/src/Steeltoe.io/Steeltoe.io.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 enable