Skip to content

Commit a44ca06

Browse files
Merge pull request #44715 from dotnet/main
Merge main into live
2 parents bc50aac + 63cc683 commit a44ca06

File tree

54 files changed

+288
-371
lines changed

Some content is hidden

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

54 files changed

+288
-371
lines changed

.openpublishing.redirection.ai.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
{
44
"source_path_from_root": "/docs/ai/quickstarts/get-started-azure-openai.md",
55
"redirect_url": "/dotnet/ai/quickstarts/get-started-openai"
6+
},
7+
{
8+
"source_path_from_root": "/docs/ai/how-to/use-redis-for-memory.md",
9+
"redirect_url": "/dotnet/ai"
10+
},
11+
{
12+
"source_path_from_root": "/docs/ai/how-to/work-with-local-models.md",
13+
"redirect_url": "/dotnet/ai"
614
}
715
]
816
}

docfx.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@
256256
"docs/core/runtime-config/**.md": "reference",
257257
"docs/core/tools/dotnet*.md": "reference",
258258
"docs/core/tools/sdk-errors/*.md": "error-reference",
259+
"docs/core/testing/mstest-analyzers/*.md": "error-reference",
259260
"docs/core/tutorials/**.md": "tutorial",
260261
"docs/csharp/getting-started/**/*.md": "overview",
261262
"docs/csharp/how-to/**/*.md": "how-to",
@@ -268,7 +269,7 @@
268269
"docs/csharp/roslyn-sdk/tutorials/*.md": "tutorial",
269270
"docs/csharp/tour-of-csharp/tutorials/**": "tutorial",
270271
"docs/csharp/tutorials/**": "tutorial",
271-
"docs/framework/additional-apis/**/**.md": "managed-reference",
272+
"docs/framework/additional-apis/**/**.md": "reference",
272273
"docs/framework/configure-apps/file-schema/**/**.md": "reference",
273274
"docs/framework/data/adonet/ef/language-reference/*-entity-sql.md": "language-reference",
274275
"docs/framework/debug-trace-profile/*-mda.md": "reference",
@@ -286,8 +287,8 @@
286287
"docs/framework/**/troubleshooting*.md": "troubleshooting",
287288
"docs/fsharp/language-reference/**/**.md": "language-reference",
288289
"docs/iot/**/*.*": "conceptual",
289-
"docs/fundamentals/code-analysis/quality-rules/**.md": "reference",
290-
"docs/fundamentals/code-analysis/style-rules/**.md": "reference",
290+
"docs/fundamentals/code-analysis/quality-rules/**.md": "error-reference",
291+
"docs/fundamentals/code-analysis/style-rules/**.md": "error-reference",
291292
"docs/fundamentals/diagnostics/runtime-*.md": "reference",
292293
"docs/fundamentals/syslib-diagnostics/**/*.md": "error-reference",
293294
"docs/standard/**/*how-to*.md": "how-to",

docs/ai/how-to/use-redis-for-memory.md

Lines changed: 0 additions & 61 deletions
This file was deleted.

docs/ai/how-to/work-with-local-models.md

Lines changed: 0 additions & 63 deletions
This file was deleted.

docs/ai/quickstarts/quickstart-assistants.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,5 +133,4 @@ Complete the following steps to create a .NET console app and add the package ne
133133
134134
## Next steps
135135
136-
- [Quickstart - Get insight about your data from an .NET Azure AI chat app](../how-to/work-with-local-models.md)
137136
- [Generate text and conversations with .NET and Azure OpenAI Completions](/training/modules/open-ai-dotnet-text-completions/)

docs/ai/quickstarts/quickstart-local-ai.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,4 @@ The Semantic Kernel SDK provides many services and features to connect to AI mod
146146

147147
## Next steps
148148

149-
- [Quickstart - Get insight about your data from an .NET Azure AI chat app](../how-to/work-with-local-models.md)
150149
- [Generate text and conversations with .NET and Azure OpenAI Completions](/training/modules/open-ai-dotnet-text-completions/)

docs/ai/toc.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,8 @@ items:
5555
items:
5656
- name: Authenticate to Azure OpenAI from an Azure hosted app
5757
href: how-to/app-service-aoai-auth.md
58-
- name: Authenticate App Service to a vector database
58+
- name: Authenticate to Azure Databases from an Azure hosted app
5959
href: how-to/app-service-db-auth.md
60-
- name: Use Redis with Semantic Kernel
61-
href: how-to/use-redis-for-memory.md
62-
- name: Use custom & local AI models with Semantic Kernel
63-
href: how-to/work-with-local-models.md
6460
- name: Work with content filtering
6561
href: how-to/content-filtering.md
6662
- name: Tutorials

0 commit comments

Comments
 (0)