Skip to content

Commit 9f2befd

Browse files
Merge pull request #47879 from dotnet/main
Merge main into live
2 parents 22a5e36 + 0325c94 commit 9f2befd

File tree

51 files changed

+592
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+592
-293
lines changed

docfx.json

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,8 @@
534534
"_csharplang/proposals/csharp-11.0/*.md": "09/30/2022",
535535
"_csharplang/proposals/csharp-12.0/*.md": "08/15/2023",
536536
"_csharplang/proposals/csharp-13.0/*.md": "10/31/2024",
537-
"_csharplang/proposals/*.md": "06/19/2025",
537+
"_csharplang/proposals/csharp-14.0/*.md": "08/06/2025",
538+
"_csharplang/proposals/*.md": "08/06/2025",
538539
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "11/08/2022",
539540
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md": "11/08/2023",
540541
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md": "11/09/2024",
@@ -706,15 +707,15 @@
706707
"_csharplang/proposals/csharp-13.0/ref-struct-interfaces.md": "Allow ref struct types to implement some interfaces",
707708
"_csharplang/proposals/csharp-13.0/partial-properties.md": "All partial properties and indexers",
708709
"_csharplang/proposals/csharp-13.0/overload-resolution-priority.md": "Overload resolution priority tiebreaker attribute",
709-
"_csharplang/proposals/field-keyword.md": "The `field` contextual keyword",
710-
"_csharplang/proposals/unbound-generic-types-in-nameof.md": "Unbound generic types in `nameof`",
711-
"_csharplang/proposals/first-class-span-types.md": "First-class span types",
712-
"_csharplang/proposals/simple-lambda-parameters-with-modifiers.md": "Simple lambda parameters with modifiers",
713-
"_csharplang/proposals/partial-events-and-constructors.md": "Partial events and constructors",
714-
"_csharplang/proposals/null-conditional-assignment.md": "Null conditional assignment",
715-
"_csharplang/proposals/extensions.md": "Extension members",
716-
"_csharplang/proposals/user-defined-compound-assignment.md": "User-defined compound assignment",
717-
"_csharplang/proposals/ignored-directives.md": "Ignored preprocessor directives",
710+
"_csharplang/proposals/csharp-14.0/field-keyword.md": "The `field` contextual keyword",
711+
"_csharplang/proposals/csharp-14.0/unbound-generic-types-in-nameof.md": "Unbound generic types in `nameof`",
712+
"_csharplang/proposals/csharp-14.0/first-class-span-types.md": "First-class span types",
713+
"_csharplang/proposals/csharp-14.0/simple-lambda-parameters-with-modifiers.md": "Simple lambda parameters with modifiers",
714+
"_csharplang/proposals/csharp-14.0/partial-events-and-constructors.md": "Partial events and constructors",
715+
"_csharplang/proposals/csharp-14.0/null-conditional-assignment.md": "Null conditional assignment",
716+
"_csharplang/proposals/csharp-14.0/extensions.md": "Extension members",
717+
"_csharplang/proposals/csharp-14.0/user-defined-compound-assignment.md": "User-defined compound assignment",
718+
"_csharplang/proposals/csharp-14.0/ignored-directives.md": "Ignored preprocessor directives",
718719
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "C# compiler breaking changes since C# 10",
719720
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md": "C# compiler breaking changes since C# 11",
720721
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md": "C# compiler breaking changes since C# 12",
@@ -832,15 +833,15 @@
832833
"_csharplang/proposals/csharp-13.0/ref-struct-interfaces.md": "This proposal provides features that enable interface authors to allow `ref struct` types to implement a particular interface",
833834
"_csharplang/proposals/csharp-13.0/partial-properties.md": "This proposal provides for partial properties and indexers, allowing the definition of a property or indexer to be split across multiple parts.",
834835
"_csharplang/proposals/csharp-13.0/overload-resolution-priority.md": "This proposal introduces a new attribute, `OverloadResolutionPriorityAttribute`, that can be applied to methods to influence overload resolution.",
835-
"_csharplang/proposals/field-keyword.md": "This proposal introduces a new keyword, `field`, that accesses the compiler generated backing field in a property accessor.",
836-
"_csharplang/proposals/unbound-generic-types-in-nameof.md": "This proposal introduces the ability to use unbound generic types such as `List<>` in `nameof` expressions. The type argument isn't required.",
837-
"_csharplang/proposals/first-class-span-types.md": "This proposal provides several implicit conversions to `Span<T>` and `ReadOnlySpan<T>` that enable library authors to have fewer overloads and developers to write code that resolves to faster Span based APIs",
838-
"_csharplang/proposals/simple-lambda-parameters-with-modifiers.md": "This proposal allows lambda parameters to be declared with modifiers without requiring their type names. You can add modifiers like `ref` and `out` to lambda parameters without specifying their type.",
839-
"_csharplang/proposals/partial-events-and-constructors.md": "This proposal allows partial events and constructors to be declared in partial classes. The event and constructor can be split across class declarations.",
840-
"_csharplang/proposals/null-conditional-assignment.md": "This proposal allows the null conditional operator to be used for the destination of assignment expressions. This allows you to assign a value to a property or field only if the left side is not null.",
841-
"_csharplang/proposals/extensions.md": "This proposal enables new kinds of extension members. These new extension members support extension properties, extension static members, including extension operators.",
842-
"_csharplang/proposals/user-defined-compound-assignment.md": "This proposal introduces user-defined compound assignment operators. Developers can override compound assignment, increment, and decrement operators.",
843-
"_csharplang/proposals/ignored-directives.md": "This proposal allows a source file to include ignored directives. In most cases, ignored directives are used for file based programs, for example `#!`",
836+
"_csharplang/proposals/csharp-14.0/field-keyword.md": "This proposal introduces a new keyword, `field`, that accesses the compiler generated backing field in a property accessor.",
837+
"_csharplang/proposals/csharp-14.0/unbound-generic-types-in-nameof.md": "This proposal introduces the ability to use unbound generic types such as `List<>` in `nameof` expressions. The type argument isn't required.",
838+
"_csharplang/proposals/csharp-14.0/first-class-span-types.md": "This proposal provides several implicit conversions to `Span<T>` and `ReadOnlySpan<T>` that enable library authors to have fewer overloads and developers to write code that resolves to faster Span based APIs",
839+
"_csharplang/proposals/csharp-14.0/simple-lambda-parameters-with-modifiers.md": "This proposal allows lambda parameters to be declared with modifiers without requiring their type names. You can add modifiers like `ref` and `out` to lambda parameters without specifying their type.",
840+
"_csharplang/proposals/csharp-14.0/partial-events-and-constructors.md": "This proposal allows partial events and constructors to be declared in partial classes. The event and constructor can be split across class declarations.",
841+
"_csharplang/proposals/csharp-14.0/null-conditional-assignment.md": "This proposal allows the null conditional operator to be used for the destination of assignment expressions. This allows you to assign a value to a property or field only if the left side is not null.",
842+
"_csharplang/proposals/csharp-14.0/extensions.md": "This proposal enables new kinds of extension members. These new extension members support extension properties, extension static members, including extension operators.",
843+
"_csharplang/proposals/csharp-14.0/user-defined-compound-assignment.md": "This proposal introduces user-defined compound assignment operators. Developers can override compound assignment, increment, and decrement operators.",
844+
"_csharplang/proposals/csharp-14.0/ignored-directives.md": "This proposal allows a source file to include ignored directives. In most cases, ignored directives are used for file based programs, for example `#!`",
844845
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md": "Learn about any breaking changes since the initial release of C# 10 and included in C# 11",
845846
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 8.md": "Learn about any breaking changes since the initial release of C# 11 and included in C# 12",
846847
"_roslyn/docs/compilers/CSharp/Compiler Breaking Changes - DotNet 9.md": "Learn about any breaking changes since the initial release of C# 12 and included in C# 13",
@@ -868,6 +869,7 @@
868869
"_csharplang/proposals/csharp-11.0/*.md": "C# feature specifications",
869870
"_csharplang/proposals/csharp-12.0/*.md": "C# feature specifications",
870871
"_csharplang/proposals/csharp-13.0/*.md": "C# feature specifications",
872+
"_csharplang/proposals/csharp-14.0/*.md": "C# feature specifications",
871873
"_csharplang/proposals/*.md": "C# feature specifications (preview)",
872874
"docs/framework/**/*.md": ".NET Framework",
873875
"docs/framework/data/adonet/**/*.md": "ADO.NET",

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
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1212
<PackageReference Include="Azure.Identity" Version="1.14.2" />
13-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.7" />
13+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8" />
1414
<PackageReference Include="Microsoft.Extensions.AI" Version="9.7.1" />
1515
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
1616
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.12.0" />

