Skip to content

Commit e9d200e

Browse files
Merge pull request #45108 from dotnet/main
Merge main into live
2 parents e246ea5 + 2404f52 commit e9d200e

34 files changed

+177
-533
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: learn.microsoft.com site feedback
4-
url: https://github.com/MicrosoftDocs/feedback/issues/new/choose
5-
about: Log general learn.microsoft.com site issues here
63
- name: .NET platform and other product feedback
74
url: https://aka.ms/feedback/report?space=61
85
about: Log product issues here

.github/dependabot.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,17 @@ updates:
844844
dotnet:
845845
patterns:
846846
- "*" # Prefer a single PR per project update.
847+
- package-ecosystem: "nuget"
848+
directory: "/docs/ai/quickstarts/snippets/evaluate-ai-responses" #TestAI.csproj
849+
schedule:
850+
interval: "weekly"
851+
day: "wednesday"
852+
open-pull-requests-limit: 5
853+
groups:
854+
# Group .NET updates together for projects.
855+
dotnet:
856+
patterns:
857+
- "*" # Prefer a single PR per project update.
847858
- package-ecosystem: "nuget"
848859
directory: "/docs/ai/quickstarts/snippets/function-calling/azure-openai" #FunctionCallingAI.csproj
849860
schedule:
@@ -2186,14 +2197,3 @@ updates:
21862197
dotnet:
21872198
patterns:
21882199
- "*" # Prefer a single PR per project update.
2189-
- package-ecosystem: "nuget"
2190-
directory: "/docs/devops/snippets/create-dotnet-github-action/DotNet.GitHubAction" #DotNet.GitHubAction.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.

.openpublishing.redirection.ai.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/docs/ai/conceptual/agents.md",
5+
"redirect_url": "/dotnet/ai"
6+
},
37
{
48
"source_path_from_root": "/docs/ai/how-to/app-service-db-auth.md",
59
"redirect_url": "/dotnet/ai"

.openpublishing.redirection.azure.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
"source_path_from_root": "/docs/azure/dotnet-tutorials.md",
5757
"redirect_url": "/dotnet/azure/"
5858
},
59+
{
60+
"source_path_from_root": "/docs/azure/landing-page.yml",
61+
"redirect_url": "/dotnet/azure/index"
62+
},
5963
{
6064
"source_path_from_root": "/docs/azure/logging.md",
6165
"redirect_url": "/dotnet/azure/sdk/logging"
@@ -102,7 +106,7 @@
102106
},
103107
{
104108
"source_path_from_root": "/docs/azure/sdk/authentication-azure-hosted-apps.md",
105-
"redirect_url": "/dotnet/azure/sdk/authentication/azure-hosted-apps"
109+
"redirect_url": "/dotnet/azure/sdk/authentication/system-assigned-managed-identity"
106110
},
107111
{
108112
"source_path_from_root": "/docs/azure/sdk/authentication-additional-methods.md",
@@ -130,7 +134,7 @@
130134
},
131135
{
132136
"source_path_from_root": "/docs/azure/sdk/authentication/azure-hosted-apps.md",
133-
"redirect_url": "/docs/azure/sdk/authentication/system-assigned-managed-identity"
137+
"redirect_url": "/dotnet/azure/sdk/authentication/system-assigned-managed-identity"
134138
}
135139
]
136140
}

.replaycheck/docs/core/tutorials/top-level-templates.yml

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

docs/ai/conceptual/agents.md

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

docs/ai/how-to/app-service-aoai-auth.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ zone_pivot_groups: azure-interface
1111

1212
# Authenticate to Azure OpenAI from an Azure hosted app using Microsoft Entra ID
1313

