Skip to content

Commit 982c98e

Browse files
Merge pull request #49728 from dotnet/main
Merge main into live
2 parents 4fd4b5c + 8fcad0c commit 982c98e

30 files changed

+293
-791
lines changed

.github/prompts/error-consolidation.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ 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 `async-await-errors.md.
16-
- For the duration of this chat, all references to "the target theme" refer to errors and warnings related to `async` function declarations and `await` expressions.
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*.
1717

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

2020
For each source file I specify in this chat, you'll do the following tasks:
2121

2222
- Add the contents of the source file to the destination.md file.
2323
- Include the source error code in the YML header for f1_keywords and helpviewer_keywords.
24-
- Add an entry with an anchor for the error error code and its corresponding error message.
24+
- Add an entry with an anchor for the error error code and its corresponding error message. The error message should be the verbatim compiler error message.
2525
- Add the contents of the source file as a new H2 in the destination file.
2626
- Add a redirection for the source file in the file .openpublishing.redirection.csharp.json. Make the destination point to destination file. Place the new entry in sorted order based on 'source_path_from_root'.
2727
- Update the TOC file:
@@ -31,7 +31,7 @@ For each source file I specify in this chat, you'll do the following tasks:
3131

3232
## Search for other related articles that may be missed.
3333

34-
Search all files in the docs/csharp/language-reference/compiler-messages and the docs/csharp/misc folder for any other errors and warnings that involve the target theme. Give me a list to review for possible additional consolidation. Don't make any edits until the originating user approves.
34+
First, let's find candidate source files. Search all files in the docs/csharp/language-reference/compiler-messages and the docs/csharp/misc folder for any other errors and warnings that involve the target theme. Give me a list to review for possible additional consolidation. Don't make any edits until the originating user approves.
3535

3636
## Final search in roslyn source
3737

@@ -46,7 +46,7 @@ To make sure you've found all related errors, we'll check the source. Look in `
4646
I'll give you error codes one by one. For each, I want you to do the following:
4747

4848
- Add the new error code to the front matter of the destination file, for both the `f1_keywords` and `helpview_keywords` table.
49-
- Add the new error code and error message to the table at the top of the destination file.
49+
- Add the new error code and error message to the table at the top of the destination file. The error message should be the verbatim text from the compiler
5050
- Add the new error code to the list of `displayName` elements in the TOC file entry for the destination file.
5151
- Remove the new error code from the front matter in the file `csharp/misc/sorry-we-don-t-have-specifics-on-this-csharp-errors.md` file.
5252

@@ -61,3 +61,8 @@ To do that, make a new H2 section for the theme. Remove all the H2s for the indi
6161
The list of errors at the top of the file should remain in numerical order, so it's easy for readers to scan. Each impacted error code should now have a link to the anchor tag for the new section. Repeat the list in the new section, but without the anchors, as shown in the highlighted text.
6262

6363
Understand these instructions, then suggest a list of themes and the included error codes. I'll approve each theme before you begin editing.
64+
65+
## Move from description to resolution
66+
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.
68+

.openpublishing.redirection.csharp.json

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,6 +1717,10 @@
17171717
"source_path_from_root": "/docs/csharp/misc/cs0242.md",
17181718
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/unsafe-code-errors"
17191719
},
1720+
{
1721+
"source_path_from_root": "/docs/csharp/misc/cs0243.md",
1722+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1723+
},
17201724
{
17211725
"source_path_from_root": "/docs/csharp/misc/cs0244.md",
17221726
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/unsafe-code-errors"
@@ -1793,6 +1797,22 @@
17931797
"source_path_from_root": "/docs/csharp/misc/cs0400.md",
17941798
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/assembly-references"
17951799
},
1800+
{
1801+
"source_path_from_root": "/docs/csharp/misc/cs0404.md",
1802+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1803+
},
1804+
{
1805+
"source_path_from_root": "/docs/csharp/misc/cs0415.md",
1806+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1807+
},
1808+
{
1809+
"source_path_from_root": "/docs/csharp/misc/cs0416.md",
1810+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1811+
},
1812+
{
1813+
"source_path_from_root": "/docs/csharp/misc/cs0447.md",
1814+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1815+
},
17961816
{
17971817
"source_path_from_root": "/docs/csharp/misc/cs0431.md",
17981818
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
@@ -1929,6 +1949,26 @@
19291949
"source_path_from_root": "/docs/csharp/misc/cs0576.md",
19301950
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"
19311951
},
1952+
{
1953+
"source_path_from_root": "/docs/csharp/misc/cs0577.md",
1954+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1955+
},
1956+
{
1957+
"source_path_from_root": "/docs/csharp/misc/cs0578.md",
1958+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1959+
},
1960+
{
1961+
"source_path_from_root": "/docs/csharp/misc/cs0582.md",
1962+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1963+
},
1964+
{
1965+
"source_path_from_root": "/docs/csharp/misc/cs0609.md",
1966+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1967+
},
1968+
{
1969+
"source_path_from_root": "/docs/csharp/misc/cs0629.md",
1970+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1971+
},
19321972
{
19331973
"source_path_from_root": "/docs/csharp/misc/cs0591.md",
19341974
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/parameter-argument-mismatch"
@@ -1949,6 +1989,10 @@
19491989
"source_path_from_root": "/docs/csharp/misc/cs0623.md",
19501990
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/array-declaration-errors"
19511991
},
1992+
{
1993+
"source_path_from_root": "/docs/csharp/misc/cs0625.md",
1994+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
1995+
},
19521996
{
19531997
"source_path_from_root": "/docs/csharp/misc/cs0631.md",
19541998
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/ref-modifiers-errors"
@@ -1957,10 +2001,38 @@
19572001
"source_path_from_root": "/docs/csharp/misc/cs0633.md",
19582002
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/parameter-argument-mismatch"
19592003
},
2004+
{
2005+
"source_path_from_root": "/docs/csharp/misc/cs0636.md",
2006+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
2007+
},
2008+
{
2009+
"source_path_from_root": "/docs/csharp/misc/cs0637.md",
2010+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
2011+
},
2012+
{
2013+
"source_path_from_root": "/docs/csharp/misc/cs0641.md",
2014+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
2015+
},
2016+
{
2017+
"source_path_from_root": "/docs/csharp/misc/cs0646.md",
2018+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
2019+
},
19602020
{
19612021
"source_path_from_root": "/docs/csharp/misc/cs0643.md",
19622022
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/parameter-argument-mismatch"
19632023
},
2024+
{
2025+
"source_path_from_root": "/docs/csharp/misc/cs0653.md",
2026+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
2027+
},
2028+
{
2029+
"source_path_from_root": "/docs/csharp/misc/cs0657.md",
2030+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
2031+
},
2032+
{
2033+
"source_path_from_root": "/docs/csharp/misc/cs0658.md",
2034+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
2035+
},
19642036
{
19652037
"source_path_from_root": "/docs/csharp/misc/cs0655.md",
19662038
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/parameter-argument-mismatch"
@@ -1973,6 +2045,10 @@
19732045
"source_path_from_root": "/docs/csharp/misc/cs0674.md",
19742046
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/params-arrays"
19752047
},
2048+
{
2049+
"source_path_from_root": "/docs/csharp/misc/cs0685.md",
2050+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/attribute-usage-errors"
2051+
},
19762052
{
19772053
"source_path_from_root": "/docs/csharp/misc/cs0687.md",
19782054
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors"

0 commit comments

Comments
 (0)