From df9307ff6a82cd117f5c2042266fb089bcb219c0 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Wed, 4 Jun 2025 18:02:13 +0100
Subject: [PATCH 01/12] Enable deterministic builds

- Enable deterministic builds for binaries/packages.
- Centralise common settings in `Directory.Build.props`.
- Refactor some MSBuild conditions to not need changing for .NET 9 and beyond.
---
 Directory.Build.props                         | 28 +++++++++++++++++++
 .../Grafana.OpenTelemetry.Base.csproj         | 28 ++++---------------
 .../Grafana.OpenTelemetry.csproj              | 28 ++++---------------
 .../Grafana.OpenTelemetry.Tests.csproj        |  3 --
 4 files changed, 40 insertions(+), 47 deletions(-)
 create mode 100644 Directory.Build.props

diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 00000000..a08160c1
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,28 @@
+<Project>
+  <PropertyGroup>
+    <Authors>Grafana Labs</Authors>
+    <ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
+    <Company>Grafana Labs</Company>
+    <ContinuousIntegrationBuild Condition=" '$(CI)' != '' ">true</ContinuousIntegrationBuild>
+    <Copyright>Copyright (c) Grafana Labs</Copyright>
+    <Deterministic>true</Deterministic>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Nullable>disable</Nullable>
+    <PackageIcon>Grafana_icon.png</PackageIcon>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageProjectUrl>https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/</PackageProjectUrl>
+    <PackageReleaseNotes>https://github.com/grafana/grafana-opentelemetry-dotnet/blob/main/CHANGELOG.md</PackageReleaseNotes>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageTags>OpenTelemetry;Grafana;Metrics;Logs;Traces;Observability;Monitoring</PackageTags>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/grafana/grafana-opentelemetry-dotnet</RepositoryUrl>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)/internal/img/$(PackageIcon)" Pack="True" PackagePath="" />
+  </ItemGroup>
+</Project>
diff --git a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
index 5f2c9708..77d992a5 100644
--- a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
+++ b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
@@ -1,21 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
-    <Nullable>disable</Nullable>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-
-    <!-- NuGet packaging properties -->
     <Description>Minimal Grafana distribution of OpenTelemetry .NET</Description>
-    <Authors>Grafana Labs</Authors>
-    <Copyright>Copyright (c) Grafana Labs</Copyright>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageTags>OpenTelemetry;Grafana;Metrics;Logs;Traces;Observability;Monitoring</PackageTags>
-    <PackageIcon>Grafana_icon.png</PackageIcon>
-    <PackageReleaseNotes>https://github.com/grafana/grafana-opentelemetry-dotnet/blob/main/CHANGELOG.md</PackageReleaseNotes>
-    <PackageProjectUrl>https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/grafana/grafana-opentelemetry-dotnet</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -52,18 +40,14 @@
     <PackageReference Include="OpenTelemetry.Resources.ProcessRuntime" Version="0.1.0-beta.2" />
   </ItemGroup>
 
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+    <PackageReference Include="OpenTelemetry.Resources.Container" Version="1.0.0-beta.9" />
+  </ItemGroup>
+
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>Grafana.OpenTelemetry.Tests</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="../../internal/img/Grafana_icon.png" Pack="true" Visible="false" PackagePath="" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="OpenTelemetry.Resources.Container" Version="1.0.0-beta.9" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
index b846e65d..b58adfb7 100644
--- a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
+++ b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
@@ -1,21 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
-    <Nullable>disable</Nullable>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-
-    <!-- NuGet packaging properties -->
     <Description>Full Grafana distribution of OpenTelemetry .NET</Description>
-    <Authors>Grafana Labs</Authors>
-    <Copyright>Copyright (c) Grafana Labs</Copyright>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageTags>OpenTelemetry;Grafana;Metrics;Logs;Traces;Observability;Monitoring</PackageTags>
-    <PackageIcon>Grafana_icon.png</PackageIcon>
-    <PackageReleaseNotes>https://github.com/grafana/grafana-opentelemetry-dotnet/blob/main/CHANGELOG.md</PackageReleaseNotes>
-    <PackageProjectUrl>https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/grafana/grafana-opentelemetry-dotnet</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
   </PropertyGroup>
 
   <!--
