Skip to content

Commit fcb85f2

Browse files
dotnet-policy-service[bot]dotnet-policy-service[bot]
authored
Merge pull request #48053 from dotnet/main
Merge main into live
2 parents 0f7e5cd + fc63e67 commit fcb85f2

File tree

52 files changed

+1054
-80
lines changed

Some content is hidden

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

52 files changed

+1054
-80
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@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
27+
uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2

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

‎docfx.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,10 @@
920920
"docs/csharp/specification/**/**.{md,yml}": "1825-days",
921921
"docs/framework/**/*.md": "3650-days",
922922
"docs/iot/**/**.{md,yml}": "1825-days",
923-
"docs/visual-basic/**/**.{md,yml}": "3650-days"
923+
"docs/visual-basic/**/**.{md,yml}": "3650-days",
924+
"docs/visual-basic/whats-new/**/**.{md,yml}": "1095-days",
925+
"docs/visual-basic/getting-started/**/**.{md,yml}": "1825-days",
926+
"docs/visual-basic/developing-apps/**/**.{md,yml}": "1825-days"
924927
},
925928
"no-loc": {
926929
"docs/orleans/**/**.md": [

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

1414
</Project>

‎docs/ai/snippets/microsoft-extensions-ai/AI.Shared/AI.Shared.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.7.1" />
11-
<PackageReference Include="System.Threading.RateLimiting" Version="10.0.0-preview.6.25358.103" />
10+
<PackageReference Include="Microsoft.Extensions.AI" Version="9.8.0" />
11+
<PackageReference Include="System.Threading.RateLimiting" Version="10.0.0-preview.7.25380.108" />
1212
</ItemGroup>
1313

1414
</Project>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CacheResponses/ConsoleAI.CacheResponses.csproj‎

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

1010
<ItemGroup>
11-
<PackageReference Include="OllamaSharp" Version="5.3.3" />
12-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25358.103" />
11+
<PackageReference Include="OllamaSharp" Version="5.3.5" />
12+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25380.108" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.ConsumeClientMiddleware/ConsoleAI.ConsumeClientMiddleware.csproj‎

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

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.6.25358.103" />
12-
<PackageReference Include="OllamaSharp" Version="5.3.4" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.7.25380.108" />
12+
<PackageReference Include="OllamaSharp" Version="5.3.5" />
1313
<ProjectReference Include="..\AI.Shared\AI.Shared.csproj" />
1414
</ItemGroup>
1515

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.ConsumeRateLimitingEmbedding/ConsoleAI.ConsumeRateLimitingEmbedding.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.5" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CreateEmbeddings/ConsoleAI.CreateEmbeddings.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.5" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CustomClientMiddle/ConsoleAI.CustomClientMiddle.csproj‎

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

1010
<ItemGroup>
11-
<PackageReference Include="OllamaSharp" Version="5.3.4" />
12-
<PackageReference Include="System.Threading.RateLimiting" Version="10.0.0-preview.6.25358.103" />
11+
<PackageReference Include="OllamaSharp" Version="5.3.5" />
12+
<PackageReference Include="System.Threading.RateLimiting" Version="10.0.0-preview.7.25380.108" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

0 commit comments

Comments
 (0)