Skip to content

Commit 6d10b48

Browse files
BillWagnerBillWagner
authored
Merge pull request #55323 from dotnet/main
Merge main into live
2 parents 210f99d + a34f5ed commit 6d10b48

67 files changed

Lines changed: 670 additions & 425 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/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
persist-credentials: false
4242

4343
- name: "Run analysis"
44-
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
44+
uses: ossf/scorecard-action@2d1146689b8cda280b9bc96326124645441f03bc # v2.4.4
4545
with:
4646
results_file: results.sarif
4747
results_format: sarif

‎.openpublishing.redirection.core.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,6 +1759,10 @@
17591759
"source_path_from_root": "/docs/core/tools/csproj.md",
17601760
"redirect_url": "/dotnet/core/project-sdk/msbuild-props"
17611761
},
1762+
{
1763+
"source_path_from_root": "/docs/core/tools/custom-templates.md",
1764+
"redirect_url": "/dotnet/core/tools/templates"
1765+
},
17621766
{
17631767
"source_path_from_root": "/docs/core/tools/dotnet-add-package.md",
17641768
"redirect_url": "/dotnet/core/tools/dotnet-package-add"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<ItemGroup>
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1313
<PackageReference Include="Azure.Identity" Version="1.21.0" />
14-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.8.1" />
14+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.8.3" />
1515
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="10.8.0" />
1616
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="10.8.0" />
17-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="10.8.1" />
17+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="10.8.3" />
1818
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.10" />
1919
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.10" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
21-
<PackageReference Include="MSTest" Version="4.3.2" />
21+
<PackageReference Include="MSTest" Version="4.3.3" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

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

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

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.AI" Version="10.7.0" />
12-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="10.7.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
11+
<PackageReference Include="Microsoft.Extensions.AI" Version="10.8.3" />
12+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="10.8.3" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.10" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.10" />
1515
</ItemGroup>
1616

1717
</Project>

‎docs/ai/quickstarts/snippets/mcp-client/MinimalMCPClient.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<ItemGroup>
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.5" />
1212
<PackageReference Include="Azure.Identity" Version="1.21.0" />
13-
<PackageReference Include="Microsoft.Extensions.AI" Version="10.8.0" />
14-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="10.8.0" />
15-
<PackageReference Include="ModelContextProtocol" Version="1.4.1" />
13+
<PackageReference Include="Microsoft.Extensions.AI" Version="10.8.3" />
14+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="10.8.3" />
15+
<PackageReference Include="ModelContextProtocol" Version="2.0.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎docs/ai/snippets/microsoft-extensions-ai/AI.Shared/AI.Shared.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.AI" Version="10.8.1" />
10+
<PackageReference Include="Microsoft.Extensions.AI" Version="10.8.3" />
1111
<PackageReference Include="System.Threading.RateLimiting" Version="10.0.10" />
1212
</ItemGroup>
1313

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CustomEmbeddingsMiddle/ConsoleAI.CustomEmbeddingsMiddle.csproj‎

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

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.9" />
12-
<PackageReference Include="OllamaSharp" Version="5.4.25" />
13-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
11+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.10" />
12+
<PackageReference Include="OllamaSharp" Version="5.4.30" />
13+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.17.0" />
1414
<ProjectReference Include="..\AI.Shared\AI.Shared.csproj" />
1515
</ItemGroup>
1616

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.StatelessStateful/ConsoleAI.StatelessStateful.csproj‎

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

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.8.1" />
11+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.8.3" />
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="OllamaSharp" Version="5.4.27" />
15+
<PackageReference Include="OllamaSharp" Version="5.4.30" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.UseTelemetry/ConsoleAI.UseTelemetry.csproj‎

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

1010
<ItemGroup>
11-
<PackageReference Include="OllamaSharp" Version="5.4.25" />
12-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
11+
<PackageReference Include="OllamaSharp" Version="5.4.30" />
12+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.17.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎docs/ai/snippets/prompt-engineering/multi-turn-chat.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.8.0-beta.1" />
13-
<PackageReference Include="Microsoft.Agents.AI.OpenAI" Version="1.14.0" />
13+
<PackageReference Include="Microsoft.Agents.AI.OpenAI" Version="1.15.0" />
1414
<!--
1515
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
1616
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />

0 commit comments

Comments
 (0)