Skip to content

Commit addfa4b

Browse files
Merge pull request #46990 from dotnet/main
Merge main into live
2 parents 134541b + 6284fa7 commit addfa4b

File tree

27 files changed

+52
-50
lines changed

27 files changed

+52
-50
lines changed

.github/prompts/breaking-change.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ When you're assigned an issue that's labeled "breaking-change", or when you're g
22

33
The document should be in Markdown format.
44

5-
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.
5+
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.
66

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

@@ -56,6 +56,6 @@ h2: Affected APIs
5656

5757
(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>".)
5858

59-
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).
59+
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).
6060

6161
Next, create a pull request. In the description, include the text "Fixes #\<issue-number>", where "issue-number" is the GitHub issue number.

docs/ai/how-to/snippets/content-filtering/AIContentFiltering.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="Azure.AI.OpenAI" />
12-
<PackageReference Include="Azure.Identity" Version="1.14.0" />
12+
<PackageReference Include="Azure.Identity" Version="1.14.1" />
1313
<PackageReference Include="Microsoft.Extensions.AI" Version="9.6.0" />
1414
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
1515
</ItemGroup>

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
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
12-
<PackageReference Include="Azure.Identity" Version="1.14.0" />
12+
<PackageReference Include="Azure.Identity" Version="1.14.1" />
1313
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
1414
<PackageReference Include="Microsoft.Extensions.AI" Version="9.6.0" />
1515
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />

docs/ai/quickstarts/snippets/build-chat-app/openai/ExtensionsOpenAI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.4" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />
1414
</ItemGroup>
1515

1616
</Project>

docs/ai/quickstarts/snippets/chat-with-data/azure-openai/VectorDataAI.csproj

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

1111
<ItemGroup>
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
13-
<PackageReference Include="Azure.Identity" Version="1.14.0" />
13+
<PackageReference Include="Azure.Identity" Version="1.14.1" />
1414
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
1515
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
1616
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />

docs/ai/quickstarts/snippets/function-calling/azure-openai/FunctionCallingAI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Azure.Identity" Version="1.14.0" />
12+
<PackageReference Include="Azure.Identity" Version="1.14.1" />
1313
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1414
<PackageReference Include="Microsoft.Extensions.AI" Version="9.6.0" />
1515
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />

docs/ai/quickstarts/snippets/local-ai/ollama.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="OllamaSharp" Version="5.2.2" />
11+
<PackageReference Include="OllamaSharp" Version="5.2.3" />
1212
</ItemGroup>
1313

1414
</Project>

docs/ai/quickstarts/snippets/mcp-server/MinimalMcpServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
1212
<PackageReference Include="ModelContextProtocol" Version="0.2.0-preview.3" />
1313
</ItemGroup>
1414

docs/ai/quickstarts/snippets/prompt-completion/openai/ExtensionsOpenAI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.5" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />
1414
</ItemGroup>
1515

1616
</Project>

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CustomEmbeddingsMiddle/ConsoleAI.CustomEmbeddingsMiddle.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-preview.5.25277.114" />
12-
<PackageReference Include="OllamaSharp" Version="5.1.19" />
12+
<PackageReference Include="OllamaSharp" Version="5.2.3" />
1313
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
1414
<ProjectReference Include="..\AI.Shared\AI.Shared.csproj" />
1515
</ItemGroup>

0 commit comments

Comments
 (0)