Skip to content

Commit 94eb556

Browse files
Merge pull request #50865 from dotnet/main
Merge main into live
2 parents 91bc4a8 + 2deb693 commit 94eb556

8 files changed

Lines changed: 18 additions & 18 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
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.0" />
14+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.1.1" />
1515
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="10.1.0" />
1616
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="10.1.0" />
1717
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="10.1.0" />

docs/ai/quickstarts/snippets/mcp-client/MinimalMCPClient.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.2.0-beta.5" />
1212
<PackageReference Include="Azure.Identity" Version="1.17.1" />
13-
<PackageReference Include="Microsoft.Extensions.AI" Version="10.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.AI" Version="10.1.1" />
1414
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.3-preview.1.25230.7" />
1515
<PackageReference Include="ModelContextProtocol" Version="0.1.0-preview.14" />
1616
</ItemGroup>

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

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

1010
<ItemGroup>
11-
<PackageReference Include="Azure.Identity" Version="1.17.0" />
11+
<PackageReference Include="Azure.Identity" Version="1.17.1" />
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.10" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.10" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
1616

1717
</ItemGroup>
1818

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.AddMessages/ConsoleAI.AddMessages.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.4.8" />
11+
<PackageReference Include="OllamaSharp" Version="5.4.12" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

docs/core/extensions/snippets/hosts/ShortLived.App/ShortLived.App.csproj

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

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
1212
</ItemGroup>
1313
</Project>

docs/csharp/language-reference/operators/default.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ f1_keywords:
77
helpviewer_keywords:
88
- "default keyword [C#]"
99
---
10-
# default value expressions - produce the default value
10+
# Default value expressions - produce the default value
1111

12-
A default value expression produces the [default value](../builtin-types/default-values.md) of a type. There are two kinds of default value expressions: the [default operator](#default-operator) call and a [default literal](#default-literal).
12+
A default value expression produces the [default value](../builtin-types/default-values.md) of a type. There are two kinds of default value expressions: the [`default` operator](#default-operator) call and a [`default` literal](#default-literal).
1313

1414
You also use the `default` keyword as the default case label within a [`switch` statement](../statements/selection-statements.md#the-switch-statement).
1515

16-
## default operator
16+
## `default` operator
1717

1818
The argument to the `default` operator must be the name of a type or a type parameter, as the following example shows:
1919

2020
[!code-csharp[default of T](snippets/shared/DefaultOperator.cs#WithOperand)]
2121

22-
## default literal
22+
## `default` literal
2323

2424
You can use the `default` literal to produce the default value of a type when the compiler can infer the expression type. The `default` literal expression produces the same value as the `default(T)` expression where `T` is the inferred type. You can use the `default` literal in any of the following cases:
2525

docs/csharp/language-reference/toc.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ items:
165165
items:
166166
- name: "null"
167167
href: ./keywords/null.md
168-
- name: "true and false"
168+
- name: true and false
169169
href: ./builtin-types/bool.md
170170
- name: default
171171
href: ./keywords/default.md
@@ -220,7 +220,7 @@ items:
220220
href: ./keywords/ascending.md
221221
- name: descending
222222
href: ./keywords/descending.md
223-
- name: "on"
223+
- name: on
224224
href: ./keywords/on.md
225225
- name: equals
226226
href: ./keywords/equals.md
@@ -272,7 +272,7 @@ items:
272272
- name: Patterns
273273
href: ./operators/patterns.md
274274
displayName: pattern matching, and keyword, or keyword, not keyword, pattern reference
275-
- name: + and += operators
275+
- name: "+ and += operators"
276276
href: ./operators/addition-operator.md
277277
displayName: string concatenation, delegate combination, event subscription
278278
- name: "- and -= operators"
@@ -296,7 +296,7 @@ items:
296296
- name: await operator
297297
href: ./operators/await.md
298298
displayName: async
299-
- name: default value expressions
299+
- name: Default value expressions
300300
href: ./operators/default.md
301301
displayName: default value, default operator, default literal, type default
302302
- name: delegate operator
@@ -524,7 +524,7 @@ items:
524524
CS0080, CS0081, CS0224, CS0304, CS0305, CS0306, CS0307, CS0308, CS0310, CS0311,
525525
CS0312, CS0313, CS0314, CS0315, CS0403, CS0412, CS0413, CS0417, CS0694, CS0695,
526526
CS0698, CS9338
527-
- name: asynchronous methods
527+
- name: Asynchronous methods
528528
href: ./compiler-messages/async-await-errors.md
529529
displayName: >
530530
async, await,
@@ -554,7 +554,7 @@ items:
554554
CS8166, CS8167, CS8168, CS8169, CS8345, CS8351, CS8374, CS9075, CS9076, CS9077,
555555
CS9078, CS9079, CS9080, CS9081, CS9082, CS9083, CS9084, CS9085, CS9086, CS9087,
556556
CS9088, CS9089, CS9090, CS9091, CS9092, CS9093, CS9094, CS9095, CS9096, CS9097
557-
- name: "`ref struct` types"
557+
- name: ref struct types
558558
href: ./compiler-messages/ref-struct-errors.md
559559
displayName: >
560560
ref struct,

samples/snippets/core/testing/unit-testing-using-nunit/csharp/PrimeService.Tests/PrimeService.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<!--<snippetPackages>-->
1111
<ItemGroup>
1212
<PackageReference Include="nunit" Version="4.4.0" />
13-
<PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="6.0.1" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1515
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">
1616
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)