Skip to content

Commit 931a5dc

Browse files
Merge pull request #49130 from dotnet/main
Merge main into live
2 parents 8fc84ae + 806fd67 commit 931a5dc

36 files changed

+289
-85
lines changed

docs/ai/get-started-app-chat-scaling-with-azure-container-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.topic: get-started
1212

1313
## Prerequisites
1414

15-
* Azure subscription. [Create one for free](https://azure.microsoft.com/free/ai-services?azure-portal=true).
15+
* Azure subscription. [Create one for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
1616

1717
[Dev containers](https://containers.dev/) are available for both samples, with all dependencies required to complete this article. You can run the dev containers in GitHub Codespaces (in a browser) or locally using Visual Studio Code.
1818

docs/ai/get-started-app-chat-template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ To follow along with this article, you need the following prerequisites:
5555

5656
#### [Codespaces (recommended)](#tab/github-codespaces)
5757

58-
* An Azure subscription - [Create one for free](https://azure.microsoft.com/free/ai-services?azure-portal=true)
58+
* An Azure subscription - [Create one for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn)
5959
* Azure account permissions - Your Azure account must have Microsoft.Authorization/roleAssignments/write permissions, such as [User Access Administrator](/azure/role-based-access-control/built-in-roles#user-access-administrator) or [Owner](/azure/role-based-access-control/built-in-roles#owner).
6060
* GitHub account
6161

6262
#### [Visual Studio Code](#tab/visual-studio-code)
6363

64-
* An Azure subscription - [Create one for free](https://azure.microsoft.com/free/ai-services?azure-portal=true)
64+
* An Azure subscription - [Create one for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn)
6565
* Azure account permissions - Your Azure account must have Microsoft.Authorization/roleAssignments/write permissions, such as [User Access Administrator](/azure/role-based-access-control/built-in-roles#user-access-administrator) or [Owner](/azure/role-based-access-control/built-in-roles#owner).
6666
* [Azure Developer CLI](/azure/developer/azure-developer-cli)
6767
* [Docker Desktop](https://www.docker.com/products/docker-desktop/) - Start Docker Desktop if it's not already running

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ A managed identity from Microsoft Entra ID allows your app to easily access othe
1717

1818
## Prerequisites
1919

20-
* An Azure account that has an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
20+
* An Azure account that has an active subscription. [Create an account for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
2121
* [.NET SDK](https://dotnet.microsoft.com/download/visual-studio-sdks)
2222
* [Create and deploy an Azure OpenAI Service resource](/azure/ai-services/openai/how-to/create-resource)
2323
* [Create and deploy a .NET application to App Service](/azure/app-service/quickstart-dotnetcore)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The [Content Filtering](/azure/ai-services/openai/concepts/content-filter) docum
1616

1717
## Prerequisites
1818

19-
* An Azure account that has an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
19+
* An Azure account that has an active subscription. [Create an account for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
2020
* [.NET SDK](https://dotnet.microsoft.com/download/visual-studio-sdks)
2121
* [Create and deploy an Azure OpenAI Service resource](/azure/ai-services/openai/how-to/create-resource)
2222

docs/ai/quickstarts/build-mcp-server.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,23 @@ Configure GitHub Copilot for Visual Studio Code to use your custom MCP server:
6666
"args": [
6767
"run",
6868
"--project",
69-
"<RELATIVE PATH TO PROJECT DIRECTORY>"
69+
"<relative-path-to-project-file>"
7070
]
7171
}
7272
}
7373
}
7474
```
7575

76+
> [!NOTE]
77+
> VS Code executes MCP servers from the workspace root. The `<relative-path-to-project-file>` placeholder should point to your .NET project file. For example, the value for this **SampleMcpServer** app would be `SampleMcpServer.csproj`.
78+
7679
1. Save the file.
7780

7881
## Test the MCP server
7982

8083
The MCP server template includes a tool called `get_random_number` you can use for testing and as a starting point for development.
8184

82-
1. Open GitHub Copilot in Visual Studio Code and switch to chat mode.
85+
1. Open GitHub Copilot in Visual Studio Code and switch to agent mode.
8386

8487
1. Select the **Select tools** icon to verify your **SampleMcpServer** is available with the sample tool listed.
8588

docs/azure/create-azure-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ If you have a Visual Studio subscription, your subscription includes credits for
1818

1919
## Option 2: Sign up for a free Azure account
2020

21-
You can create an [Azure account for free](https://azure.microsoft.com/free/dotnet/) and receive 12 months of popular services for free and a $200 credit to explore Azure for 30 days.
21+
You can create an [Azure account for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn) and receive 12 months of popular services for free and a $200 credit to explore Azure for 30 days.
2222

2323
## Option 3: Sign up for a pay-as-you-go account
2424

docs/azure/dotnet-dev-env-checklist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This checklist is provided to help you make sure you have your development envir
1515
To access Azure services or run applications in Azure, you need an Azure account.
1616

1717
* If you are a Visual Studio subscriber, you have monthly [free Azure credits](https://azure.microsoft.com/pricing/member-offers/credit-for-visual-studio-subscribers/) available to you every month
18-
* [Create a free Azure account](https://azure.microsoft.com/free/dotnet/) and receive $200 in credits and select services free for 12 months
18+
* [Create a free Azure account](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn) and receive $200 in credits and select services free for 12 months
1919
* Use an account assigned to you by your company's Azure administrator
2020

2121
## Configure your IDE

docs/azure/migration/appmod/predefined-tasks.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Predefined tasks for GitHub Copilot app modernization for .NET (Preview)
2+
title: Predefined tasks for GitHub Copilot app modernization for .NET
33
description: Learn about the predefined tasks that are available for GitHub Copilot app modernization for .NET
44
ms.topic: concept-article
55
ms.custom: devx-track-dotnet
@@ -8,11 +8,11 @@ author: alexwolfmsft
88
ms.author: alexwolf
99
---
1010

11-
# Predefined tasks for GitHub Copilot app modernization for .NET (Preview)
11+
# Predefined tasks for GitHub Copilot app modernization for .NET
1212

13-
This article describes the predefined tasks available for GitHub Copilot app modernization for .NET (Preview).
13+
This article describes the predefined tasks available for GitHub Copilot app modernization for .NET.
1414

15-
Predefined tasks capture industry best practices for using Azure services. Currently, App Modernization for .NET (Preview) offers predefined tasks that cover common migration scenarios. These tasks address the following subjects, and more:
15+
Predefined tasks capture industry best practices for using Azure services. Currently, App Modernization for .NET offers predefined tasks that cover common migration scenarios. These tasks address the following subjects, and more:
1616

1717
- Database migration
1818
- Storage migration

docs/azure/sdk/resource-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Those packages follow the [new Azure SDK guidelines](https://azure.github.io/azu
2424

2525
### Prerequisites
2626

27-
- An [Azure subscription](https://azure.microsoft.com/free/dotnet/).
27+
- An [Azure subscription](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
2828
- A [TokenCredential](/dotnet/api/azure.core.tokencredential?view=azure-dotnet&preserve-view=false) implementation, such as an [Azure Identity library credential type](/dotnet/api/overview/azure/Identity-readme#credential-classes).
2929

3030
### Install the package

docs/core/compatibility/10.0.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ If you're migrating an app to .NET 10, the breaking changes listed here might af
5353
| [MacCatalyst version normalization](core-libraries/10.0/maccatalyst-version-normalization.md) | Behavioral change | Preview 1 |
5454
| [.NET runtime no longer provides default termination signal handlers](core-libraries/10.0/sigterm-signal-handler.md) | Behavioral change | Preview 5 |
5555
| [System.Linq.AsyncEnumerable included in core libraries](core-libraries/10.0/asyncenumerable.md) | Source incompatible | Preview 1 |
56+
| [Type.MakeGenericSignatureType argument validation](reflection/10/makegeneric-signaturetype-validation.md) | Behavioral change | Preview 3 |
5657
| [YMM embedded rounding removed from AVX10.2](core-libraries/10.0/ymm-embedded-rounding.md) | Behavioral change | Preview 5 |
5758

5859
## Cryptography
@@ -105,12 +106,14 @@ If you're migrating an app to .NET 10, the breaking changes listed here might af
105106
| Title | Type of change | Introduced version |
106107
|-------|-------------------|--------------------|
107108
| [.NET CLI `--interactive` defaults to `true` in user scenarios](sdk/10.0/dotnet-cli-interactive.md) | Behavioral change | Preview 3 |
109+
| [`dotnet` CLI commands log non-command-relevant data to stderr](sdk/10.0/dotnet-cli-stderr-output.md) | Behavioral change | RC 2 |
108110
| [.NET tool packaging creates RuntimeIdentifier-specific tool packages](sdk/10.0/dotnet-tool-pack-publish.md) | Behavioral change | Preview 6 |
109111
| [Default workload configuration from 'loose manifests' to 'workload sets' mode](sdk/10.0/default-workload-config.md) | Behavioral change | Preview 2 |
110112
| [`dotnet new sln` defaults to SLNX file format](sdk/10.0/dotnet-new-sln-slnx-default.md) | Behavioral change | RC 1 |
111113
| [`dotnet package list` performs restore](sdk/10.0/dotnet-package-list-restore.md) | Behavioral change | Preview 4 |
112114
| [`dotnet restore` audits transitive packages](sdk/10.0/nugetaudit-transitive-packages.md) | Behavioral change | Preview 3 |
113115
| [`dotnet tool install --local` creates manifest by default](sdk/10.0/dotnet-tool-install-local-manifest.md) | Behavioral change | Preview 7 |
116+
| [`dotnet watch` logs to stderr instead of stdout](sdk/10.0/dotnet-watch-stderr.md) | Behavioral change | RC 2 |
114117
| [project.json not supported in `dotnet restore`](sdk/10.0/dotnet-restore-project-json-unsupported.md) | Source incompatible | Preview 7 |
115118
| [SHA-1 fingerprint support deprecated in `dotnet nuget sign`](sdk/10.0/dotnet-nuget-sign-sha1-deprecated.md) | Behavioral change | Preview 1 |
116119
| [MSBUILDCUSTOMBUILDEVENTWARNING escape hatch removed](sdk/10.0/custom-build-event-warning.md) | Behavioral change | Preview 1 |

0 commit comments

Comments
 (0)