Skip to content

Commit 5223cf5

Browse files
Merge pull request #49505 from dotnet/main
Merge main into live
2 parents 93fc41f + 14d3460 commit 5223cf5

File tree

104 files changed

+1032
-640
lines changed

Some content is hidden

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

104 files changed

+1032
-640
lines changed

.github/dependabot.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,6 +1383,17 @@ updates:
13831383
dotnet:
13841384
patterns:
13851385
- "*" # Prefer a single PR per project update.
1386+
- package-ecosystem: "nuget"
1387+
directory: "/docs/core/enrichment/snippets/enrichment" #Enrichment.csproj
1388+
schedule:
1389+
interval: "weekly"
1390+
day: "wednesday"
1391+
open-pull-requests-limit: 5
1392+
groups:
1393+
# Group .NET updates together for projects.
1394+
dotnet:
1395+
patterns:
1396+
- "*" # Prefer a single PR per project update.
13861397
- package-ecosystem: "nuget"
13871398
directory: "/docs/core/extensions/snippets/caching/distributed" #distributed-apis.csproj
13881399
schedule:
@@ -2186,14 +2197,3 @@ updates:
21862197
dotnet:
21872198
patterns:
21882199
- "*" # Prefer a single PR per project update.
2189-
- package-ecosystem: "nuget"
2190-
directory: "/docs/core/extensions/snippets/workers/windows-service" #App.WindowsService.csproj
2191-
schedule:
2192-
interval: "weekly"
2193-
day: "wednesday"
2194-
open-pull-requests-limit: 5
2195-
groups:
2196-
# Group .NET updates together for projects.
2197-
dotnet:
2198-
patterns:
2199-
- "*" # Prefer a single PR per project update.

.github/prompts/error-consolidation.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ Overall steps:
1010

1111
## Add a single existing file into the new consolidated article.
1212

13-
We're going to work through a series of files consolidating errors and warnings related to declaring the `dynamic` type and dynamic binding.
13+
We're going to work through a series of files consolidating errors and warnings.
1414

