Skip to content

Commit 39b314b

Browse files
authored
Merge pull request #52692 from dotnet/main
Merge main into live
2 parents bbb318a + 4560c34 commit 39b314b

491 files changed

Lines changed: 12070 additions & 10720 deletions

File tree

Some content is hidden

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

.github/copilot-instructions.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,18 @@ Unless otherwise specified, all .NET content refers to modern .NET (not .NET Fra
2929
Use cross-references: `<xref:api-doc-ID>`.
3030

3131
To find API doc IDs:
32+
3233
1. Check XML files in https://github.com/dotnet/dotnet-api-docs.
3334
2. For types: `Value` attribute of `<TypeSignature>` where `Language="DocId"` (omit first 2 characters).
3435
3. For members: `Value` attribute of `<MemberSignature>` where `Language="DocId"` (omit first 2 characters).
3536

3637
If unsure, use API browser: `https://learn.microsoft.com/api/apibrowser/dotnet/search?api-version=0.2&locale=en-us&search={API_NAME}&$skip=0&$top=5` and then use the `url` value from the results as a manual link.
3738

39+
**Encoding**:
40+
41+
1. Encode `#` as `%23` in API doc IDs. For example, `System.String.#ctor` becomes `System.String.%23ctor`.
42+
2. **DO NOT** encode `*` or \` (backtick) characters as `%2A` or `%60` respectively.
43+
3844
## Code Snippets
3945

4046
For snippets >6 lines:

.github/prompts/error-consolidation.md

Lines changed: 2 additions & 2 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 `string-interpolations.md`.
16-
- For the duration of this chat, all references to "the target theme" refer to errors and warnings related to string interpolations, and string interpolation handlers.
15+
- For the duration of this chat, all references to "destination file" refer to `docs/csharp/language-reference/compiler-messages/overloaded-operator-errors.md`.
16+
- For the duration of this chat, all references to "the target theme" refer to errors and warnings related to overflow, underflow, and checked and unchecked operators.
1717

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

.github/prompts/whats-new-net.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ In addition, follow these recommendations:
5151
- For the runtime and libraries articles, include extensive examples as well as links to recently updated articles related to the new feature. The examples should be at least as thorough as the examples from the source release notes.
5252
- Where applicable, the SDK article should include the samples.
5353
- The overview article generally doesn't include examples. Its purpose is to direct readers to more detailed information in other articles.
54-
- All APIs should be referenced using an `xref` style link, at least on first mention. Later mentions should be code-fenced in single back-ticks.
54+
- All APIs should be referenced using an `xref` style link as described in the `.github/copilot-instructions.md` file, at least on first mention. Later mentions should be code-fenced in single back-ticks.
5555
- All links to article in the `dotnet/docs` repository should be file relative.
5656
- Spell out acronyms on first use in each file.
5757
- Avoid gerund form in headings.

.openpublishing.redirection.ai.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
"redirect_url": "/dotnet/ai/conceptual/ai-tools",
2424
"redirect_document_id": true
2525
},
26+
{
27+
"source_path_from_root": "/docs/ai/conceptual/vector-databases.md",
28+
"redirect_url": "/dotnet/ai/vector-stores/overview",
29+
"redirect_document_id": true
30+
},
2631
{
2732
"source_path_from_root": "/docs/ai/get-started/dotnet-ai-overview.md",
2833
"redirect_url": "/dotnet/ai/overview",
@@ -40,6 +45,11 @@
4045
"source_path_from_root": "/docs/ai/how-to/work-with-local-models.md",
4146
"redirect_url": "/dotnet/ai"
4247
},
48+
{
49+
"source_path_from_root": "/docs/ai/quickstarts/build-vector-search-app.md",
50+
"redirect_url": "/dotnet/ai/vector-stores/how-to/build-vector-search-app",
51+
"redirect_document_id": true
52+
},
4353
{
4454
"source_path_from_root": "/docs/ai/quickstarts/evaluate-ai-response.md",
4555
"redirect_url": "/dotnet/ai/evaluation/evaluate-ai-response",
@@ -98,6 +108,11 @@
98108
"source_path_from_root": "/docs/ai/tutorials/evaluate-with-reporting.md",
99109
"redirect_url": "/dotnet/ai/evaluation/evaluate-with-reporting",
100110
"redirect_document_id": true
111+
},
112+
{
113+
"source_path_from_root": "/docs/ai/tutorials/tutorial-ai-vector-search.md",
114+
"redirect_url": "/dotnet/ai/vector-stores/tutorial-vector-search",
115+
"redirect_document_id": true
101116
}
102117
]
103118
}

.openpublishing.redirection.csharp.json

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,50 @@
44
"source_path_from_root": "/docs/csharp/fundamentals/types/namespaces.md",
55
"redirect_url": "/dotnet/csharp/fundamentals/program-structure/namespaces"
66
},
7+
{
8+
"source_path_from_root": "/docs/csharp/misc/cs0017.md",
9+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
10+
},
11+
{
12+
"source_path_from_root": "/docs/csharp/misc/cs0028.md",
13+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
14+
},
15+
{
16+
"source_path_from_root": "/docs/csharp/misc/cs0031.md",
17+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
18+
},
19+
{
20+
"source_path_from_root": "/docs/csharp/misc/cs0220.md",
21+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
22+
},
23+
{
24+
"source_path_from_root": "/docs/csharp/misc/cs0221.md",
25+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
26+
},
27+
{
28+
"source_path_from_root": "/docs/csharp/misc/cs0463.md",
29+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
30+
},
31+
{
32+
"source_path_from_root": "/docs/csharp/misc/cs0543.md",
33+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
34+
},
35+
{
36+
"source_path_from_root": "/docs/csharp/misc/cs0594.md",
37+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
38+
},
39+
{
40+
"source_path_from_root": "/docs/csharp/misc/cs0652.md",
41+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
42+
},
43+
{
44+
"source_path_from_root": "/docs/csharp/misc/cs0659.md",
45+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
46+
},
47+
{
48+
"source_path_from_root": "/docs/csharp/misc/cs1021.md",
49+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
50+
},
751
{
852
"source_path_from_root": "/docs/csharp/misc/cs0080.md",
953
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors"
@@ -48,6 +92,10 @@
4892
"source_path_from_root": "/docs/csharp/misc/cs0401.md",
4993
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors"
5094
},
95+
{
96+
"source_path_from_root": "/docs/csharp/misc/cs0402.md",
97+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
98+
},
5199
{
52100
"source_path_from_root": "/docs/csharp/misc/cs0403.md",
53101
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors"
@@ -132,6 +180,34 @@
132180
"source_path_from_root": "/docs/csharp/misc/cs1022.md",
133181
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-directive-errors#cs1022"
134182
},
183+
{
184+
"source_path_from_root": "/docs/csharp/misc/cs1555.md",
185+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
186+
},
187+
{
188+
"source_path_from_root": "/docs/csharp/misc/cs1556.md",
189+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
190+
},
191+
{
192+
"source_path_from_root": "/docs/csharp/misc/cs1557.md",
193+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
194+
},
195+
{
196+
"source_path_from_root": "/docs/csharp/misc/cs1558.md",
197+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
198+
},
199+
{
200+
"source_path_from_root": "/docs/csharp/misc/cs1559.md",
201+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
202+
},
203+
{
204+
"source_path_from_root": "/docs/csharp/misc/cs2017.md",
205+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
206+
},
207+
{
208+
"source_path_from_root": "/docs/csharp/misc/cs5001.md",
209+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
210+
},
135211
{
136212
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs0304.md",
137213
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/generic-type-parameters-errors"
@@ -867,6 +943,14 @@
867943
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8795.md",
868944
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/partial-types"
869945
},
946+
{
947+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8802.md",
948+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
949+
},
950+
{
951+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8803.md",
952+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/entry-point-errors"
953+
},
870954
{
871955
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8812.md",
872956
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/unsafe-code-errors"

0 commit comments

Comments
 (0)