14-
This article demonstrates how to use [Microsoft Entra ID managed identities](/azure/app-service/overview-managed-identity) and the [Microsoft.Extensions.AI library](/dotnet/ai/ai-extensions) to authenticate an Azure hosted app to an Azure OpenAI resource.
14+
This article demonstrates how to use [Microsoft Entra ID managed identities](/azure/app-service/overview-managed-identity) and the [Microsoft.Extensions.AI library](../ai-extensions.md) to authenticate an Azure hosted app to an Azure OpenAI resource.
1515

1616
A managed identity from Microsoft Entra ID allows your app to easily access other Microsoft Entra protected resources such as Azure OpenAI. The identity is managed by the Azure platform and doesn't require you to provision, manage, or rotate any secrets.
1717

@@ -181,7 +181,7 @@ az role assignment create --assignee "<managedIdentityObjectID>" \
181181
:::code language="csharp" source="./snippets/hosted-app-auth/program.cs" range="41-46":::
182182
183183
> [!TIP]
184-
> Learn more about ASP.NET Core dependency injection and how to register other AI services types in the Azure SDK for .NET [dependency injection](/dotnet/azure/sdk/dependency-injection) documentation.
184+
> Learn more about ASP.NET Core dependency injection and how to register other AI services types in the Azure SDK for .NET [dependency injection](../../azure/sdk/dependency-injection.md) documentation.
185185
186186
## Related content
187187

docs/ai/index.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
### YamlMime:Landing
22

3-
title: AI for .NET developers
4-
summary: Learn to use AI with .NET. Browse sample code, tutorials, quickstarts, conceptual articles, and more.
3+
title: AI apps for .NET developers
4+
summary: Learn to build AI apps with .NET. Browse sample code, tutorials, quickstarts, conceptual articles, and more.
55

66
metadata:
7-
title: AI for .NET developers
8-
description: Samples, tutorials, and education for using AI with .NET
7+
title: AI apps for .NET developers
8+
description: Samples, tutorials, and education for building AI apps with .NET
99
ms.topic: hub-page
1010
ms.service: dotnet
1111
ms.date: 12/19/2024

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25114.11" />
12-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.3.0-preview.1.25114.11" />
13-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.3.0-preview.1.25114.11" />
12+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.3.0-preview.1.25126.9" />
13+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.3.0-preview.1.25126.9" />
1414
<PackageReference Include="Microsoft.Extensions.AI.Ollama" Version="9.3.0-preview.1.25114.11" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
16-
<PackageReference Include="MSTest" Version="3.6.4" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
16+
<PackageReference Include="MSTest" Version="3.8.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

docs/ai/toc.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ items:
44
- name: Overview
55
href: get-started/dotnet-ai-overview.md
66
- name: "Quickstart: Connect to and prompt an AI model"
7-
href: /dotnet/ai/quickstarts/prompt-model
7+
href: quickstarts/prompt-model.md
88
- name: AI frameworks and SDKs
99
items:
1010
- name: Overview
@@ -16,17 +16,17 @@ items:
1616
- name: Quickstarts
1717
items:
1818
- name: Build a chat app
19-
href: /dotnet/ai/quickstarts/build-chat-app
19+
href: quickstarts/build-chat-app.md
2020
- name: Build a .NET AI vector search app
21-
href: /dotnet/ai/quickstarts/build-vector-search-app
21+
href: quickstarts/build-vector-search-app.md
2222
- name: Execute a local .NET function
23-
href: /dotnet/ai/quickstarts/use-function-calling
23+
href: quickstarts/use-function-calling.md
2424
- name: Generate images
25-
href: /dotnet/ai/quickstarts/generate-images
25+
href: quickstarts/generate-images.md
2626
- name: Chat with a local AI model
27-
href: /dotnet/ai/quickstarts/chat-local-model
27+
href: quickstarts/chat-local-model.md
2828
- name: Build a minimal AI assistant
29-
href: /dotnet/ai/quickstarts/create-assistant
29+
href: quickstarts/create-assistant.md
3030
- name: Concepts
3131
items:
3232
- name: How generative AI and LLMs work

0 commit comments

Comments
 (0)