Skip to content

Commit 0d999f9

Browse files
Merge pull request #45071 from dotnet/main
Merge main into live
2 parents dc5a0ed + cdb02b2 commit 0d999f9

35 files changed

+425
-84
lines changed

.openpublishing.redirection.ai.json

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"redirections": [
33
{
4-
"source_path_from_root": "/docs/ai/quickstarts/get-started-azure-openai.md",
5-
"redirect_url": "/dotnet/ai/quickstarts/get-started-openai"
4+
"source_path_from_root": "/docs/ai/how-to/app-service-db-auth.md",
5+
"redirect_url": "/dotnet/ai"
66
},
77
{
88
"source_path_from_root": "/docs/ai/how-to/use-redis-for-memory.md",
@@ -13,8 +13,36 @@
1313
"redirect_url": "/dotnet/ai"
1414
},
1515
{
16-
"source_path_from_root": "/docs/ai/how-to/app-service-db-auth.md",
17-
"redirect_url": "/dotnet/ai"
16+
"source_path_from_root": "/docs/ai/quickstarts/get-started-azure-openai.md",
17+
"redirect_url": "/dotnet/ai/quickstarts/build-chat-app"
18+
},
19+
{
20+
"source_path_from_root": "/docs/ai/quickstarts/get-started-openai.md",
21+
"redirect_url": "/dotnet/ai/quickstarts/build-chat-app"
22+
},
23+
{
24+
"source_path_from_root": "/docs/ai/quickstarts/quickstart-ai-chat-with-data.md",
25+
"redirect_url": "/dotnet/ai/quickstarts/build-vector-search-app"
26+
},
27+
{
28+
"source_path_from_root": "/docs/ai/quickstarts/quickstart-assistants.md",
29+
"redirect_url": "/dotnet/ai/quickstarts/create-assistant"
30+
},
31+
{
32+
"source_path_from_root": "/docs/ai/quickstarts/quickstart-azure-openai-tool.md",
33+
"redirect_url": "/dotnet/ai/quickstarts/use-function-calling"
34+
},
35+
{
36+
"source_path_from_root": "/docs/ai/quickstarts/quickstart-local-ai.md",
37+
"redirect_url": "/dotnet/ai/quickstarts/chat-local-model"
38+
},
39+
{
40+
"source_path_from_root": "/docs/ai/quickstarts/quickstart-openai-generate-images.md",
41+
"redirect_url": "/dotnet/ai/quickstarts/generate-images"
42+
},
43+
{
44+
"source_path_from_root": "/docs/ai/quickstarts/quickstart-openai-summarize-text.md",
45+
"redirect_url": "/dotnet/ai/quickstarts/prompt-model"
1846
}
1947
]
20-
}
48+
}

