Skip to content

Commit b81e2ab

Browse files
Merge pull request #48747 from dotnet/main
Merge main into live
2 parents 6f4fd48 + 000cff5 commit b81e2ab

File tree

33 files changed

+200
-77
lines changed

33 files changed

+200
-77
lines changed

docfx.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
"Compiler Breaking Changes - DotNet 7.md",
9191
"Compiler Breaking Changes - DotNet 8.md",
9292
"Compiler Breaking Changes - DotNet 9.md",
93-
"Compiler Breaking Changes - DotNet 10.md"
93+
"Compiler Breaking Changes - DotNet 10.md",
94+
"Deviations from Standard.md"
9495
],
9596
"src": "_roslyn/docs/compilers/CSharp",
9697
"dest": "csharp/whats-new/breaking-changes",
@@ -534,6 +535,7 @@
534535
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md": "11/08/2023",
535536
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md": "11/09/2024",
536537
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 10.md": "01/09/2024",
538+
"_roslyn/docs/compilers/CSharp/Deviations from Standard.md": "04/24/2025",
537539
"_vblang/spec/*.md": "07/21/2017"
538540
},
539541
"ms.subservice": {
@@ -715,6 +717,7 @@
715717
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md": "C# compiler breaking changes since C# 11",
716718
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md": "C# compiler breaking changes since C# 12",
717719
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 10.md": "C# compiler breaking changes since C# 13",
720+
"_roslyn/docs/compilers/CSharp/Deviations from Standard.md": "Deviations from the C# standard",
718721
"_vblang/spec/introduction.md": "Introduction",
719722
"_vblang/spec/lexical-grammar.md": "Lexical grammar",
720723
"_vblang/spec/preprocessing-directives.md": "Preprocessing directives",
@@ -837,12 +840,13 @@
837840
"_csharplang/proposals/csharp-14.0/user-defined-compound-assignment.md": "This proposal introduces user-defined compound assignment operators. Developers can override compound assignment, increment, and decrement operators.",
838841
"_csharplang/proposals/csharp-14.0/ignored-directives.md": "This proposal allows a source file to include ignored directives. In most cases, ignored directives are used for file-based apps, for example `#!`",
839842
"_csharplang/proposals/csharp-14.0/extension-operators.md": "This proposal extends the proposal for extensions to include *extension operators*, where an operator can be an extension member.",
840-
"_csharplang/proposals/csharp-14.0/named-and-optional-parameters-in-expression-trees.md": "This proposal allows an expression tree to include named and optional parameters. This enables expression trees to be more flexible in how they are constructed.",
843+
"_csharplang/proposals/csharp-14.0/optional-and-named-parameters-in-expression-trees.md": "This proposal allows an expression tree to include named and optional parameters. This enables expression trees to be more flexible in how they are constructed.",
841844
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "Learn about any breaking changes since the initial release of C# 10 and included in C# 11",
842845
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md": "Learn about any breaking changes since the initial release of C# 11 and included in C# 12",
843846
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md": "Learn about any breaking changes since the initial release of C# 12 and included in C# 13",
844847
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 10.md": "Learn about any breaking changes since the initial release of C# 13 and included in C# 14",
845-
"_vblang/spec/introduction.md": "This chapter provides and introduction to the Visual Basic language.",
848+
"_roslyn/docs/compilers/CSharp/Deviations from Standard.md": "Learn about any deviations from the C# standard",
849+
"_vblang/spec/introduction.md": "This chapter provides an overview of the Visual Basic language and its design goals.",
846850
"_vblang/spec/lexical-grammar.md": "This chapter defines the lexical grammar for Visual Basic.",
847851
"_vblang/spec/preprocessing-directives.md": "This chapter defines the preprocessing directives allowed in Visual Basic",
848852
"_vblang/spec/general-concepts.md": "This chapter describes the general concepts used in the Visual Basic language.",
@@ -900,7 +904,11 @@
900904
"docs/visual-basic/**/*.md": "Visual Basic"
901905
},
902906
"open_to_public_contributors": {
903-
"docs/standard/design-guidelines/**.md": false
907+
"docs/standard/design-guidelines/**.md": false,
908+
"_csharplang/**.md": false,
909+
"_csharpstandard/**.md": false,
910+
"_roslyn/**.md": false,
911+
"_vblang/**.md": false
904912
},
905913
"ms.collection": {
906914
"docs/ai/**/**.{md,yml}": "ce-skilling-ai-copilot"

docs/ai/quickstarts/generate-images.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Complete the following steps to create a .NET console app to connect to an AI mo
4747
4848
```bash
4949
dotnet add package Azure.AI.OpenAI
50+
dotnet add package Azure.Identity
5051
dotnet add package Microsoft.Extensions.Configuration
5152
dotnet add package Microsoft.Extensions.Configuration.UserSecrets
5253
```

docs/ai/quickstarts/snippets/assistants/AIAssistants.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1212
<PackageReference Include="Azure.Identity" Version="1.16.0" />
13-
<PackageReference Include="OpenAI" Version="2.4.0" />
13+
<PackageReference Include="OpenAI" Version="2.5.0" />
1414
</ItemGroup>
1515

1616
</Project>

docs/ai/quickstarts/snippets/image-generation/azure-openai/ImagesAzureOpenAI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Azure.Identity" Version="1.14.2" />
11+
<PackageReference Include="Azure.Identity" Version="1.16.0" />
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.7" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.7" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
1515

1616
</ItemGroup>
1717

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.FunctionalityPipelines/ConsoleAI.FunctionalityPipelines.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25451.107" />
12-
<PackageReference Include="OllamaSharp" Version="5.4.4" />
12+
<PackageReference Include="OllamaSharp" Version="5.4.6" />
1313
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
1414
</ItemGroup>
1515

0 commit comments

Comments
 (0)