Skip to content

Commit 46ae721

Browse files
Merge pull request #42726 from dotnet/main
Merge main into live
2 parents d4a705c + f8a5c3b commit 46ae721

File tree

27 files changed

+61
-75
lines changed

27 files changed

+61
-75
lines changed

.github/workflows/clean-repo.yml

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

4747
# Create the PR for the work done by the "clean repo" tool
4848
- name: create-pull-request
49-
uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79
49+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
5050
with:
5151
branch: create-cleanrepo-pull-request/patch
5252
title: "Monthly chores: Automated repo cleanup"

.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@6cd32fd93684475c31847837f87bb135d40a2b79
55+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
5656
with:
5757
branch: create-dependabotconfig-pull-request/patch
5858
title: "Update dependabot.yml - automatically."

.github/workflows/profanity-filter.yml

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

2626
- name: Profanity filter
2727
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'github-actions[bot]' }}
28-
uses: IEvangelist/profanity-filter@7b35b30e0d01d3c4a63a57b2ec5db0768bc4d53b # main
28+
uses: IEvangelist/profanity-filter@840020b719c619d953959e59c47185689e831a27 # main
2929
id: profanity-filter
3030
with:
3131
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
74+
uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
7575
with:
7676
sarif_file: results.sarif

.github/workflows/whats-new.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
savedir: './docs/whats-new'
5353

5454
- name: create-pull-request
55-
uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79
55+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
5656
with:
5757
branch: create-whatsnew-pull-request/patch
5858
title: "What's new article"

README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,23 @@
1111

1212
This repository contains the conceptual documentation for .NET. The [.NET documentation site](https://learn.microsoft.com/dotnet) is built from multiple repositories in addition to this one:
1313

14-
- [.NET Desktop workloads](https://github.com/dotnet/docs-desktop)
1514
- [.NET Aspire](https://github.com/dotnet/docs-aspire)
15+
- [.NET Desktop workloads](https://github.com/dotnet/docs-desktop)
1616
- [API reference](https://github.com/dotnet/dotnet-api-docs)
17-
- [.NET Compiler Platform SDK reference](https://github.com/dotnet/roslyn-api-docs)
18-
- [C# specification - draft](https://github.com/dotnet/csharpstandard)
1917
- [C# Language design](https://github.com/dotnet/csharplang)
18+
- [C# specification - draft](https://github.com/dotnet/csharpstandard)
2019

21-
Our team's tasks are tracked in our [project boards](https://github.com/dotnet/docs/projects?query=is%3Aopen). You'll see monthly sprint projects, along with long-running projects for major documentation updates. The projects contain documentation issues across the repositories that build .NET docs. Issues are tracked in the relevant repositories. We have a large community using these resources. We make our best effort to respond to issues in a timely fashion. You can read more about our procedures for classifying and resolving issues in our [Issues policy](issues-policy.md) topic. To create a new issue, click the "Open a documentation issue" button at the bottom of any of our published docs, or [choose one of the available templates](https://github.com/dotnet/docs/issues/new/choose). The control at the bottom of each article automatically routes you to the correct repo and fills in some relevant information based on the article.
20+
Our team's tasks are tracked in our [project boards](https://github.com/dotnet/docs/projects?query=is%3Aopen). You'll see monthly sprint projects, along with long-running projects for major documentation updates. The projects contain documentation issues across the repositories that build .NET docs. Issues are tracked in the relevant repositories. We have a large community using these resources. We make our best effort to respond to issues in a timely fashion. To create a new issue, click the "Open a documentation issue" button at the bottom of any of our published docs, or [choose one of the available templates](https://github.com/dotnet/docs/issues/new/choose). The control at the bottom of each article automatically routes you to the correct repo and fills in some relevant information based on the article.
2221

2322
## :purple_heart: Contribute
2423

25-
We welcome contributions to help us improve and complete the .NET docs. This is a very large repo, covering a large area. If this is your first visit, see our [labels and projects roadmap](styleguide/labels-projects.md) for help navigating the issues and projects in this repository. If your contribution includes third-party dependencies, see our guidance on using [third-party dependencies](styleguide/3rdPartyDependencies.md).
24+
We welcome contributions to help us improve and complete the .NET docs. This is a very large repo, covering a large area. If this is your first visit, see the [Contributor guide](https://learn.microsoft.com/contribute/content/dotnet/dotnet-contribute) for information on working with us. Look for issues labeled [`help wanted` :label:](https://github.com/dotnet/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22+) for ideas to get started.
25+
26+
Before submitting a PR with 3rd party dependencies, see our policy on [3rd party dependencies](admin/3rdPartyDependencies.md).
2627

27-
To contribute, see:
28+
We work to merge or close PRs in a timely fashion. We regularly review and approve PRs. We encourage contributors to respond to comments in a similar timely fashion. Many times, reviews identify small changes such as spelling or grammar issues, or word choice. Maintainers can accept those suggestions and merge the PR. In other situations, maintainers ask for more significant changes before a PR is ready to merge. We expect contributors to make those changes. Maintainers will help by answering questions or pointing to other resources, if needed.
2829

29-
- The [.NET Contributor Guide :ledger:](https://learn.microsoft.com/contribute/dotnet/dotnet-contribute) for instructions on procedures we use.
30-
- Issues labeled [`help wanted` :label:](https://github.com/dotnet/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22+) for ideas.
31-
- [#Hacktoberfest and Microsoft Docs :jack_o_lantern:](https://learn.microsoft.com/contribute/hacktoberfest) for details on our participation in the annual event.
30+
We consider PRs to be abandoned when they've had no activity (either commits or discussion) in the past 30 days. Team members will close PRs that have been abandoned. Contributors can reopen and continue to work.
3231

3332
## :bookmark_tabs: Code of conduct
3433

File renamed without changes.

admin/governance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ You can see the full details on configured GitHub actions in our [README.MD](htt
5252

5353
## :ledger: Labels for reporting
5454

55-
- `*/tech`, `*/prod`: These labels provide 1st and 2nd level organization to our content.
55+
- `*/subsvc`, `*/svc`: These labels provide 1st and 2nd level organization to our content.
5656
- `doc-*`, `product-*`: These provide classifications for what kind of issue is it.
5757
- `okr-*`: These map to our internal OKR system.
5858

0 commit comments

Comments
 (0)