15-
The destination for all these edits is the dynamic-type-and-binding-errors.md file. It already contains a skeleton for the final output.
15+
- For the duration of this chat, all references to "destination file" refer to `using-statement-declaration-errors.md.
16+
- For the duration of this chat, all references to "the target theme" refer to errors and warnings related to `using` statements and `using` variable declarations. Note that the `using` keyword can also be used for a `using` directive. Don't include those error messages.
17+
18+
The destination file already contains a skeleton for the final output.
1619

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

@@ -28,30 +31,30 @@ For each source file I specify in this chat, you'll do the following tasks:
2831

2932
## Search for other related articles that may be missed.
3033

31-
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 `dynamic` type or dynamic binding. Give me a list to review for possible additional consolidation. Don't make any edits until the originating user approves.
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.
3235

3336
## Final search in roslyn source
3437

3538
Let's check undocumented errors and the roslyn source for any missing errors. For every error code listed in "sorry-we-don-t-have-specifics-on-this-csharp-error.md" under the `f1_keywords` front matter, do the following:
3639
1. Find that number as a constant in `ErrorCodes.cs`.
3740
2. Locate the corresponding `data` element in CSharpResources.resx. The `name` atttribute should match the number of the constant.
3841
3. Read the error message found in the `<value>` element that is a child of that `<data>` element.
39-
Give me a list of all error numbers and corresponding error messages that relate to operator overloading.
42+
Give me a list of all error numbers and corresponding error messages that relate to the target theme.
4043

41-
To make sure you've found all related errors, we'll check the source. Look in `CSharpResources.resx` for any elements where the `<value>` element is a message related to preprocessor tokens. The symbolic constant for that value is in the `name` attribute on the parent `data` element. Find that value in `ErrorCodes.cs`. It will map to the compiler error code, where the code is "CS" followed by the number as a four digit number. Build a list of any related errors, but don't make any edits yet.
44+
To make sure you've found all related errors, we'll check the source. Look in `CSharpResources.resx` for any elements where the `<value>` element is a message related to the target theme. The symbolic constant for that value is in the `name` attribute on the parent `data` element. Find that value in `ErrorCodes.cs`. It will map to the compiler error code, where the code is "CS" followed by the number as a four digit number. Build a list of any related errors, but don't make any edits yet.
4245

4346
I'll give you error codes one by one. For each, I want you to do the following:
4447

45-
- Add the new error code to the front matter of operator-overloading-errors.md, for both the `f1_keywords` and `helpview_keywords` table.
46-
- Add the new error code and error message to the table at the top of operator-overloading-errors.md.
47-
- Add the new error code to the list of `displayName` elements in the TOC file for operator-overloading-errors.md.
48+
- 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.
50+
- Add the new error code to the list of `displayName` elements in the TOC file entry for the destination file.
4851
- 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.
4952

5053
Note that no redirections need to be added for these error codes.
5154

5255
## Build consolidated sections
5356

54-
For all remaining work, all edits will be in the `dynamic-type-and-binding-errors.md` file. The final format should mirror the structure of the `preprocessor-errors.md` file. Every H2 is a theme, all anchors are for the theme, not an individual error code.
57+
For all remaining work, all edits will be in the target file. The final format should mirror the structure of the other target theme files in the docs/csharp/language-reference/compiler-messages folder. Every H2 is a theme, all anchors are for the theme, not an individual error code.
5558

5659
To do that, make a new H2 section for the theme. Remove all the H2s for the individual error codes that are part of that theme. Where applicable, the new H2 can include text or examples from the H2s you remove. The new section should include links to language reference articles that discuss the feature or theme.
5760

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ jobs:
6363
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6464
# format to the repository Actions tab.
6565
- name: "Upload artifact"
66-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
66+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
6767
with:
6868
name: SARIF file
6969
path: results.sarif
7070
retention-days: 5
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
74+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
7575
with:
7676
sarif_file: results.sarif

.openpublishing.redirection.csharp.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,30 @@
563563
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8401.md",
564564
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/feature-version-errors"
565565
},
566+
{
567+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8410.md",
568+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-statement-declaration-errors#implementing-idisposable-and-iasyncdisposable"
569+
},
570+
{
571+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8417.md",
572+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-statement-declaration-errors#implementing-idisposable-and-iasyncdisposable"
573+
},
574+
{
575+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8418.md",
576+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-statement-declaration-errors#implementing-idisposable-and-iasyncdisposable"
577+
},
578+
{
579+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8647.md",
580+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-statement-declaration-errors#using-variable-scope-and-control-flow"
581+
},
582+
{
583+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8648.md",
584+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-statement-declaration-errors#using-variable-scope-and-control-flow"
585+
},
586+
{
587+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8649.md",
588+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-statement-declaration-errors#using-variable-scope-and-control-flow"
589+
},
566590
{
567591
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8795.md",
568592
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/partial-types"
@@ -1689,6 +1713,10 @@
16891713
"source_path_from_root": "/docs/csharp/misc/cs0244.md",
16901714
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/unsafe-code-errors"
16911715
},
1716+
{
1717+
"source_path_from_root": "/docs/csharp/misc/cs0245.md",
1718+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-statement-declaration-errors#implementing-idisposable-and-iasyncdisposable"
1719+
},
16921720
{
16931721
"source_path_from_root": "/docs/csharp/misc/cs0254.md",
16941722
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/unsafe-code-errors"
@@ -1865,6 +1893,10 @@
18651893
"source_path_from_root": "/docs/csharp/misc/cs0715.md",
18661894
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
18671895
},
1896+
{
1897+
"source_path_from_root": "/docs/csharp/misc/cs0728.md",
1898+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-statement-declaration-errors#using-variable-scope-and-control-flow"
1899+
},
18681900
{
18691901
"source_path_from_root": "/docs/csharp/misc/cs1037.md",
18701902
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/overloaded-operator-errors"
@@ -2285,6 +2317,10 @@
22852317
"source_path_from_root": "/docs/csharp/misc/cs1673.md",
22862318
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/lambda-expression-errors#syntax-limitations-in-lambda-expressions"
22872319
},
2320+
{
2321+
"source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs1674.md",
2322+
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/using-statement-declaration-errors#implementing-idisposable-and-iasyncdisposable"
2323+
},
22882324
{
22892325
"source_path_from_root": "/docs/csharp/misc/cs1686.md",
22902326
"redirect_url": "/dotnet/csharp/language-reference/compiler-messages/lambda-expression-errors#syntax-limitations-in-lambda-expressions"

docfx.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,6 @@
595595
"docs/framework/data/wcf/**/**.md": "wcf",
596596
"docs/framework/docker/**/**.md": "dotnet-docker",
597597
"docs/framework/install/**/**.md": "install-deployment",
598-
"docs/framework/migration-guide/**/**.md": "app-compat",
599598
"docs/framework/network-programming/**/**.md": "networking",
600599
"docs/framework/wcf/**/**.md": "wcf",
601600
"docs/framework/windows-workflow-foundation/**/**.md": "wf",

docs/ai/evaluation/snippets/evaluate-ai-responses/TestAI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1313
<PackageReference Include="Azure.Identity" Version="1.17.0" />
14-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.0" />
14+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.1" />
1515
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.10.0" />
1616
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.10.0" />
1717
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />

docs/ai/how-to/snippets/hosted-app-auth/hosted-app-auth.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1212
<PackageReference Include="Azure.Identity" Version="1.17.0" />
1313
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
14-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.10.0" />
14+
<PackageReference Include="Microsoft.Extensions.AI" Version="9.10.1" />
1515
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
1616
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.13.0" />
1717
</ItemGroup>

docs/ai/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ landingContent:
3535
url: quickstarts/prompt-model.md
3636
- text: Build an Azure AI chat app
3737
url: quickstarts/build-chat-app.md
38-
- text: Generate images using Azure AI
39-
url: quickstarts/generate-images.md
38+
- text: Generate images from text
39+
url: quickstarts/text-to-image.md
4040

4141
# Card
4242
- title: Essential concepts

docs/ai/overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ We recommend the following sequence of tutorials and articles for an introductio
3636
| Scenario | Tutorial |
3737
|-----------------------------|-------------------------------------------------------------------------|
3838
| Create a chat application | [Build an Azure AI chat app with .NET](./quickstarts/build-chat-app.md) |
39-
| Summarize text | [Summarize text using Azure AI chat app with .NET](./quickstarts/prompt-model.md) |
40-
| Chat with your data | [Get insight about your data from an .NET Azure AI chat app](./quickstarts/build-vector-search-app.md) |
39+
| Summarize text | [Summarize text using Azure AI chat app](./quickstarts/prompt-model.md) |
40+
| Chat with your data | [Get insight about your data from a .NET Azure AI chat app](./quickstarts/build-vector-search-app.md) |
4141
| Call .NET functions with AI | [Extend Azure AI using tools and execute a local function with .NET](./quickstarts/use-function-calling.md) |
42-
| Generate images | [Generate images using Azure AI with .NET](./quickstarts/generate-images.md) |
42+
| Generate images | [Generate images from text](./quickstarts/text-to-image.md) |
4343
| Train your own model | [ML.NET tutorial](https://dotnet.microsoft.com/learn/ml-dotnet/get-started-tutorial/intro) |
4444

4545
Browse the table of contents to learn more about the core concepts, starting with [How generative AI and LLMs work](./conceptual/how-genai-and-llms-work.md).

docs/ai/quickstarts/build-chat-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,4 @@ If you no longer need them, delete the Azure OpenAI resource and GPT-4 model dep
145145
## Next steps
146146
147147
- [Quickstart - Chat with a local AI model](chat-local-model.md)
148-
- [Generate images using AI with .NET](generate-images.md)
148+
- [Generate images from text using AI](text-to-image.md)

0 commit comments

Comments
 (0)