docs/ai/ai-extensions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,5 @@ For an end-to-end sample using `Microsoft.Extensions.AI`, see [eShopSupport](htt
9999

100100
## Next steps
101101

102-
- [Build an AI chat app with .NET](./quickstarts/get-started-openai.md)
103-
- [Quickstart - Summarize text using Azure AI chat app with .NET](./quickstarts/quickstart-openai-summarize-text.md)
102+
- [Build an AI chat app with .NET](/dotnet/ai/quickstarts/build-chat-app)
103+
- [Quickstart - Summarize text using Azure AI chat app with .NET](/dotnet/ai/quickstarts/prompt-model)

docs/ai/dotnet-ai-ecosystem.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Azure offers many other AI services to build specific application capabilities a
6363

6464
.NET apps can also connect to local AI models for many different development scenarios. [Semantic Kernel](https://github.com/microsoft/semantic-kernel) is the recommended tool to connect to local models using .NET. Semantic Kernel can connect to many different models hosted across a variety of platforms and abstracts away lower-level implementation details.
6565

66-
For example, you can use [Ollama](https://ollama.com/) to [connect to local AI models with .NET](quickstarts/quickstart-local-ai.md), including several small language models (SLMs) developed by Microsoft:
66+
For example, you can use [Ollama](https://ollama.com/) to [connect to local AI models with .NET](/dotnet/ai/quickstarts/chat-local-model), including several small language models (SLMs) developed by Microsoft:
6767

6868
| Model | Description |
6969
|---------------------|-----------------------------------------------------------|
@@ -84,7 +84,7 @@ This article summarized the tools and SDKs in the .NET ecosystem, with a focus o
8484
## Next steps
8585

8686
- [What is Semantic Kernel?](/semantic-kernel/overview/)
87-
- [Quickstart - Summarize text using Azure AI chat app with .NET](./quickstarts/quickstart-openai-summarize-text.md)
87+
- [Quickstart - Summarize text using Azure AI chat app with .NET](/dotnet/ai/quickstarts/prompt-model)
8888

8989
[phi3]: https://azure.microsoft.com/products/phi-3
9090
[orca]: https://www.microsoft.com/research/project/orca/

docs/ai/get-started/dotnet-ai-overview.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ We recommend the following sequence of tutorials and articles for an introductio
3636

3737
| Scenario | Tutorial |
3838
|----------|----------|
39-
| Create a chat application | [Build an Azure AI chat app with .NET](../quickstarts/get-started-openai.md)|
40-
| Summarize text | [Summarize text using Azure AI chat app with .NET](../quickstarts/quickstart-openai-summarize-text.md) |
41-
| Chat with your data | [Get insight about your data from an .NET Azure AI chat app](../quickstarts/quickstart-ai-chat-with-data.md) |
42-
| Call .NET functions with AI | [Extend Azure AI using tools and execute a local function with .NET](../quickstarts/quickstart-azure-openai-tool.md) |
43-
| Generate images | [Generate images using Azure AI with .NET](../quickstarts/quickstart-openai-generate-images.md) |
39+
| Create a chat application | [Build an Azure AI chat app with .NET](/dotnet/ai/quickstarts/build-chat-app)|
40+
| Summarize text | [Summarize text using Azure AI chat app with .NET](/dotnet/ai/quickstarts/prompt-model) |
41+
| Chat with your data | [Get insight about your data from an .NET Azure AI chat app](/dotnet/ai/quickstarts/build-vector-search-app) |
42+
| Call .NET functions with AI | [Extend Azure AI using tools and execute a local function with .NET](/dotnet/ai/quickstarts/use-function-calling) |
43+
| Generate images | [Generate images using Azure AI with .NET](/dotnet/ai/quickstarts/generate-images) |
4444
| Train your own model |[ML.NET tutorial](https://dotnet.microsoft.com/learn/ml-dotnet/get-started-tutorial/intro) |
4545

4646
Browse the table of contents to learn more about the core concepts, starting with [How generative AI and LLMs work](../conceptual/how-genai-and-llms-work.md).
4747

4848
## Next steps
4949

50-
- [Quickstart: Build an Azure AI chat app with .NET](../quickstarts/get-started-openai.md)
50+
- [Quickstart: Build an Azure AI chat app with .NET](/dotnet/ai/quickstarts/build-chat-app)
5151
- [Video series: Machine Learning and AI with .NET](/shows/machine-learning-and-ai-with-dotnet-for-beginners)

docs/ai/how-to/content-filtering.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ The response was filtered due to the prompt triggering Azure OpenAI's content ma
4949

5050
* [Create and assign a content filter](/azure/ai-services/openai/how-to/content-filters)
5151
* [Content Filtering concepts](/azure/ai-services/openai/concepts/content-filter)
52-
* [Create a chat app](../quickstarts/quickstart-openai-summarize-text.md)
52+
* [Create a chat app](/dotnet/ai/quickstarts/prompt-model)

docs/ai/index.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ landingContent:
4949
url: conceptual/vector-databases.md
5050
- text: Prompt engineering
5151
url: conceptual/prompt-engineering-dotnet.md
52+
- text: Evaluation libraries
53+
url: conceptual/evaluation-libraries.md
5254

5355
# Card (Optional; Remove if not applicable.)
5456
- title: Common tasks

docs/ai/quickstarts/get-started-openai.md renamed to docs/ai/quickstarts/build-chat-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,5 +153,5 @@ azd down
153153

154154
## Next steps
155155

156-
- [Quickstart - Chat with a local AI model](quickstart-local-ai.md)
157-
- [Generate images using AI with .NET](quickstart-openai-generate-images.md)
156+
- [Quickstart - Chat with a local AI model](/dotnet/ai/quickstarts/chat-local-model)
157+
- [Generate images using AI with .NET](/dotnet/ai/quickstarts/generate-images)

docs/ai/quickstarts/quickstart-ai-chat-with-data.md renamed to docs/ai/quickstarts/build-vector-search-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,5 +205,5 @@ azd down
205205

206206
## Next steps
207207

208-
- [Quickstart - Chat with a local AI model](quickstart-local-ai.md)
209-
- [Generate images using AI with .NET](quickstart-openai-generate-images.md)
208+
- [Quickstart - Chat with a local AI model](/dotnet/ai/quickstarts/chat-local-model)
209+
- [Generate images using AI with .NET](/dotnet/ai/quickstarts/generate-images)

docs/ai/quickstarts/quickstart-local-ai.md renamed to docs/ai/quickstarts/chat-local-model.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ In this quickstart, you learn how to create a conversational .NET console chat a
2020

2121
## Run the local AI model
2222

23-
Complete the following steps to configure and run a local AI Model on your device. Many different AI models are available to run locally and are trained for different tasks, such as generating code, analyzing images, generative chat, or creating embeddings. For this quickstart, you'll use the general purpose `phi3:mini` model, which is a small but capable generative AI created by Microsoft.
23+
Complete the following steps to configure and run a local AI model on your device. Many different AI models are available to run locally and are trained for different tasks, such as generating code, analyzing images, generative chat, or creating embeddings. For this quickstart, you'll use the general purpose `phi3:mini` model, which is a small but capable generative AI created by Microsoft.
2424

2525
1. Open a terminal window and verify that Ollama is available on your device:
2626

@@ -54,7 +54,7 @@ Complete the following steps to configure and run a local AI Model on your devic
5454

5555
## Create the .NET app
5656

57-
Complete the following steps to create a .NET console app that will connect to your local `phi3:mini` AI model:
57+
Complete the following steps to create a .NET console app that connects to your local `phi3:mini` AI model.
5858

5959
1. In a terminal window, navigate to an empty directory on your device and create a new app with the `dotnet new` command:
6060

File renamed without changes.

0 commit comments

Comments
 (0)