@@ -70,18 +58,14 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.Owin" Version="1.0.0-rc.6" />
   </ItemGroup>
 
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+    <PackageReference Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.10.0-beta.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>Grafana.OpenTelemetry.Tests</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="../../internal/img/Grafana_icon.png" Pack="true" Visible="false" PackagePath="" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.10.0-beta.1" />
-  </ItemGroup>
-
 </Project>
diff --git a/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj b/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj
index aa370504..d8c4473b 100644
--- a/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj
+++ b/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj
@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net8.0;net462</TargetFrameworks>
-    <Nullable>disable</Nullable>
-
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
@@ -18,7 +16,6 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
-      <NoWarn>NU1701</NoWarn>
     </PackageReference>
   </ItemGroup>
 

From b227a92781b59a95bf747da50b732191786c7e8b Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Wed, 4 Jun 2025 18:22:51 +0100
Subject: [PATCH 02/12] Use Artifacts Output

Use .NET 8 Artifacts Output feature to put all build output in a central directory structure instead of in each project directory.
---
 .gitignore            | 1 +
 Directory.Build.props | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 01d5ae1d..32374e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
 mono_crash.*
 
 # Build results
+[Aa]rtifacts/
 [Bb]uild/
 [Dd]ebug/
 [Dd]ebugPublic/
diff --git a/Directory.Build.props b/Directory.Build.props
index a08160c1..10167e44 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -21,6 +21,7 @@
     <RepositoryUrl>https://github.com/grafana/grafana-opentelemetry-dotnet</RepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <UseArtifactsOutput>true</UseArtifactsOutput>
   </PropertyGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)/internal/img/$(PackageIcon)" Pack="True" PackagePath="" />

From 0a7f8a334ee6e54835d1ec08020da0bfd0fe0f4e Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Wed, 4 Jun 2025 18:25:31 +0100
Subject: [PATCH 03/12] Bump NuGet packages

- Bump test NuGet packages to their latest versions and pin them.
- Add GitHubActionsTestLogger.
---
 .../Grafana.OpenTelemetry.Tests.csproj            | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj b/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj
index d8c4473b..9ad3f086 100644
--- a/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj
+++ b/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj
@@ -7,16 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="[17.4.1]" />
-    <PackageReference Include="xunit" Version="[2.5.0,3.0)" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.4" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>

From 9b8faae06140ea30090cc4f646815d12cebaf9c1 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Wed, 4 Jun 2025 18:27:14 +0100
Subject: [PATCH 04/12] Refactor CI