docs/ai/quickstarts/snippets/assistants/AIAssistants.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1212
<PackageReference Include="Azure.Identity" Version="1.14.2" />
13-
<PackageReference Include="OpenAI" Version="2.2.0" />
13+
<PackageReference Include="OpenAI" Version="2.3.0" />
1414
</ItemGroup>
1515

1616
</Project>

docs/ai/quickstarts/snippets/evaluate-ai-responses/TestAI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.7.0" />
1616
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.7.0" />
1717
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.7" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.7" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.8" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
21-
<PackageReference Include="MSTest" Version="3.10.0" />
21+
<PackageReference Include="MSTest" Version="3.10.1" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

docs/ai/quickstarts/snippets/prompt-completion/azure-openai/ExtensionsAzureOpenAI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<PackageReference Include="Azure.Identity" Version="1.14.2" />
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1313
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.7" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.7" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.8" />
1616

1717
</ItemGroup>
1818

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.DependencyInjection/ConsoleAI.DependencyInjection.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.3.3" />
11+
<PackageReference Include="OllamaSharp" Version="5.3.4" />
1212
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.6.25358.103" />
1313
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25358.103" />
1414
<ProjectReference Include="..\AI.Shared\AI.Shared.csproj" />

docs/azure/migration/appmod/overview.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ When code changes are needed, the tool guides you through remediation using pred
4545

4646
For more information, see [Predefined tasks](predefined-tasks.md).
4747

48+
### Upgrading .NET projects
49+
50+
Upgrading .NET apps is a common task that requires substantial time and resources. GitHub Copilot App Modernization - upgrade for .NET provides an AI-based solution designed to assist with updating your .NET apps. For more information, see [GitHub Copilot App Modernization - upgrade for .NET](../../../core/porting/github-copilot-app-modernization-overview.md).
51+
4852
## Common use cases
4953

5054
App Modernization for .NET (Preview) supports the following scenarios:

0 commit comments

Comments
 (0)