Skip to content

Commit 5c652e2

Browse files
dotnet-policy-service[bot]dotnet-policy-service[bot]
authored
Merge pull request #49899 from dotnet/main
Merge main into live
2 parents 496fcc0 + 600471e commit 5c652e2

Some content is hidden

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

49 files changed

+620
-1918
lines changed

‎.github/instructions/Markdown.WritingStyle.instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ALWAYS:
4141
- **MANDATORY: Number ordered lists using "1." for every item (NOT 1., 2., 3.) - ALWAYS USE "1."**
4242
- **REQUIRED: Use bullets for unordered lists - NEVER use numbers for unordered content**
4343
- **ESSENTIAL: Write complete sentences in lists with proper punctuation**
44-
- **MUST: End list items with periods if more than three words - THIS IS NON-NEGOTIABLE**
44+
- **MUST: End list items with periods if more than three words. The period may be inside style marks like `*` for italic or `**` for bold - THIS IS NON-NEGOTIABLE**
4545
- Skip end punctuation on titles, headings, and UI elements (3 words or fewer)
4646

4747
### Spacing and Layout

‎.github/prompts/error-consolidation.md‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Overall steps:
1212

1313
We're going to work through a series of files consolidating errors and warnings.
1414

15-
- For the duration of this chat, all references to "destination file" refer to `attribute-usage-errors.md`.
16-
- For the duration of this chat, all references to "the target theme" refer to errors and warnings related to declaring and using *attributes*.
15+
- For the duration of this chat, all references to "destination file" refer to `generic-type-parameters-errors.md`.
16+
- For the duration of this chat, all references to "the target theme" refer to errors and warnings related to generic type parameters and generic type arguments.
1717

1818
The destination file already contains a skeleton for the final output.
1919

@@ -64,5 +64,16 @@ Understand these instructions, then suggest a list of themes and the included er
6464

6565
## Move from description to resolution
6666

67-
Rework the highlighted section so the focus is on how to correct each error. This article doesn't need to explain the associated language feature. Instead, in each section, provide links to language reference or language specification material that explains the rules violated when these diagnostics appear. Add explanatory context after each correction (in parentheses with the error code). Provided brief reasons why each correction is needed. Use detailed, sentence-style explanations rather than brief imperative statements. For each recommendation put the affectived error codes in parentheses, and in **bold** style. Remove extensive examples.
67+
Rework the highlighted section so the focus is on how to correct each error. This article doesn't need to explain the associated language feature. Instead, in each section, provide links to language reference or language specification material that explains the rules violated when these diagnostics appear. Add explanatory context after each correction (in parentheses with the error code). Provided brief reasons why each correction is needed. Use detailed, sentence-style explanations rather than brief imperative statements. For each recommendation put the affectived error codes in parentheses, and in **bold** style. Remove extensive examples. Remove all H3 headings in this section. If any errors are no longer produced in the latest version of C#, make a note of that.
6868

69+
## Verify error messages
70+
71+
For every line in this table, verify that the error message associated with this error code matches the verbatim text in CSharpResources.resx. You can find the mapping using ErrorCodes.cs:
72+
73+
1. Find that number as a constant in `ErrorCodes.cs`.
74+
2. Locate the corresponding `data` element in CSharpResources.resx. The `name` atttribute should match the number of the constant.
75+
3. Read the error message found in the `<value>` element that is a child of that `<data>` element.
76+
77+
<make your own hand edits>
78+
79+
Now, ensure every instance of an error message matches the text in the highlighted table.

