Skip to content

Merge main into live #46990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Jun 26, 2025
Merged

Merge main into live #46990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
59c9c81
Bump the dotnet group with 3 updates (#46948)
dependabot[bot] Jun 25, 2025
de63427
Bump the dotnet group with 1 update (#46947)
dependabot[bot] Jun 25, 2025
5966695
Bump the dotnet group with 1 update (#46950)
dependabot[bot] Jun 25, 2025
4cf64e5
Bump the dotnet group with 1 update (#46955)
dependabot[bot] Jun 25, 2025
7d71d84
Bump the dotnet group with 2 updates (#46954)
dependabot[bot] Jun 25, 2025
59f31a8
Bump the dotnet group with 2 updates (#46960)
dependabot[bot] Jun 25, 2025
7f48d8b
Bump the dotnet group with 1 update (#46961)
dependabot[bot] Jun 25, 2025
0011539
Bump the dotnet group with 1 update (#46967)
dependabot[bot] Jun 25, 2025
96a80f3
Bump the dotnet group with 1 update (#46968)
dependabot[bot] Jun 25, 2025
4cde33b
Bump the dotnet group with 2 updates (#46966)
dependabot[bot] Jun 25, 2025
3df318e
Bump the dotnet group with 1 update (#46970)
dependabot[bot] Jun 25, 2025
bcc4b5a
Bump the dotnet group with 1 update (#46971)
dependabot[bot] Jun 25, 2025
81d1e28
Bump the dotnet group with 2 updates (#46972)
dependabot[bot] Jun 25, 2025
411b163
Bump the dotnet group with 1 update (#46973)
dependabot[bot] Jun 25, 2025
8824b97
Bump the dotnet group with 1 update (#46974)
dependabot[bot] Jun 25, 2025
fe4cb68
Bump the dotnet group with 1 update (#46975)
dependabot[bot] Jun 25, 2025
9576ff7
Update TOC guidance (#46946)
gewarren Jun 25, 2025
bdbabfc
Bump the dotnet group with 2 updates (#46976)
dependabot[bot] Jun 25, 2025
6691b72
Fix left outer join - null reference exception issue (#46939)
valentincpopa Jun 25, 2025
94462ac
Bump the dotnet group with 1 update (#46980)
dependabot[bot] Jun 25, 2025
e216017
Bump the dotnet group with 1 update (#46981)
dependabot[bot] Jun 25, 2025
52917e9
Bump the dotnet group with 1 update (#46982)
dependabot[bot] Jun 25, 2025
4de8527
Bump the dotnet group with 2 updates (#46983)
dependabot[bot] Jun 25, 2025
417fb18
Bump the dotnet group with 1 update (#46985)
dependabot[bot] Jun 25, 2025
e33dc2a
Bump the dotnet group with 1 update (#46984)
dependabot[bot] Jun 25, 2025
6284fa7
Update package index with latest published versions (#46986)
azure-sdk Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/prompts/breaking-change.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ When you're assigned an issue that's labeled "breaking-change", or when you're g

The document should be in Markdown format.

Ignore all breaking change documentation under https://github.com/dotnet/docs/tree/main/docs/framework/migration-guide - that is for legacy .NET Framework breaking changes. Modern .NET breaking changes live in the https://github.com/dotnet/docs/tree/main/docs/core/compatibility folder and its subfolders.
Ignore all breaking change documentation under https://github.com/dotnet/docs/tree/main/docs/framework/migration-guide - that's for legacy .NET Framework breaking changes. Modern .NET breaking changes live in the https://github.com/dotnet/docs/tree/main/docs/core/compatibility folder and its subfolders.

Rephrase all content to be clear and concise, if necessary.

Expand Down Expand Up @@ -56,6 +56,6 @@ h2: Affected APIs

(A bullet list of APIs that are affected by the change. If there are no affected APIs (or "No response") write "None.". Use xref-style links as described in the copilot-instructions.md file. At the end of each doc ID, add "?displayProperty=fullName", for example "<xref:System.String?displayProperty=fullName>".)

Then, add the new document to both the "By area" and "By version" sections of the TOC file located at https://github.com/dotnet/docs/blob/main/docs/core/compatibility/toc.yml. Also add an entry to the index file under the appropriate area H2 heading in the https://github.com/dotnet/docs/blob/main/docs/core/compatibility/10.0.md file by adding a row to the table (create a new heading/table if it doesn't exist yet).
Then, add the new document to the TOC file located at https://github.com/dotnet/docs/blob/main/docs/core/compatibility/toc.yml. Also add an entry to the index file under the appropriate area H2 heading in the https://github.com/dotnet/docs/blob/main/docs/core/compatibility/10.0.md file by adding a row to the table (create a new heading/table if it doesn't exist yet).

Next, create a pull request. In the description, include the text "Fixes #\<issue-number>", where "issue-number" is the GitHub issue number.
2 changes: 1 addition & 1 deletion docs/ai/how-to/snippets/content-filtering/AIContentFiltering.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" />
<PackageReference Include="Azure.Identity" Version="1.14.0" />
<PackageReference Include="Azure.Identity" Version="1.14.1" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.6.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion docs/ai/how-to/snippets/hosted-app-auth/hosted-app-auth.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Azure.Identity" Version="1.14.0" />
<PackageReference Include="Azure.Identity" Version="1.14.1" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.6.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
Expand Down
4 changes: 2 additions & 2 deletions docs/ai/quickstarts/snippets/build-chat-app/openai/ExtensionsOpenAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion docs/ai/quickstarts/snippets/chat-with-data/azure-openai/VectorDataAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Azure.Identity" Version="1.14.0" />
<PackageReference Include="Azure.Identity" Version="1.14.1" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />
Expand Down
2 changes: 1 addition & 1 deletion docs/ai/quickstarts/snippets/function-calling/azure-openai/FunctionCallingAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.14.0" />
<PackageReference Include="Azure.Identity" Version="1.14.1" />
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.6.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
Expand Down
2 changes: 1 addition & 1 deletion docs/ai/quickstarts/snippets/local-ai/ollama.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OllamaSharp" Version="5.2.2" />
<PackageReference Include="OllamaSharp" Version="5.2.3" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion docs/ai/quickstarts/snippets/mcp-server/MinimalMcpServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
<PackageReference Include="ModelContextProtocol" Version="0.2.0-preview.3" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions docs/ai/quickstarts/snippets/prompt-completion/openai/ExtensionsOpenAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...ft-extensions-ai/ConsoleAI.CustomEmbeddingsMiddle/ConsoleAI.CustomEmbeddingsMiddle.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.5.25277.114" />
<PackageReference Include="OllamaSharp" Version="5.1.19" />
<PackageReference Include="OllamaSharp" Version="5.2.3" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
<ProjectReference Include="..\AI.Shared\AI.Shared.csproj" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ft-extensions-ai/ConsoleAI.FunctionalityPipelines/ConsoleAI.FunctionalityPipelines.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.5.25277.114" />
<PackageReference Include="OllamaSharp" Version="5.2.2" />
<PackageReference Include="OllamaSharp" Version="5.2.3" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.ToolCalling/ConsoleAI.ToolCalling.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OllamaSharp" Version="5.2.2" />
<PackageReference Include="OllamaSharp" Version="5.2.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../ai/snippets/microsoft-extensions-ai/ConsoleAI.UseTelemetry/ConsoleAI.UseTelemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OllamaSharp" Version="5.1.19" />
<PackageReference Include="OllamaSharp" Version="5.2.3" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion docs/ai/snippets/microsoft-extensions-ai/ConsoleAI/ConsoleAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.AI" Version="9.6.0" />
<PackageReference Include="OllamaSharp" Version="5.1.19" />
<PackageReference Include="OllamaSharp" Version="5.2.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions docs/ai/tutorials/snippets/evaluate-safety/EvaluateResponseSafety.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Azure.Identity" Version="1.14.0" />
<PackageReference Include="Azure.Identity" Version="1.14.1" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.6.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.6.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="9.6.0" />
Expand All @@ -19,7 +19,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="MSTest" Version="3.9.2" />
<PackageReference Include="MSTest" Version="3.9.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions docs/ai/tutorials/snippets/evaluate-with-reporting/TestAIWithReporting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Azure.Identity" Version="1.14.0" />
<PackageReference Include="Azure.Identity" Version="1.14.1" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.6.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.6.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.6.0" />
Expand All @@ -19,7 +19,7 @@
<PackageReference Include="microsoft.extensions.configuration" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="MSTest" Version="3.9.2" />
<PackageReference Include="MSTest" Version="3.9.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading