Skip to content

Commit 26fe152

Browse files
Merge pull request #44273 from dotnet/main
Merge main into live
2 parents 70ce2fd + 68a0940 commit 26fe152

File tree

38 files changed

+66
-58
lines changed

38 files changed

+66
-58
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ updates:
977977
patterns:
978978
- "*" # Prefer a single PR per project update.
979979
- package-ecosystem: "nuget"
980-
directory: "/docs/core/diagnostics/snippets/exception-summary" #exception-summary.csproj
980+
directory: "/docs/core/containers/snippets/Worker" #DotNet.ContainerImage.csproj
981981
schedule:
982982
interval: "weekly"
983983
day: "wednesday"
@@ -988,7 +988,7 @@ updates:
988988
patterns:
989989
- "*" # Prefer a single PR per project update.
990990
- package-ecosystem: "nuget"
991-
directory: "/docs/core/diagnostics/snippets/health-checks" #health-checks.csproj
991+
directory: "/docs/core/diagnostics/snippets/exception-summary" #exception-summary.csproj
992992
schedule:
993993
interval: "weekly"
994994
day: "wednesday"
@@ -999,7 +999,7 @@ updates:
999999
patterns:
10001000
- "*" # Prefer a single PR per project update.
10011001
- package-ecosystem: "nuget"
1002-
directory: "/docs/core/diagnostics/snippets/lifetime-health-checks" #lifetime-health-checks.csproj
1002+
directory: "/docs/core/diagnostics/snippets/health-checks" #health-checks.csproj
10031003
schedule:
10041004
interval: "weekly"
10051005
day: "wednesday"
@@ -1010,7 +1010,7 @@ updates:
10101010
patterns:
10111011
- "*" # Prefer a single PR per project update.
10121012
- package-ecosystem: "nuget"
1013-
directory: "/docs/core/diagnostics/snippets/Metrics" #metric-instr.csproj
1013+
directory: "/docs/core/diagnostics/snippets/lifetime-health-checks" #lifetime-health-checks.csproj
10141014
schedule:
10151015
interval: "weekly"
10161016
day: "wednesday"
@@ -1021,7 +1021,7 @@ updates:
10211021
patterns:
10221022
- "*" # Prefer a single PR per project update.
10231023
- package-ecosystem: "nuget"
1024-
directory: "/docs/core/diagnostics/snippets/Microsoft.Diagnostics.NETCore.Client/csharp" #Microsoft.Diagnostics.NETCore.Client.Samples.csproj
1024+
directory: "/docs/core/diagnostics/snippets/Metrics" #metric-instr.csproj
10251025
schedule:
10261026
interval: "weekly"
10271027
day: "wednesday"
@@ -1032,7 +1032,7 @@ updates:
10321032
patterns:
10331033
- "*" # Prefer a single PR per project update.
10341034
- package-ecosystem: "nuget"
1035-
directory: "/docs/core/diagnostics/snippets/OTel-Prometheus-Grafana-Jaeger/csharp" #OTel-Prometheus-Grafana-Jaeger.csproj
1035+
directory: "/docs/core/diagnostics/snippets/Microsoft.Diagnostics.NETCore.Client/csharp" #Microsoft.Diagnostics.NETCore.Client.Samples.csproj
10361036
schedule:
10371037
interval: "weekly"
10381038
day: "wednesday"
@@ -1043,7 +1043,7 @@ updates:
10431043
patterns:
10441044
- "*" # Prefer a single PR per project update.
10451045
- package-ecosystem: "nuget"
1046-
directory: "/docs/core/diagnostics/snippets/OTLP-Example/csharp" #OTLP-Example.csproj
1046+
directory: "/docs/core/diagnostics/snippets/OTel-Prometheus-Grafana-Jaeger/csharp" #OTel-Prometheus-Grafana-Jaeger.csproj
10471047
schedule:
10481048
interval: "weekly"
10491049
day: "wednesday"
@@ -1054,7 +1054,7 @@ updates:
10541054
patterns:
10551055
- "*" # Prefer a single PR per project update.
10561056
- package-ecosystem: "nuget"
1057-
directory: "/docs/core/diagnostics/snippets/resource-monitoring" #resource-monitoring.csproj
1057+
directory: "/docs/core/diagnostics/snippets/OTLP-Example/csharp" #OTLP-Example.csproj
10581058
schedule:
10591059
interval: "weekly"
10601060
day: "wednesday"
@@ -1065,7 +1065,7 @@ updates:
10651065
patterns:
10661066
- "*" # Prefer a single PR per project update.
10671067
- package-ecosystem: "nuget"
1068-
directory: "/docs/core/docker/snippets/8.0/Worker" #DotNet.ContainerImage.csproj
1068+
directory: "/docs/core/diagnostics/snippets/resource-monitoring" #resource-monitoring.csproj
10691069
schedule:
10701070
interval: "weekly"
10711071
day: "wednesday"