‎.openpublishing.redirection.csharp.json‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,105 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/docs/csharp/misc/cs0080.md",
5+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/docs/csharp/misc/cs0081.md",
10+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/docs/csharp/misc/cs0305.md",
15+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/docs/csharp/misc/cs0306.md",
20+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/docs/csharp/misc/cs0307.md",
25+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/docs/csharp/misc/cs0308.md",
30+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/docs/csharp/misc/cs0312.md",
35+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/docs/csharp/misc/cs0313.md",
40+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/docs/csharp/misc/cs0314.md",
45+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/docs/csharp/misc/cs0315.md",
50+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/docs/csharp/misc/cs0403.md",
55+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/docs/csharp/misc/cs0412.md",
60+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/docs/csharp/misc/cs0694.md",
65+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/docs/csharp/misc/cs0695.md",
70+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/docs/csharp/misc/cs0698.md",
75+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0304.md",
80+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0310.md",
85+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0311.md",
90+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0413.md",
95+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0417.md",
100+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors",
101+
"redirect_document_id": false
102+
},
3103
{
4104
"source_path_from_root": "/redirections/proposals/csharp-7.0/binary-literals.md",
5105
"redirect_url": "/dotnet/csharp/language-reference/language-specification/lexical-structure#6453-integer-literals"
@@ -315,6 +415,18 @@
315415
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0034.md",
316416
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overload-resolution"
317417
},
418+
{
419+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0071.md",
420+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
421+
},
422+
{
423+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0106.md",
424+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
425+
},
426+
{
427+
"source_path_from_root": "/docs/csharp/misc/cs0277.md",
428+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
429+
},
318430
{
319431
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0178.md",
320432
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
@@ -355,6 +467,22 @@
355467
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0650.md",
356468
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
357469
},
470+
{
471+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0686.md",
472+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
473+
},
474+
{
475+
"source_path_from_root": "/docs/csharp/misc/cs0736.md",
476+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
477+
},
478+
{
479+
"source_path_from_root": "/docs/csharp/misc/cs0737.md",
480+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
481+
},
482+
{
483+
"source_path_from_root": "/docs/csharp/misc/cs0738.md",
484+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
485+
},
358486
{
359487
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0767.md",
360488
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/ref-modifiers-errors"
@@ -1833,10 +1961,34 @@
18331961
"source_path_from_root": "/docs/csharp/misc/cs0457.md",
18341962
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overload-resolution"
18351963
},
1964+
{
1965+
"source_path_from_root": "/docs/csharp/misc/cs0425.md",
1966+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
1967+
},
1968+
{
1969+
"source_path_from_root": "/docs/csharp/misc/cs0460.md",
1970+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
1971+
},
18361972
{
18371973
"source_path_from_root": "/docs/csharp/misc/cs0466.md",
18381974
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/params-arrays"
18391975
},
1976+
{
1977+
"source_path_from_root": "/docs/csharp/misc/cs0470.md",
1978+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
1979+
},
1980+
{
1981+
"source_path_from_root": "/docs/csharp/misc/cs0473.md",
1982+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
1983+
},
1984+
{
1985+
"source_path_from_root": "/docs/csharp/misc/cs0531.md",
1986+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
1987+
},
1988+
{
1989+
"source_path_from_root": "/docs/csharp/misc/cs0535.md",
1990+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
1991+
},
18401992
{
18411993
"source_path_from_root": "/docs/csharp/misc/cs0501.md",
18421994
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/partial-declarations"
@@ -1865,6 +2017,30 @@
18652017
"source_path_from_root": "/docs/csharp/misc/cs0526.md",
18662018
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/constructor-errors#constructor-declarations"
18672019
},
2020+
{
2021+
"source_path_from_root": "/docs/csharp/misc/cs0538.md",
2022+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
2023+
},
2024+
{
2025+
"source_path_from_root": "/docs/csharp/misc/cs0539.md",
2026+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
2027+
},
2028+
{
2029+
"source_path_from_root": "/docs/csharp/misc/cs0540.md",
2030+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
2031+
},
2032+
{
2033+
"source_path_from_root": "/docs/csharp/misc/cs0541.md",
2034+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
2035+
},
2036+
{
2037+
"source_path_from_root": "/docs/csharp/misc/cs0550.md",
2038+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
2039+
},
2040+
{
2041+
"source_path_from_root": "/docs/csharp/misc/cs0551.md",
2042+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/interface-implementation-errors"
2043+
},
18682044
{
18692045
"source_path_from_root": "/docs/csharp/misc/cs0553.md",
18702046
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"

0 commit comments

Comments
 (0)