Skip to content

Commit c8630b2

Browse files
sandy2008sandy2008
authored
Merge branch 'open-telemetry:main' into main
2 parents 3e09c5d + 6ef3729 commit c8630b2

File tree

51 files changed

+195
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+195
-175
lines changed

‎.github/workflows/Component.BuildTest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
run: dotnet-coverage merge -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/**/*.coverage
9797

9898
- name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
99-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
99+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
100100
continue-on-error: true # Note: Don't fail for upload failures
101101
env:
102102
OS: ${{ matrix.os }}

‎.github/workflows/add-labels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
add-labels-on-issues:
1414
permissions:
1515
issues: write
16-
if: github.event_name == 'issues' && !github.event.issue.pull_request
16+
if: github.event.repository.fork == false && github.event_name == 'issues' && !github.event.issue.pull_request
1717

1818
runs-on: ubuntu-24.04
1919

@@ -36,7 +36,7 @@ jobs:
3636
add-labels-on-pull-requests:
3737
permissions:
3838
pull-requests: write
39-
if: github.event_name == 'pull_request_target'
39+
if: github.event.repository.fork == false && github.event_name == 'pull_request_target'
4040

4141
runs-on: ubuntu-24.04
4242

‎.github/workflows/codeql-analysis-steps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
show-progress: false
3636

3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
38+
uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
3939
with:
4040
build-mode: none
4141
languages: ${{ matrix.language }}
4242

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
44+
uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
4545
with:
4646
category: '/language:${{ matrix.language }}'
4747

‎.github/workflows/markdownlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1818

1919
- name: run markdownlint
20-
uses: DavidAnson/markdownlint-cli2-action@30a0e04f1870d58f8d717450cc6134995f993c63 # v21.0.0
20+
uses: DavidAnson/markdownlint-cli2-action@07035fd053f7be764496c0f8d8f9f41f98305101 # v22.0.0
2121
with:
2222
globs: |
2323
**/*.md

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
45+
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
4646
with:
4747
sarif_file: results.sarif

‎.github/workflows/post-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
needs.automation.outputs.enabled
4545
4646
steps:
47-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
47+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
4848
id: otelbot-token
4949
with:
5050
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}
@@ -96,7 +96,7 @@ jobs:
9696
(github.event_name == 'release' || github.event_name == 'workflow_dispatch')
9797
9898
steps:
99-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
99+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
100100
id: otelbot-token
101101
with:
102102
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}

‎.github/workflows/prepare-release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.event_name == 'workflow_dispatch' && needs.automation.outputs.enabled
4141

4242
steps:
43-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
43+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
4444
id: otelbot-token
4545
with:
4646
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}
@@ -86,7 +86,7 @@ jobs:
8686
needs.automation.outputs.enabled
8787
8888
steps:
89-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
89+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
9090
id: otelbot-token
9191
with:
9292
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}
@@ -127,7 +127,7 @@ jobs:
127127
needs.automation.outputs.enabled
128128
129129
steps:
130-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
130+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
131131
id: otelbot-token
132132
with:
133133
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}
@@ -175,7 +175,7 @@ jobs:
175175
needs.automation.outputs.enabled
176176
177177
steps:
178-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
178+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
179179
id: otelbot-token
180180
with:
181181
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}
@@ -224,7 +224,7 @@ jobs:
224224
needs.automation.outputs.enabled
225225
226226
steps:
227-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
227+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
228228
id: otelbot-token
229229
with:
230230
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}

‎.github/workflows/publish-packages-1.0.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
# renovate: datasource=nuget depName=dotnet-validate
9494
DOTNET_VALIDATE_VERSION: '0.0.1-preview.537'
9595
# renovate: datasource=nuget depName=Meziantou.Framework.NuGetPackageValidation.Tool
96-
MEZIANTOU_VALIDATE_NUGET_PACKAGE_VERSION: '1.0.39'
96+
MEZIANTOU_VALIDATE_NUGET_PACKAGE_VERSION: '1.0.40'
9797
run: |
9898
dotnet tool install --global dotnet-validate --version ${env:DOTNET_VALIDATE_VERSION} --allow-roll-forward
9999
dotnet tool install --global Meziantou.Framework.NuGetPackageValidation.Tool --version ${env:MEZIANTOU_VALIDATE_NUGET_PACKAGE_VERSION} --allow-roll-forward
@@ -186,7 +186,7 @@ jobs:
186186
if: needs.automation.outputs.enabled && github.event_name == 'push'
187187

188188
steps:
189-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
189+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
190190
id: otelbot-token
191191
with:
192192
app-id: ${{ vars.OTELBOT_DOTNET_APP_ID }}

‎Directory.Build.props‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@
33
<ArtifactsPath>$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'artifacts'))</ArtifactsPath>
44
<UseArtifactsOutput>true</UseArtifactsOutput>
55
</PropertyGroup>
6-
<!-- HACK Workaround for https://github.com/dotnet/sdk/issues/51265 -->
7-
<PropertyGroup>
8-
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
9-
</PropertyGroup>
106
</Project>

‎Directory.Packages.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,17 @@
9595
<PackageVersion Include="Grpc.AspNetCore" Version="2.67.0" />
9696
<PackageVersion Include="Grpc.AspNetCore.Server" Version="2.67.0" />
9797
<PackageVersion Include="Grpc.Tools" Version="2.68.1" />
98-
<PackageVersion Include="Google.Protobuf" Version="3.33.1" />
98+
<PackageVersion Include="Google.Protobuf" Version="3.33.2" />
9999
<PackageVersion Include="Grpc" Version="2.46.6" />
100100
<PackageVersion Include="Grpc.Net.Client" Version="2.67.0" />
101101
<PackageVersion Include="JunitXml.TestLogger" Version="7.0.2" />
102102
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
103103
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
104104
<PackageVersion Include="Microsoft.Coyote" Version="1.7.11" />
105-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
106-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
107-
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
108-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
105+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
106+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
107+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.1" />
108+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
109109
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="9.10.0" />
110110
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
111111
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
@@ -132,7 +132,7 @@
132132
</ItemGroup>
133133

134134
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
135-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0" />
135+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.1" />
136136
</ItemGroup>
137137

138138
</Project>

0 commit comments

Comments
 (0)