Skip to content

Commit 02b1e9c

Browse files
gewarrengewarren
committed
resolve merge conflict
2 parents 218ddb8 + 6b7617a commit 02b1e9c

File tree

1,390 files changed

+36639
-32600
lines changed

Some content is hidden

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

1,390 files changed

+36639
-32600
lines changed

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
- name: 'Checkout Repository'
2525
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2626
- name: 'Dependency Review'
27-
uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2
27+
uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3

‎.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@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.5
74+
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
7575
with:
7676
sarif_file: results.sarif

‎.openpublishing.redirection.framework.json‎

Lines changed: 3215 additions & 0 deletions
Large diffs are not rendered by default.

‎.openpublishing.redirection.visual-basic.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,6 +1286,11 @@
12861286
{
12871287
"source_path_from_root": "/docs/visual-basic/sample-applications.md",
12881288
"redirect_url": "/samples/browse/?languages=vb"
1289+
},
1290+
{
1291+
"source_path_from_root": "/docs/visual-basic/language-reference/functions/ctype-function.md",
1292+
"redirect_url": "/dotnet/visual-basic/language-reference/operators/ctype-operator",
1293+
"redirect_document_id": true
12891294
}
12901295
]
12911296
}

‎docfx.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,16 @@
918918
"docs/csharp/misc/**/**.{md,yml}": "3650-days",
919919
"docs/csharp/roslyn-sdk/**/**.{md,yml}": "1825-days",
920920
"docs/csharp/specification/**/**.{md,yml}": "1825-days",
921+
"docs/fsharp/**/**.{md,yml}": "1095-days",
922+
"docs/fsharp/whats-new/**/**.{md,yml}": "365-days",
923+
"docs/fsharp/tools/fsharp-interactive/**/**.{md,yml}": "1095-days",
924+
"docs/fsharp/scenarios/**/**.{md,yml}": "1095-days",
925+
"docs/fsharp/tutorials/**/**.{md,yml}": "1095-days",
926+
"docs/fsharp/tutorials/type-providers/**/**.{md,yml}": "1825-days",
927+
"docs/fsharp/language-reference/**/**.{md,yml}": "1825-days",
928+
"docs/fsharp/language-reference/compiler-messages/**/**.{md,yml}": "3650-days",
929+
"docs/fsharp/style-guide/**/**.{md,yml}": "1095-days",
930+
"docs/fsharp/get-started/**/**.{md,yml}": "1095-days",
921931
"docs/framework/**/*.md": "3650-days",
922932
"docs/iot/**/**.{md,yml}": "1825-days",
923933
"docs/visual-basic/**/**.{md,yml}": "3650-days",

‎docs/ai/index.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
description: Samples, tutorials, and education for building AI apps with .NET
99
ms.topic: landing-page
1010
ms.service: dotnet
11-
ms.date: 12/19/2024
11+
ms.date: 8/26/2025
1212
author: alexwolfmsft
1313
ms.author: alexwolf
1414

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
13-
<PackageReference Include="Azure.Identity" Version="1.14.2" />
14-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.7.1" />
15-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.7.0" />
16-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.7.0" />
13+
<PackageReference Include="Azure.Identity" Version="1.15.0" />
14+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.8.0" />
15+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.8.0" />
16+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.8.0" />
1717
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
1818
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
1919
<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.1" />
21+
<PackageReference Include="MSTest" Version="3.10.3" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎docs/ai/quickstarts/snippets/local-ai/ollama.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.5" />
11+
<PackageReference Include="OllamaSharp" Version="5.3.6" />
1212
</ItemGroup>
1313

1414
</Project>

‎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.3.4" />
11+
<PackageReference Include="OllamaSharp" Version="5.3.6" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CacheResponses/ConsoleAI.CacheResponses.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.5" />
11+
<PackageReference Include="OllamaSharp" Version="5.3.6" />
1212
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25380.108" />
1313
</ItemGroup>
1414

0 commit comments

Comments
 (0)