Skip to content

Commit 7566ed8

Browse files
jmatthiesenjmatthiesen
authored
Merge branch 'dotnet:main' into taskBasedAIDocs
2 parents e86ce9f + 1e08e84 commit 7566ed8

File tree

200 files changed

+2921
-811
lines changed

Some content is hidden

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

200 files changed

+2921
-811
lines changed

‎.github/dependabot.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,6 @@ updates:
129129
dotnet:
130130
patterns:
131131
- "*" # Prefer a single PR per solution update.
132-
- package-ecosystem: "nuget"
133-
directory: "/docs/csharp/roslyn-sdk/snippets/source-generators" #source-generators.sln
134-
schedule:
135-
interval: "weekly"
136-
day: "wednesday"
137-
open-pull-requests-limit: 5
138-
groups:
139-
# Group .NET updates together for solutions.
140-
dotnet:
141-
patterns:
142-
- "*" # Prefer a single PR per solution update.
143132
- package-ecosystem: "nuget"
144133
directory: "/docs/csharp/roslyn-sdk/tutorials/snippets/how-to-write-csharp-analyzer-code-fix" #MakeConst.sln
145134
schedule:
@@ -789,6 +778,17 @@ updates:
789778
dotnet:
790779
patterns:
791780
- "*" # Prefer a single PR per project update.
781+
- package-ecosystem: "nuget"
782+
directory: "/docs/ai/quickstarts/snippets/local-ai" #ollama.csproj
783+
schedule:
784+
interval: "weekly"
785+
day: "wednesday"
786+
open-pull-requests-limit: 5
787+
groups:
788+
# Group .NET updates together for projects.
789+
dotnet:
790+
patterns:
791+
- "*" # Prefer a single PR per project update.
792792
- package-ecosystem: "nuget"
793793
directory: "/docs/ai/tutorials/snippets/llm-eval" #llm-eval.csproj
794794
schedule:
@@ -1856,17 +1856,6 @@ updates:
18561856
dotnet:
18571857
patterns:
18581858
- "*" # Prefer a single PR per project update.
1859-
- package-ecosystem: "nuget"
1860-
directory: "/docs/csharp/roslyn-sdk/snippets/source-generators/SourceGenerator" #SourceGenerator.csproj
1861-
schedule:
1862-
interval: "weekly"
1863-
day: "wednesday"
1864-
open-pull-requests-limit: 5
1865-
groups:
1866-
# Group .NET updates together for projects.
1867-
dotnet:
1868-
patterns:
1869-
- "*" # Prefer a single PR per project update.
18701859
- package-ecosystem: "nuget"
18711860
directory: "/docs/csharp/roslyn-sdk/tutorials/snippets/how-to-write-csharp-analyzer-code-fix/MakeConst/MakeConst.CodeFixes" #MakeConst.CodeFixes.csproj
18721861
schedule:
@@ -2197,3 +2186,14 @@ updates:
21972186
dotnet:
21982187
patterns:
21992188
- "*" # Prefer a single PR per project update.
2189+
- package-ecosystem: "nuget"
2190+
directory: "/docs/orleans/deployment/snippets/service-fabric/stateless" #Orleans.ServiceFabric.Stateless.csproj
2191+
schedule:
2192+
interval: "weekly"
2193+
day: "wednesday"
2194+
open-pull-requests-limit: 5
2195+
groups:
2196+
# Group .NET updates together for projects.
2197+
dotnet:
2198+
patterns:
2199+
- "*" # Prefer a single PR per project update.

‎.github/policies/auto-merge.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ configuration:
1616
label: ':octocat: auto-merge'
1717
- targetsBranch:
1818
branch: main
19-
- or:
20-
- isActivitySender:
21-
user: dotnet-policy-service[bot]
19+
- isActivitySender:
20+
user: dotnet-policy-service[bot]
2221
then:
2322
- enableAutoMerge:
2423
mergeMethod: Squash

