From 218c4d423c41d014de4fe4a3eb14abbfef817362 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 6 Nov 2025 16:18:12 -0500 Subject: [PATCH 1/3] Fix md lint and copilot instructions --- .github/copilot-instructions.md | 1 + docs/project/library-servicing.md | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 15df0b23bd3e80..49fe834173bb70 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -23,6 +23,7 @@ In addition to the rules enforced by `.editorconfig`, you SHOULD: - When running tests, if possible use filters and check test run counts, or look at test logs, to ensure they actually ran. - Do not finish work with any tests commented out or disabled that were not previously commented out or disabled. - When writing tests, do not emit "Act", "Arrange" or "Assert" comments. +- For markdown (`.md`) files, ensure there is no trailing whitespace at the end of any line. --- diff --git a/docs/project/library-servicing.md b/docs/project/library-servicing.md index ee579c133b1886..9e2bc5c64e4d06 100644 --- a/docs/project/library-servicing.md +++ b/docs/project/library-servicing.md @@ -7,7 +7,7 @@ Servicing branches represent shipped versions of .NET. The branch naming convent - **For .NET 8 and .NET 9**: Branch names use the format `release/X.0-staging`. Examples: - `release/9.0-staging` - `release/8.0-staging` - + - **For .NET 10+**: Branch names use the format `release/X.0` (no `-staging` suffix). Examples: - `release/10.0` - `release/11.0` @@ -36,7 +36,7 @@ All the servicing change must go through an approval process. You have two ways For .NET 8 and .NET 9 (use `-staging` suffix): - `/backport to release/9.0-staging` - `/backport to release/8.0-staging` - + For .NET 10+ (no `-staging` suffix): - `/backport to release/10.0` - `/backport to release/11.0` @@ -55,4 +55,4 @@ For all cases, you must: The area owner can then merge the PR once the CI looks good (it's either green or the failures are investigated and determined to be unrelated to the PR). -**Note**: Applying the `Servicing-approved` label ensures the `check-service-labels` CI job passes, which is a mandatory requirement for merging a PR in a servicing branch. \ No newline at end of file +**Note**: Applying the `Servicing-approved` label ensures the `check-service-labels` CI job passes, which is a mandatory requirement for merging a PR in a servicing branch. From 8ba6ef79559c452d0effb3e110ee1f4b050b89d3 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 6 Nov 2025 16:21:48 -0500 Subject: [PATCH 2/3] update --- docs/project/library-servicing.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/project/library-servicing.md b/docs/project/library-servicing.md index 9e2bc5c64e4d06..5685a3698963f8 100644 --- a/docs/project/library-servicing.md +++ b/docs/project/library-servicing.md @@ -54,5 +54,3 @@ For all cases, you must: - Add the `Servicing-approved` label. The area owner can then merge the PR once the CI looks good (it's either green or the failures are investigated and determined to be unrelated to the PR). - -**Note**: Applying the `Servicing-approved` label ensures the `check-service-labels` CI job passes, which is a mandatory requirement for merging a PR in a servicing branch. From e90b17bbb1fc6a0f416daabae822de7a97cd2065 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 6 Nov 2025 16:22:21 -0500 Subject: [PATCH 3/3] update --- docs/project/library-servicing.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/project/library-servicing.md b/docs/project/library-servicing.md index 5685a3698963f8..9e2bc5c64e4d06 100644 --- a/docs/project/library-servicing.md +++ b/docs/project/library-servicing.md @@ -54,3 +54,5 @@ For all cases, you must: - Add the `Servicing-approved` label. The area owner can then merge the PR once the CI looks good (it's either green or the failures are investigated and determined to be unrelated to the PR). + +**Note**: Applying the `Servicing-approved` label ensures the `check-service-labels` CI job passes, which is a mandatory requirement for merging a PR in a servicing branch.