Skip to content

Commit d45e3d5

Browse files
authored
Merge pull request #7105 from dotnet/main
Merge main into live
2 parents 4fea135 + b546f34 commit d45e3d5

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/dependabot-approve-and-automerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- name: Dependabot metadata
1414
id: metadata
15-
uses: dependabot/fetch-metadata@v2.5.0
15+
uses: dependabot/fetch-metadata@v3.1.0
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818
- name: Approve a PR

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 #@v2
1818
- name: Use Node.js
19-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 #@v1
19+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e #@v1
2020
with:
2121
node-version: 12.x
2222
- name: Run Markdownlint

.github/workflows/snippets5000.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
6363
# Update build output json file
6464
- name: Upload build results
65-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f #@v6.0.0
65+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a #@v7.0.1
6666
with:
6767
name: build
6868
path: ./output.json

orleans/GPSTracker/GPSTracker.Service/GPSTracker.Service.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.Orleans.Server" Version="10.0.0" />
16-
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.14.0" />
16+
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.15.3" />
1717
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
1818
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.14.0-beta.1" />
1919
</ItemGroup>

orleans/JournaledTodoList/JournaledTodoList.ServiceDefaults/JournaledTodoList.ServiceDefaults.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.2.0" />
1414
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.2.0" />
15-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
15+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
1616
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
1717
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
1818
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />

0 commit comments

Comments
 (0)