- Remove "tests" and replace with "CI" with the intention to later add a job that can publish to NuGet.org.
- Test on all three available operating systems in GitHub Actions.
- Publish NuGet packages to GitHub Actions artifacts.
- Add job to validate NuGet packages.
- Attest artifacts.
- Generate SBOM.
---
 .github/workflows/ci.yml                      | 120 ++++++++++++++++++
 .github/workflows/unit-tests.yml              |  42 ------
 .../Grafana.OpenTelemetry.Tests.csproj        |   3 +-
 3 files changed, 122 insertions(+), 43 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/unit-tests.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..4365a28a
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,120 @@
+name: ci
+
+on:
+  push:
+    branches: [ main ]
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+  DOTNET_NOLOGO: true
+  DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: 1
+  NUGET_XMLDOC_MODE: skip
+  TERM: xterm
+
+permissions: {}
+
+jobs:
+  build-test:
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    outputs:
+      dotnet-sdk-version: ${{ steps.setup-dotnet.outputs.dotnet-version }}
+
+    permissions:
+      attestations: write
+      contents: write
+      id-token: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ macos-latest, ubuntu-latest, windows-latest ]
+        include:
+          - os: macos-latest
+            os-name: macos
+          - os: ubuntu-latest
+            os-name: linux
+          - os: windows-latest
+            os-name: windows
+
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        filter: 'tree:0'
+        show-progress: false
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+      id: setup-dotnet
+
+    - name: Build
+      run: dotnet build --configuration Release
+
+    - name: Test
+      run: dotnet test --configuration Release --logger:"GitHubActions;report-warnings=false"
+
+    - name: Generate SBOM
+      uses: anchore/sbom-action@9f7302141466aa6482940f15371237e9d9f4c34a # v0.19.0
+      with:
+        artifact-name: build-${{ matrix.os-name }}.spdx.json
+        output-file: ./artifacts/build.spdx.json
+        path: ./artifacts/bin
+        upload-release-assets: ${{ runner.os == 'Windows' }}
+
+    - name: Attest artifacts
+      uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
+      if: |
+        runner.os == 'Windows' &&
+        github.event.repository.fork == false &&
+        (github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/'))
+      with:
+        subject-path: |
+          ./artifacts/bin/Grafana.OpenTelemetry*/release*/Grafana.OpenTelemetry*.dll
+          ./artifacts/package/release/*
+
+    - name: Publish NuGet packages
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      with:
+        name: packages-${{ matrix.os-name }}
+        path: ./artifacts/package/release
+        if-no-files-found: error
+
+  validate-packages:
+    needs: build-test
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Download packages
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      with:
+        name: packages-windows
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+      with:
+        dotnet-version: ${{ needs.build-test.outputs.dotnet-sdk-version }}
+
+    - name: Validate NuGet packages
+      shell: pwsh
+      run: |
+        dotnet tool install --global dotnet-validate --version 0.0.1-preview.304 --allow-roll-forward
+        $packages = Get-ChildItem -Filter "*.nupkg" | ForEach-Object { $_.FullName }
+        $invalidPackages = 0
+        foreach ($package in $packages) {
+          dotnet validate package local $package
+          if ($LASTEXITCODE -ne 0) {
+            $invalidPackages++
+          }
+        }
+        if ($invalidPackages -gt 0) {
+          Write-Output "::error::$invalidPackages NuGet package(s) failed validation."
+          exit 1
+        }
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
deleted file mode 100644
index df9538f3..00000000
--- a/.github/workflows/unit-tests.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ 'main*' ]
-    paths-ignore:
-    - '**.md'
-  pull_request:
-    branches: [ 'main*' ]
-    paths-ignore:
-    - '**.md'
-
-jobs:
-  build-test:
-    strategy:
-      fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
-      matrix:
-        os: [ windows-latest, ubuntu-latest ]
-        version: [ net462, net8.0 ]
-        exclude:
-        - os: ubuntu-latest
-          version: net462
-    permissions: {}
-
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0 # fetching all
-        persist-credentials: false
-
-    - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
-
-    - name: Install dependencies
-      run: dotnet restore
-
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-
-    - name: Test ${{ matrix.version }}
-      run: dotnet test **/bin/**/${{ matrix.version }}/*.Tests.dll --logger:"console;verbosity=detailed"
diff --git a/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj b/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj
index 9ad3f086..26771334 100644
--- a/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj
+++ b/tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([System.OperatingSystem]::IsWindows())">$(TargetFrameworks);net481</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>

From dc2e96beb861c9f4b894b4bd2b1ebad644893ac4 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Wed, 4 Jun 2025 18:35:17 +0100
Subject: [PATCH 05/12] Update .NET SDK

Update to the latest .NET 8 SDK to see if that fixes issue with missing source link information.
---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index c51594ae..9f3b4cbd 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
     "rollForward": "latestFeature",
-    "version": "8.0.101",
+    "version": "8.0.410",
     "allowPrerelease": false
   }
 }

From a81dcf00bcaf4ea611903db7b2c8e382fb9b9c13 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Wed, 4 Jun 2025 18:37:58 +0100
Subject: [PATCH 06/12] Fix MinVer

Fetch Git history.
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4365a28a..322c2422 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,7 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
+        fetch-depth: 0
         filter: 'tree:0'
         show-progress: false
 

From ae5227cac3c9393533e0bac7bd4db4b4e8111380 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Wed, 4 Jun 2025 18:39:46 +0100
Subject: [PATCH 07/12] Simplify job names

Separate the runner name from the OS name.
---
 .github/workflows/ci.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 322c2422..f188f3a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ permissions: {}
 
 jobs:
   build-test:
-    name: ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os-name }}
+    runs-on: ${{ matrix.runner }}
 
     outputs:
       dotnet-sdk-version: ${{ steps.setup-dotnet.outputs.dotnet-version }}
@@ -34,14 +34,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest, ubuntu-latest, windows-latest ]
         include:
-          - os: macos-latest
-            os-name: macos
-          - os: ubuntu-latest
-            os-name: linux
-          - os: windows-latest
-            os-name: windows
+          - os-name: macos
+            runner: macos-latest
+          - os-name: linux
+            runner: ubuntu-latest
+          - os-name: windows
+            runner: windows-latest
 
     steps:
 

From 46e9dd9c60523369c72510c65606fe94d9ca3e25 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Thu, 5 Jun 2025 12:39:51 +0100
Subject: [PATCH 08/12] Bump MinVer

Update MinVer to the latest stable version.
---
 .../Grafana.OpenTelemetry.Base.csproj                           | 2 +-
 src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
index 77d992a5..371106fc 100644
--- a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
+++ b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))" />
-    <PackageReference Include="MinVer" Version="4.3.0">
+    <PackageReference Include="MinVer" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
index b58adfb7..a82c11a6 100644
--- a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
+++ b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <ProjectReference Include="../Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj" />
-    <PackageReference Include="MinVer" Version="4.3.0">
+    <PackageReference Include="MinVer" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From 14446290ff075f4bba2a7b587f6a057c5e9cbd91 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Thu, 5 Jun 2025 12:40:10 +0100
Subject: [PATCH 09/12] Fix determinsm

Include PDBs in NuGet packages.
---
 Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 10167e44..ce5ebddf 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <Authors>Grafana Labs</Authors>
     <ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
     <Company>Grafana Labs</Company>

From dbb4b18626c0316c72248048f2da653d7a2f6845 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Thu, 5 Jun 2025 12:42:28 +0100
Subject: [PATCH 10/12] Suppress NU5104

Disable warning about stable packages depending on prerelease packages until all OpenTelemetry dependencies are stable.
---
 Directory.Build.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index ce5ebddf..f772b732 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,6 +10,8 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <NeutralLanguage>en-US</NeutralLanguage>
+    <!-- Disable warning about stable packages depending on prerelease packages until all OpenTelemetry dependencies are stable -->
+    <NoWarn>$(NoWarn);NU5104</NoWarn>
     <Nullable>disable</Nullable>
     <PackageIcon>Grafana_icon.png</PackageIcon>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

From c5a07a5cb560f49cfae19218d1df593cc95e871b Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Thu, 5 Jun 2025 14:00:08 +0100
Subject: [PATCH 11/12] Add package README

Add a NuGet package README.
---
 Directory.Build.props |  4 ++-
 package-readme.md     | 63 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 package-readme.md

diff --git a/Directory.Build.props b/Directory.Build.props
index f772b732..cd3b7614 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,6 +16,7 @@
     <PackageIcon>Grafana_icon.png</PackageIcon>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/</PackageProjectUrl>
+    <PackageReadmeFile>package-readme.md</PackageReadmeFile>
     <PackageReleaseNotes>https://github.com/grafana/grafana-opentelemetry-dotnet/blob/main/CHANGELOG.md</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>OpenTelemetry;Grafana;Metrics;Logs;Traces;Observability;Monitoring</PackageTags>
@@ -27,6 +28,7 @@
     <UseArtifactsOutput>true</UseArtifactsOutput>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)/internal/img/$(PackageIcon)" Pack="True" PackagePath="" />
+    <None Include="$(MSBuildThisFileDirectory)/internal/img/$(PackageIcon)" Pack="true" PackagePath="" />
+    <None Include="$(MsBuildThisFileDirectory)/$(PackageReadmeFile)" Pack="true" PackagePath="" />
   </ItemGroup>
 </Project>
diff --git a/package-readme.md b/package-readme.md
new file mode 100644
index 00000000..83d58645
--- /dev/null
+++ b/package-readme.md
@@ -0,0 +1,63 @@
+# Grafana OpenTelemetry distribution for .NET
+
+<!-- markdown-link-check-disable -->
+[![NuGet][package-badge-version]][package-download]
+[![SDK][otel-badge]][otel]
+[![Slack][slack-badge]][slack-channel]
+<!-- markdown-link-check-enable -->
+
+## About
+
+This is a pre-configured and pre-packaged bundle of [OpenTelemetry .NET components][otel-contrib],
+optimized for [Grafana Cloud Application Observability][app-o11y].
+
+It requires only minimal setup and configuration and makes it very easy to emit
+OpenTelemetry metrics, logs, and traces from your .NET application.
+
+## Getting Started
+
+### Step 1: Install package
+
+For installing the distribution with the full set of dependencies, add a
+reference to the [`Grafana.OpenTelemetry`][package] package to your project.
+
+```sh
+dotnet add package Grafana.OpenTelemetry
+```
+
+### Step 2: Enable the Grafana distribution at application startup
+
+The `UseGrafana` extension method on the `TracerProviderBuilder` or the
+`MetricProviderBuilder` can be used to set up the Grafana distribution. By
+default, telemetry data will be sent to Grafana Alloy or an OpenTelemetry collector
+that runs locally and listens to default OTLP ports.
+
+```csharp
+using var tracerProvider = Sdk.CreateTracerProviderBuilder()
+    .UseGrafana()
+    .Build();
+```
+
+Alternatively, you can send telemetry data directly to Grafana Cloud without
+involving an agent or collector. This can be configured via the environment
+variables `OTEL_EXPORTER_OTLP_PROTOCOL`, `OTEL_EXPORTER_OTLP_ENDPOINT`, and
+`OTEL_EXPORTER_OTLP_HEADERS`.
+
+For details on how to obtain those values, refer to
+[Send data to the Grafana Cloud OTLP endpoint: Quickstart architecture][push-oltp].
+
+## Documentation
+
+For detailed documentation and setup instructions, refer to [our documentation][docs].
+
+[app-o11y]: https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/
+[docs]: https://github.com/grafana/grafana-opentelemetry-dotnet/tree/main/docs
+[otel]: https://github.com/open-telemetry/opentelemetry-dotnet
+[otel-badge]: https://img.shields.io/badge/OTel--SDK-1.9.0-blue?style=flat&logo=opentelemetry
+[otel-contrib]: http://github.com/open-telemetry/opentelemetry-dotnet-contrib
+[package]: https://www.nuget.org/packages/Grafana.OpenTelemetry
+[package-badge-version]: https://img.shields.io/nuget/v/Grafana.OpenTelemetry?logo=nuget&label=NuGet&color=blue
+[package-download]: https://www.nuget.org/profiles/Grafana
+[push-oltp]: https://grafana.com/docs/grafana-cloud/send-data/otlp/send-data-otlp/#quickstart-architecture
+[slack-badge]: https://img.shields.io/badge/%20Slack-%23app--o11y-brightgreen.svg?logo=slack
+[slack-channel]: https://grafana.slack.com/archives/C05E87XRK3J

From 270dccce4cd54f9961af6377064193fcd59e673e Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Thu, 5 Jun 2025 16:22:13 +0100
Subject: [PATCH 12/12] Update badge URLs

Point to `ci` not `unit-tests`.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 78a72c56..0f8e4a9e 100644
--- a/README.md
+++ b/README.md
@@ -101,8 +101,8 @@ To engage with the Grafana Application Observability community:
 * [File an issue][issues] for bugs, issues, and feature suggestions.
 
 [app-o11y]: https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/
-[ci-badge]: https://github.com/grafana/grafana-opentelemetry-dotnet/actions/workflows/unit-tests.yml/badge.svg?branch=main
-[ci-status]: https://github.com/grafana/grafana-opentelemetry-dotnet/actions/workflows/unit-tests.yml
+[ci-badge]: https://github.com/grafana/grafana-opentelemetry-dotnet/actions/workflows/ci.yml/badge.svg?branch=main
+[ci-status]: https://github.com/grafana/grafana-opentelemetry-dotnet/actions/workflows/ci.yml
 [discussions]: https://github.com/grafana/grafana-opentelemetry-dotnet/discussions
 [issues]: https://github.com/grafana/grafana-opentelemetry-dotnet/issues/new
 [oats-badge]: https://github.com/grafana/grafana-opentelemetry-dotnet/actions/workflows/oats.yml/badge.svg?branch=main