Skip to content

Commit fae7c3d

Browse files
gewarrengewarren
authored
Merge pull request #51037 from dotnet/main
Merge main into live
2 parents 6e20592 + d0e5154 commit fae7c3d

369 files changed

Lines changed: 3754 additions & 2061 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/agents/breakingchange.agent.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,22 @@ Start with this header (replace placeholders):
1616

1717
```
1818
---
19-
title: "Breaking change - <Concise descriptive title>"
19+
title: "Breaking change: <Concise descriptive title>"
2020
description: "Learn about the breaking change in <product/version without preview> where <brief description>."
2121
ms.date: <Today's date in MM/DD/YYYY format>
2222
ai-usage: ai-assisted
2323
---
2424
```
2525

26-
> **Note:** Use today's date in the format MM/DD/YYYY. This date cannot be earlier than 11/12/2025.
26+
> **Note:**
27+
> - Use today's date in the format MM/DD/YYYY. This date cannot be earlier than 01/12/2026.
28+
> - Do NOT include ms.custom metadata with an issue number.
2729
2830
Then, include these sections in this order:
2931

3032
### 1. H1 Title
3133

32-
- Use the header title, but remove "Breaking change - ".
34+
- Use the header title, but remove "Breaking change: ".
3335

3436
**Intro paragraph:**
3537
Summarize the breaking change.

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
74+
uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3.29.5
7575
with:
7676
sarif_file: results.sarif

‎.github/workflows/snippets5000.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# Get the latest preview SDK (or sdk not installed by the runner)
4242
- name: Setup .NET
4343
if: ${{ env.DOTNET_DO_INSTALL == 'true' }}
44-
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 #@5.0.1
44+
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 #@5.1.0
4545
with:
4646
dotnet-version: ${{ env.DOTNET_VERSION }}
4747
dotnet-quality: ${{ env.DOTNET_QUALITY }}

‎.openpublishing.redirection.fundamentals.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,10 @@
237237
"source_path_from_root": "/docs/fundamentals/productivity/configure-code-analysis-rules.md",
238238
"redirect_url": "/dotnet/fundamentals/code-analysis/configuration-options"
239239
},
240+
{
241+
"source_path_from_root": "/docs/fundamentals/reflection/reflection.md",
242+
"redirect_url": "/dotnet/fundamentals/reflection/overview"
243+
},
240244
{
241245
"source_path_from_root": "/docs/fundamentals/runtime-libraries/system-data-linq-dataloadoptions.md",
242246
"redirect_url": "/dotnet/framework/data/adonet/sql/linq/"

‎docfx.json‎

Lines changed: 296 additions & 300 deletions
Large diffs are not rendered by default.

‎docs/ai/evaluation/snippets/evaluate-safety/EvaluateResponseSafety.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<ItemGroup>
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1313
<PackageReference Include="Azure.Identity" Version="1.17.1" />
14-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.1.1" />
15-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="10.1.0" />
16-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="10.1.0" />
14+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.2.0" />
15+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="10.2.0" />
16+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="10.2.0" />
1717
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Safety" Version="9.5.0-preview.1.25265.7" />
1818
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2222
<PackageReference Include="MSTest" Version="4.0.2" />
2323
</ItemGroup>

‎docs/ai/evaluation/snippets/evaluate-with-reporting/TestAIWithReporting.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<ItemGroup>
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1313
<PackageReference Include="Azure.Identity" Version="1.17.1" />
14-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.1.1" />
15-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="10.1.0" />
16-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="10.1.0" />
17-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="10.1.0" />
14+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.2.0" />
15+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="10.2.0" />
16+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="10.2.0" />
17+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="10.2.0" />
1818
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.3-preview.1.25230.7" />
19-
<PackageReference Include="microsoft.extensions.configuration" Version="10.0.1" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
19+
<PackageReference Include="microsoft.extensions.configuration" Version="10.0.2" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2222
<PackageReference Include="MSTest" Version="4.0.2" />
2323
</ItemGroup>

‎docs/ai/how-to/snippets/hosted-app-auth/hosted-app-auth.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<ItemGroup>
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1212
<PackageReference Include="Azure.Identity" Version="1.17.1" />
13-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.11" />
14-
<PackageReference Include="Microsoft.Extensions.AI" Version="10.1.1" />
13+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.12" />
14+
<PackageReference Include="Microsoft.Extensions.AI" Version="10.2.0" />
1515
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
1616
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.13.1" />
1717
</ItemGroup>

‎docs/ai/includes/sk-connectors.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
author: alexwolfmsft
3-
ms.author: alexwolf
42
ms.date: 07/29/2024
53
ms.topic: include
64
---

‎docs/ai/media/build-mcp-server/add-custom-mcp-server-http.png‎

42.2 KB
Loading

0 commit comments

Comments
 (0)