‎.github/policies/policy-edits.yml‎ renamed to ‎.github/policies/disallow-edits.yml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ where:
88
configuration:
99
resourceManagementConfiguration:
1010
eventResponderTasks:
11-
- description: Flag PRs that change .github folder files.
11+
- description: Close PRs that change .github folder files.
1212
triggerOnOwnActions: true
1313
if:
1414
- payloadType: Pull_Request
@@ -31,8 +31,31 @@ configuration:
3131
user: dependabot[bot]
3232
- isActivitySender:
3333
user: dotnet-policy-service[bot]
34+
- isActivitySender:
35+
user: github-actions[bot]
3436
then:
3537
- addReply:
3638
reply: >-
3739
@${issueAuthor} - This PR edits a file in the .github folder, which is not allowed. CC @dotnet/docs.
3840
- closePullRequest
41+
42+
- description: Close PRs that change Framework Design Guidelines.
43+
triggerOnOwnActions: true
44+
if:
45+
- payloadType: Pull_Request
46+
- isAction:
47+
action: Opened
48+
- filesMatchPattern:
49+
pattern: docs/standard/design-guidelines/*
50+
matchAny: true
51+
- not:
52+
or:
53+
- activitySenderHasPermission:
54+
permission: admin
55+
- activitySenderHasPermission:
56+
permission: write
57+
then:
58+
- addReply:
59+
reply: >-
60+
@${issueAuthor} - This PR edits a file in the design-guidelines folder, which is disallowed. This content is reprinted by permission of Pearson Education, Inc. from Framework Design Guidelines: Conventions, Idioms, and Patterns for Reusable .NET Libraries, 2nd Edition, and cannot be edited. CC @dotnet/docs.
61+
- closePullRequest

‎.github/workflows/clean-repo.yml‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "clean repo - articles"
2+
3+
on:
4+
schedule:
5+
- cron: "0 1 1 * *" # Runs at 01:00, on day 1 of the month
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
clean-repo:
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
18+
steps:
19+
- name: Harden Runner
20+
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
21+
with:
22+
egress-policy: audit
23+
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
26+
# Call clean repo
27+
- name: Clean repo
28+
id: clean-repo-step
29+
uses: dotnet/docs-tools/cleanrepo@b1ebc174a5bbd18e6904a12069a8fae2c5cc3b6f
30+
with:
31+
function: "FindOrphanedArticles"
32+
docfx_directory: "."
33+
target_directory: "docs"
34+
url_base_path: "/dotnet"
35+
36+
# Create the PR for the work done by the "clean repo" tool
37+
- name: create-pull-request
38+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
39+
with:
40+
branch: cleanrepo-orphaned-articles
41+
title: "Monthly chores: Delete orphaned articles"
42+
commit-message: "Bot 🤖 generated CleanRepo tool run"
43+
body: "Find and delete orphaned articles. Contributes to #..."

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "clean repo - images"
2+
3+
on:
4+
schedule:
5+
- cron: "0 1 1 * *" # Runs at 01:00, on day 1 of the month
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
clean-repo:
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
18+
steps:
19+
- name: Harden Runner
20+
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
21+
with:
22+
egress-policy: audit
23+
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
26+
# Call clean repo
27+
- name: Clean repo
28+
id: clean-repo-step
29+
uses: dotnet/docs-tools/cleanrepo@b1ebc174a5bbd18e6904a12069a8fae2c5cc3b6f
30+
with:
31+
function: "FindOrphanedImages"
32+
docfx_directory: "."
33+
target_directory: "docs"
34+
url_base_path: "/dotnet"
35+
36+
# Create the PR for the work done by the "clean repo" tool
37+
- name: create-pull-request
38+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
39+
with:
40+
branch: cleanrepo-orphaned-images
41+
title: "Monthly chores: Delete orphaned images"
42+
commit-message: "Bot 🤖 generated CleanRepo tool run"
43+
body: "Find and delete orphaned images. Contributes to #..."

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "clean repo - includes"
2+
3+
on:
4+
schedule:
5+
- cron: "0 1 1 * *" # Runs at 01:00, on day 1 of the month
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
clean-repo:
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
18+
steps:
19+
- name: Harden Runner
20+
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
21+
with:
22+
egress-policy: audit
23+
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
26+
# Call clean repo
27+
- name: Clean repo
28+
id: clean-repo-step
29+
uses: dotnet/docs-tools/cleanrepo@b1ebc174a5bbd18e6904a12069a8fae2c5cc3b6f
30+
with:
31+
function: "FindOrphanedIncludes"
32+
docfx_directory: "."
33+
target_directory: "."
34+
url_base_path: "/dotnet"
35+
36+
# Create the PR for the work done by the "clean repo" tool
37+
- name: create-pull-request
38+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
39+
with:
40+
branch: cleanrepo-orphaned-includes
41+
title: "Monthly chores: Delete orphaned include files"
42+
commit-message: "Bot 🤖 generated CleanRepo tool run"
43+
body: "Find and delete orphaned include files. Contributes to #..."

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "clean repo - snippets"
2+
3+
on:
4+
schedule:
5+
- cron: "0 1 1 * *" # Runs at 01:00, on day 1 of the month
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
clean-repo:
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
18+
steps:
19+
- name: Harden Runner
20+
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
21+
with:
22+
egress-policy: audit
23+
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
26+
# Call clean repo
27+
- name: Clean repo
28+
id: clean-repo-step
29+
uses: dotnet/docs-tools/cleanrepo@b1ebc174a5bbd18e6904a12069a8fae2c5cc3b6f
30+
with:
31+
function: "FindOrphanedSnippets"
32+
docfx_directory: "."
33+
target_directory: "docs"
34+
url_base_path: "/dotnet"
35+
36+
# Create the PR for the work done by the "clean repo" tool
37+
- name: create-pull-request
38+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
39+
with:
40+
branch: cleanrepo-orphaned-snippets
41+
title: "Monthly chores: Delete orphaned snippets"
42+
commit-message: "Bot 🤖 generated CleanRepo tool run"
43+
body: "Find and delete orphaned snippets. Contributes to #..."

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "clean repo - redirect hops"
2+
3+
on:
4+
schedule:
5+
- cron: "0 1 1 * *" # Runs at 01:00, on day 1 of the month
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
clean-repo:
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
18+
steps:
19+
- name: Harden Runner
20+
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
21+
with:
22+
egress-policy: audit
23+
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
26+
# Call clean repo
27+
- name: Clean repo
28+
id: clean-repo-step
29+
uses: dotnet/docs-tools/cleanrepo@b1ebc174a5bbd18e6904a12069a8fae2c5cc3b6f
30+
with:
31+
function: "RemoveRedirectHops"
32+
docfx_directory: "."
33+
target_directory: "docs"
34+
url_base_path: "/dotnet"
35+
36+
# Create the PR for the work done by the "clean repo" tool
37+
- name: create-pull-request
38+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
39+
with:
40+
branch: cleanrepo-remove-hops
41+
title: "Monthly chores: Remove redirect hops"
42+
commit-message: "Bot 🤖 generated CleanRepo tool run"
43+
body: "Remove redirect hops, for example, if a -> b and b -> c, replace a -> b with a -> c. Contributes to #..."

0 commit comments

Comments
 (0)