.github/workflows/cleanrepo-orphaned-articles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
# Create the PR for the work done by the "clean repo" tool
3737
- name: create-pull-request
38-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
38+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
3939
with:
4040
branch: cleanrepo-orphaned-articles
4141
title: "Monthly chores: Delete orphaned articles"

.github/workflows/cleanrepo-orphaned-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
# Create the PR for the work done by the "clean repo" tool
3737
- name: create-pull-request
38-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
38+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
3939
with:
4040
branch: cleanrepo-orphaned-images
4141
title: "Monthly chores: Delete orphaned images"

.github/workflows/cleanrepo-orphaned-includes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
# Create the PR for the work done by the "clean repo" tool
3737
- name: create-pull-request
38-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
38+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
3939
with:
4040
branch: cleanrepo-orphaned-includes
4141
title: "Monthly chores: Delete orphaned include files"

.github/workflows/cleanrepo-orphaned-snippets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
# Create the PR for the work done by the "clean repo" tool
3737
- name: create-pull-request
38-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
38+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
3939
with:
4040
branch: cleanrepo-orphaned-snippets
4141
title: "Monthly chores: Delete orphaned snippets"

.github/workflows/cleanrepo-redirect-hops.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
# Create the PR for the work done by the "clean repo" tool
3737
- name: create-pull-request
38-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
38+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
3939
with:
4040
branch: cleanrepo-remove-hops
4141
title: "Monthly chores: Remove redirect hops"

.github/workflows/cleanrepo-relative-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
# Create the PR for the work done by the "clean repo" tool
3737
- name: create-pull-request
38-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
38+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
3939
with:
4040
branch: cleanrepo-relative-links
4141
title: "Monthly chores: Use relative links"

.github/workflows/cleanrepo-replace-redirects.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
# Create the PR for the work done by the "clean repo" tool
3737
- name: create-pull-request
38-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
38+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
3939
with:
4040
branch: cleanrepo-replace-redirects
4141
title: "Monthly chores: Replace redirect targets"

.github/workflows/dependabot-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
dependabot-yml-path: ".github/dependabot.yml"
5353
- name: Create pull request
5454
if: github.event_name == 'workflow_dispatch' || github.repository_owner == 'dotnet'
55-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
55+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
5656
with:
5757
branch: create-dependabotconfig-pull-request/patch
5858
title: "Update dependabot.yml - automatically."

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
egress-policy: audit
2828

2929
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
30-
- uses: DavidAnson/markdownlint-cli2-action@eb5ca3ab411449c66620fe7f1b3c9e10547144b0 # v18.0.0
30+
- uses: DavidAnson/markdownlint-cli2-action@a23dae216ce3fee4db69da41fed90d2a4af801cf # v19.0.0
3131
with:
3232
config: ".markdownlint-cli2.jsonc"
3333
globs: "**/*.md"

0 commit comments

Comments
 (0)