Skip to content

Commit 1e7fc8d

Browse files
Merge pull request #43294 from dotnet/main
Merge main into live
2 parents 4308e53 + 09bfdc7 commit 1e7fc8d

16 files changed

+388
-132
lines changed

.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/workflows/clean-repo.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.
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 #..."
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 #..."
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 #..."
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 #..."
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 #..."
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "clean repo - relative links"
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: "ReplaceWithRelativeLinks"
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-relative-links
41+
title: "Monthly chores: Use relative links"
42+
commit-message: "Bot 🤖 generated CleanRepo tool run"
43+
body: "Find and replace absolute links with relative links. Contributes to #..."
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "clean repo - replace redirects"
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: "ReplaceRedirectTargets"
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-replace-redirects
41+
title: "Monthly chores: Replace redirect targets"
42+
commit-message: "Bot 🤖 generated CleanRepo tool run"
43+
body: "Replace redirected links with target URL. Contributes to #..."

.openpublishing.redirection.fsharp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
},
7777
{
7878
"source_path_from_root": "/docs/fsharp/tutorials/getting-started/getting-started-visual-studio-for-mac.md",
79-
"redirect_url": "/dotnet/fsharp/get-started/get-started-vscode",
79+
"redirect_url": "/dotnet/fsharp/get-started/get-started-vscode"
8080
},
8181
{
8282
"source_path_from_root": "/docs/fsharp/tutorials/getting-started/getting-started-visual-studio.md",

0 commit comments

Comments
 (0)