Skip to content

Commit c63fee3

Browse files
Merge pull request #43352 from dotnet/main
Merge main into live
2 parents f9b6b3b + 074f71a commit c63fee3

File tree

51 files changed

+538
-312
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

+538
-312
lines changed

.github/dependabot.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,6 @@ updates:
129129
dotnet:
130130
patterns:
131131
- "*" # Prefer a single PR per solution update.
132-
- package-ecosystem: "nuget"
133-
directory: "/docs/csharp/roslyn-sdk/snippets/source-generators" #source-generators.sln
134-
schedule:
135-
interval: "weekly"
136-
day: "wednesday"
137-
open-pull-requests-limit: 5
138-
groups:
139-
# Group .NET updates together for solutions.
140-
dotnet:
141-
patterns:
142-
- "*" # Prefer a single PR per solution update.
143132
- package-ecosystem: "nuget"
144133
directory: "/docs/csharp/roslyn-sdk/tutorials/snippets/how-to-write-csharp-analyzer-code-fix" #MakeConst.sln
145134
schedule:
@@ -789,6 +778,17 @@ updates:
789778
dotnet:
790779
patterns:
791780
- "*" # Prefer a single PR per project update.
781+
- package-ecosystem: "nuget"
782+
directory: "/docs/ai/quickstarts/snippets/local-ai" #ollama.csproj
783+
schedule:
784+
interval: "weekly"
785+
day: "wednesday"
786+
open-pull-requests-limit: 5
787+
groups:
788+
# Group .NET updates together for projects.
789+
dotnet:
790+
patterns:
791+
- "*" # Prefer a single PR per project update.
792792
- package-ecosystem: "nuget"
793793
directory: "/docs/ai/tutorials/snippets/llm-eval" #llm-eval.csproj
794794
schedule:
@@ -1856,17 +1856,6 @@ updates:
18561856
dotnet:
18571857
patterns:
18581858
- "*" # Prefer a single PR per project update.
1859-
- package-ecosystem: "nuget"
1860-
directory: "/docs/csharp/roslyn-sdk/snippets/source-generators/SourceGenerator" #SourceGenerator.csproj
1861-
schedule:
1862-
interval: "weekly"
1863-
day: "wednesday"
1864-
open-pull-requests-limit: 5
1865-
groups:
1866-
# Group .NET updates together for projects.
1867-
dotnet:
1868-
patterns:
1869-
- "*" # Prefer a single PR per project update.
18701859
- package-ecosystem: "nuget"
18711860
directory: "/docs/csharp/roslyn-sdk/tutorials/snippets/how-to-write-csharp-analyzer-code-fix/MakeConst/MakeConst.CodeFixes" #MakeConst.CodeFixes.csproj
18721861
schedule:
@@ -2197,3 +2186,14 @@ updates:
21972186
dotnet:
21982187
patterns:
21992188
- "*" # Prefer a single PR per project update.
2189+
- package-ecosystem: "nuget"
2190+
directory: "/docs/orleans/deployment/snippets/service-fabric/stateless" #Orleans.ServiceFabric.Stateless.csproj
2191+
schedule:
2192+
interval: "weekly"
2193+
day: "wednesday"
2194+
open-pull-requests-limit: 5
2195+
groups:
2196+
# Group .NET updates together for projects.
2197+
dotnet:
2198+
patterns:
2199+
- "*" # Prefer a single PR per project update.

.github/policies/policy-edits.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ configuration:
3131
user: dependabot[bot]
3232
- isActivitySender:
3333
user: dotnet-policy-service[bot]
34+
- isActivitySender:
35+
user: github-actions[bot]
3436
then:
3537
- addReply:
3638
reply: >-

.openpublishing.redirection.core.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,6 @@
338338
"redirect_url": "/dotnet/core/compatibility/sdk/5.0/sdk-and-target-framework-change",
339339
"redirect_document_id": true
340340
},
341-
{
342-
"source_path_from_root": "/docs/core/compatibility/wpf.md",
343-
"redirect_url": "/dotnet/core/compatibility/sdk/5.0/automatically-infer-winexe-output-type"
344-
},
345341
{
346342
"source_path_from_root": "/docs/core/deploying/applications.md",
347343
"redirect_url": "/dotnet/core/deploying/index"

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ to clarify expected behavior in our community. For more information, see the [.N
4242
- [![Generate what's new article](https://github.com/dotnet/docs/actions/workflows/whats-new.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/whats-new.yml): Creates a PR to generate the "What's new" article on the first of every month.
4343
- [![Markdownlint](https://github.com/dotnet/docs/actions/workflows/markdownlint.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/markdownlint.yml): The current status for the entire repositories Markdown linter status.
4444
- [![MSDocs build verifier](https://github.com/dotnet/docs/actions/workflows/docs-verifier.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/docs-verifier.yml): Runs various Markdown verifications, beyond the linter, such as ensuring links and redirects are valid.
45-
- [![No response](https://github.com/dotnet/docs/actions/workflows/no-response.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/no-response.yml): If an issue is labeled with `needs-more-info` and the op doesn't respond within 14 days, the issue is closed.
4645
- [![OPS status checker](https://github.com/dotnet/docs/actions/workflows/check-for-build-warnings.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/check-for-build-warnings.yml): Builds the site for the PR in context, and verifies the build reporting either, `success`, `warnings`, or `error`.
4746
- [![Snippets 5000](https://github.com/dotnet/docs/actions/workflows/snippets5000.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/snippets5000.yml): Custom .NET build validation, locates code impacted by a PR, and builds.
4847
- [![Target supported version](https://github.com/dotnet/docs/actions/workflows/version-sweep.yml/badge.svg)](https://github.com/dotnet/docs/actions/workflows/version-sweep.yml): Runs monthly, creating issues on projects that target .NET versions that are out of support.

docs/ai/how-to/snippets/semantic-kernel/semantic-kernel.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1616
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
1717
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
18-
<PackageReference Include="Microsoft.SemanticKernel" Version="1.25.0" />
18+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.26.0" />
1919
<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" Version="1.9.0-alpha" />
2020
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Redis" Version="1.9.0-alpha" />
2121
<PackageReference Include="Microsoft.SemanticKernel.Plugins.Memory" Version="1.9.0-alpha" />

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="Microsoft.SemanticKernel" Version="1.25.0" />
11+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.26.0" />
1212
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Ollama" Version="1.22.0-alpha" />
1313
</ItemGroup>
1414

docs/ai/tutorials/snippets/llm-eval/llm-eval.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
15-
<PackageReference Include="Microsoft.SemanticKernel" Version="1.25.0" />
15+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.26.0" />
1616
</ItemGroup>
1717

1818
</Project>

0 commit comments

Comments
 (0)