Skip to content

Merge main into live #48542

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 15 commits into from
Sep 16, 2025
Merged

Merge main into live #48542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1ce00b0
.NET dependabot-bot automated PR. (#48490)
github-actions[bot] Sep 15, 2025
56aa30f
Bump the dotnet group with 3 updates (#48498)
dependabot[bot] Sep 15, 2025
9044916
Bump the dotnet group with 1 update (#48499)
dependabot[bot] Sep 15, 2025
2fcd583
Bump the dotnet group with 2 updates (#48507)
dependabot[bot] Sep 15, 2025
7e06705
Bump the dotnet group with 2 updates (#48509)
dependabot[bot] Sep 15, 2025
fdd505c
Bump the dotnet group with 2 updates (#48515)
dependabot[bot] Sep 15, 2025
d7ded94
Bump the dotnet group with 2 updates (#48505)
dependabot[bot] Sep 15, 2025
f55612a
Bump github/codeql-action from 3.30.2 to 3.30.3 (#48508)
dependabot[bot] Sep 15, 2025
59fa26d
Bump the dotnet group with 2 updates (#48534)
dependabot[bot] Sep 15, 2025
fa7b02b
Bump the dotnet group with 2 updates (#48535)
dependabot[bot] Sep 15, 2025
0d1ea6b
Bump the dotnet group with 1 update (#48533)
dependabot[bot] Sep 15, 2025
a8000fd
Bump the dotnet group with 1 update (#48536)
dependabot[bot] Sep 15, 2025
db791c1
Bump the dotnet group with 4 updates (#48526)
dependabot[bot] Sep 15, 2025
dd18a4e
Bump the dotnet group with 3 updates (#48527)
dependabot[bot] Sep 15, 2025
4f14f88
Make car2 a type of Car instead of ConvertibleCar (#48495)
BartoszKlonowski Sep 15, 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
60 changes: 30 additions & 30 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/how-to/snippets/content-filtering" #AIContentFiltering.csproj
directory: "/docs/ai/evaluation/snippets/evaluate-ai-responses" #TestAI.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -790,7 +790,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/how-to/snippets/hosted-app-auth" #hosted-app-auth.csproj
directory: "/docs/ai/evaluation/snippets/evaluate-safety" #EvaluateResponseSafety.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -801,7 +801,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/quickstarts/snippets/assistants" #AIAssistants.csproj
directory: "/docs/ai/evaluation/snippets/evaluate-with-reporting" #TestAIWithReporting.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -812,7 +812,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/quickstarts/snippets/build-chat-app/azure-openai" #ChatAppAI.csproj
directory: "/docs/ai/how-to/snippets/content-filtering" #AIContentFiltering.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -823,7 +823,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/quickstarts/snippets/build-chat-app/openai" #ExtensionsOpenAI.csproj
directory: "/docs/ai/how-to/snippets/hosted-app-auth" #hosted-app-auth.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -834,7 +834,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/quickstarts/snippets/chat-with-data/azure-openai" #VectorDataAI.csproj
directory: "/docs/ai/quickstarts/snippets/assistants" #AIAssistants.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -845,7 +845,29 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/quickstarts/snippets/chat-with-data/openai" #VectorDataAI.csproj
directory: "/docs/ai/quickstarts/snippets/build-chat-app/azure-openai" #ChatAppAI.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/quickstarts/snippets/build-chat-app/openai" #ExtensionsOpenAI.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/quickstarts/snippets/chat-with-data/azure-openai" #VectorDataAI.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -856,7 +878,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/quickstarts/snippets/evaluate-ai-responses" #TestAI.csproj
directory: "/docs/ai/quickstarts/snippets/chat-with-data/openai" #VectorDataAI.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand Down Expand Up @@ -1174,28 +1196,6 @@ updates:
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/tutorials/snippets/evaluate-safety" #EvaluateResponseSafety.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/ai/tutorials/snippets/evaluate-with-reporting" #TestAIWithReporting.csproj
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 5
groups:
# Group .NET updates together for projects.
dotnet:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/azure/sdk/snippets/aspnetcore-guidance/BlazorSample" #BlazorSample.csproj
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.29.5
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion docs/ai/advanced/snippets/sample-implementations/Implementations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.7.1" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.9.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions 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,8 +9,8 @@

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Azure.Identity" Version="1.14.2" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.7.1" />
<PackageReference Include="Azure.Identity" Version="1.16.0" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions docs/ai/quickstarts/snippets/chat-with-data/openai/VectorDataAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" Version="9.7.0" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.55.0-preview" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions docs/ai/quickstarts/snippets/function-calling/openai/FunctionCallingAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.AI" Version="9.7.1" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0-preview.6.25358.103" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0-preview.6.25358.103" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions docs/ai/quickstarts/snippets/prompt-completion/azure-openai/ExtensionsAzureOpenAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.14.2" />
<PackageReference Include="Azure.Identity" Version="1.16.0" />
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />

</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions docs/ai/quickstarts/snippets/structured-output/SOChat.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Azure.Identity" Version="1.14.2" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.7.1" />
<PackageReference Include="Azure.Identity" Version="1.16.0" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion .../microsoft-extensions-ai/ConsoleAI.CustomClientMiddle/ConsoleAI.CustomClientMiddle.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.3.6" />
<PackageReference Include="OllamaSharp" Version="5.4.2" />
<PackageReference Include="System.Threading.RateLimiting" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.AI" Version="9.8.0" />
<PackageReference Include="OllamaSharp" Version="5.3.6" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.9.0" />
<PackageReference Include="OllamaSharp" Version="5.4.2" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions docs/core/extensions/snippets/caching/distributed/distributed-apis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion docs/core/extensions/snippets/di/di-basics/di-basics.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.DependencyInjection" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions docs/core/extensions/snippets/http/named/named.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ming-guide/classes-and-structs/knowing-when-to-use-override-and-new-keywords.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public static void TestCars1()
// used in the definition of ShowDetails in the ConvertibleCar
// class.

ConvertibleCar car2 = new ConvertibleCar();
Car car2 = new ConvertibleCar();
car2.DescribeCar();
System.Console.WriteLine("----------");

Expand Down
4 changes: 2 additions & 2 deletions docs/orleans/grains/snippets/transactions/Abstractions/Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="9.2.1" />
<PackageReference Include="Microsoft.Orleans.Sdk" Version="9.2.1" />
<PackageReference Include="Microsoft.Orleans.Transactions" Version="9.2.1" />
Expand Down
4 changes: 2 additions & 2 deletions docs/orleans/grains/snippets/transactions/Client/Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions docs/orleans/grains/snippets/transactions/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
<PackageReference Include="Microsoft.Orleans.Server" Version="9.2.1" />
<PackageReference Include="Microsoft.Orleans.Transactions.AzureStorage" Version="9.2.1" />
</ItemGroup>
Expand Down
Loading