Skip to content

Commit 36e5a72

Browse files
Merge pull request #10096 from MicrosoftDocs/main638451940905780410sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 26152c5 + 0d6465b commit 36e5a72

28 files changed

+374
-316
lines changed

.docutune/config/docutune-visualstudio-docs-pr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"*right-click*",
4040
"*for-more-information-see*",
4141
"*had-had*",
42-
42+
"formatting-accessibility-advanced",
4343
"formatting-learn-more",
4444
"*and-then-click*",
4545
"casing-product-windows-windows",

docs/azure/azure-app-insights-add-connected-service.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ ms.topic: conceptual
88
ms.date: 05/03/2023
99
ms.author: angelpe
1010
---
11+
1112
# Add Azure Application Insights by using Visual Studio Connected Services
1213

1314
With Visual Studio, you can connect any of the following to Azure Application Insights by using the **Connected Services** feature:
1415

1516
- .NET Framework console app
16-
- ASP.NET MVC (.NET Framework)
17+
- ASP.NET Model-View-Controller (MVC) (.NET Framework)
1718
- ASP.NET Core
1819
- .NET Core (including console app, WPF, Windows Forms, class library)
1920
- .NET Core Worker Role
@@ -49,7 +50,7 @@ The connected service functionality adds all the needed references and connectio
4950

5051
![Screenshot showing "Add Azure Application Insights" screen.](./media/azure-app-insights-add-connected-service/azure-app-insights.png)
5152

52-
If you aren't signed in already, sign into your Azure account. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
53+
If you aren't signed in already, sign in to your Azure account. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
5354

5455
1. In the **Configure Azure Application Insights** screen, select an existing Azure Application Insights component, and select **Next**.
5556

@@ -97,9 +98,9 @@ The connected service functionality adds all the needed references and connectio
9798

9899
![Screenshot showing Application Insights choices.](./media/azure-app-insights-add-connected-service/vs-2022/application-insights-choices-2.png)
99100

100-
If you choose to use the Application Insights Sdk locally, click **Next** to see the **Summary of changes** screen, which shows how your project is being modified. A NuGet package reference is added to your project and the connection code for the local emulator is added to your project.
101+
If you choose to use the Application Insights SDK locally, click **Next** to see the **Summary of changes** screen, which shows how your project is being modified. A NuGet package reference is added to your project and the connection code for the local emulator is added to your project.
101102

102-
If you want to connect to the Azure service, continue to the next step, or if you aren't signed in already, sign into your Azure account before continuing. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
103+
If you want to connect to the Azure service, continue to the next step, or if you aren't signed in already, sign in to your Azure account before continuing. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
103104

104105
1. In the **Configure Azure Application Insights** screen, select an existing Azure Application Insights component, and select **Next**.
105106

docs/azure/azure-cache-for-redis-add-connected-service.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Add Azure Cache for Redis by using Connected Services
3-
description: Learn how to add Azure cache for Redis support to your app with the Visual Studio process for adding a connected service.
3+
description: Learn how to add Azure Cache for Redis support to your app with the Visual Studio process for adding a connected service.
44
author: AngelosP
55
manager: jmartens
66
ms.subservice: azure-development
@@ -9,12 +9,13 @@ ms.date: 05/15/2023
99
ms.author: angelpe
1010
monikerRange: ">= vs-2019"
1111
---
12+
1213
# Add Azure Cache for Redis by using Visual Studio Connected Services
1314

1415
With Visual Studio, you can connect any of the following to Azure Cache for Redis by using the **Connected Services** feature:
1516

1617
- .NET Framework console app
17-
- ASP.NET MVC (.NET Framework)
18+
- ASP.NET Model-View-Controller (MVC) (.NET Framework)
1819
- ASP.NET Core
1920
- .NET Core (including console app, WPF, Windows Forms, class library)
2021
- .NET Core Worker Role
@@ -27,6 +28,7 @@ The connected service functionality adds all the needed references and connectio
2728

2829
> [!NOTE]
2930
> This topic applies to Visual Studio on Windows. For Visual Studio for Mac, see [Connected services in Visual Studio for Mac](/visualstudio/mac/connected-services).
31+
3032
## Prerequisites
3133

3234
- Visual Studio with the Azure workload installed.
@@ -48,15 +50,15 @@ The connected service functionality adds all the needed references and connectio
4850

4951
![Screenshot of the Add Dependency page. Azure Cache for Redis is selected.](./media/azure-redis-cache-add-connected-service/azure-redis-cache.png)
5052

51-
If you aren't signed in already, sign into your Azure account. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
53+
If you aren't signed in already, sign in to your Azure account. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
5254

5355
1. In the **Configure Azure Cache for Redis** screen, select an existing Azure Cache for Redis, and select **Next**.
5456

5557
If you need to create a new component, go to the next step. Otherwise, skip to step 7.
5658

5759
![Screenshot of the Configure Azure Cache for Redis screen. Next is highlighted.](./media/azure-redis-cache-add-connected-service/created-azure-redis-cache.png)
5860

59-
1. To create an Azure Redis Cache:
61+
1. To create an Azure Cache for Redis:
6062

6163
1. Select **Create a new Azure Redis Cache** at the bottom of the screen.
6264

@@ -92,29 +94,29 @@ The connected service functionality adds all the needed references and connectio
9294

9395
1. Choose **Azure Cache for Redis**. The **Connect to dependency** page appears. You should see two options, one for a local emulator, **Redis Cache on container (Local)**, and one for connecting to the live Azure Cache for Redis service. You can reduce cost and simplify early development by starting with the local emulator. You can migrate to the live service later by repeating these steps and choosing the other option.
9496

95-
![Screenshot showing Redis cache choices](./media/azure-redis-cache-add-connected-service/vs-2022/azure-cache-for-redis-add-dependency-2.png)
97+
![Screenshot showing Azure Cache for Redis choices](./media/azure-redis-cache-add-connected-service/vs-2022/azure-cache-for-redis-add-dependency-2.png)
9698

97-
If you choose the Redis cache locally, click **Next** to the **Connect to Redis cache on container** screen.
99+
If you choose the Azure Cache for Redis locally, click **Next** to the **Connect to Redis cache on container** screen.
98100

99-
![Screenshot showing connection options for Redis cache in a local container.](./media/azure-redis-cache-add-connected-service/vs-2022/connect-to-redis-cache-on-container.png)
101+
![Screenshot showing connection options for Azure Cache for Redis in a local container.](./media/azure-redis-cache-add-connected-service/vs-2022/connect-to-redis-cache-on-container.png)
100102

101103
Specify **Container name**, **Container image**, and port mappings or accept the defaults, and click **Next** to see the **Summary of changes** screen, which shows what changes would be made to your project. A NuGet package reference is added to your project and the connection code for the local emulator is added to your project.
102104

103-
If you want to connect to the Azure service, continue to the next step, or if you aren't signed in already, sign into your Azure account before continuing. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
105+
If you want to connect to the Azure service, continue to the next step, or if you aren't signed in already, sign in to your Azure account before continuing. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
104106

105107
1. To go with the live service, select **Azure Cache for Redis**.
106108

107109
![Screenshot of the Add Dependency page. Azure Cache for Redis is selected.](./media/azure-redis-cache-add-connected-service/azure-redis-cache.png)
108110

109-
If you aren't signed in already, sign into your Azure account. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
111+
If you aren't signed in already, sign in to your Azure account. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
110112

111113
1. In the **Configure Azure Cache for Redis** screen, select an existing Azure Cache for Redis, and select **Next**.
112114

113115
If you need to create a new component, go to the next step. Otherwise, skip to step 7.
114116

115117
![Screenshot of the Configure Azure Cache for Redis screen. Next is highlighted.](./media/azure-redis-cache-add-connected-service/created-azure-redis-cache.png)
116118

117-
1. To create an Azure Redis Cache:
119+
1. To create an Azure Cache for Redis:
118120

119121
1. Select **Create a new Azure Redis Cache** at the bottom of the screen.
120122

@@ -142,7 +144,7 @@ The connected service functionality adds all the needed references and connectio
142144

143145
## Next steps
144146

145-
For ASP.NET apps, common use cases for Azure cache for Redis are to cache session state or page output (HTTP responses). ASP.NET Core provides built-in services for these use cases, which should be used instead when you're using ASP.NET Core.
147+
For ASP.NET apps, common use cases for Azure Cache for Redis are to cache session state or page output (HTTP responses). ASP.NET Core provides built-in services for these use cases, which should be used instead when you're using ASP.NET Core.
146148

147149
To cache session state in an ASP.NET app, see [ASP.NET Session State Provider](/azure/azure-cache-for-redis/cache-aspnet-session-state-provider).
148150

docs/azure/azure-cosmosdb-add-connected-service.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ ms.date: 02/15/2024
99
ms.author: ghogen
1010
monikerRange: ">= vs-2019"
1111
---
12+
1213
# Add Azure Cosmos DB to your app by using Visual Studio Connected Services
1314

1415
With Visual Studio, you can connect any of the following to Azure Cosmos DB by using the **Connected Services** feature:
1516

1617
- .NET Framework console app
17-
- ASP.NET MVC (.NET Framework)
18+
- ASP.NET Model-View-Controller (MVC) (.NET Framework)
1819
- ASP.NET Core
1920
- .NET Core (including console app, WPF, Windows Forms, class library)
2021
- .NET Core Worker Role
@@ -27,13 +28,15 @@ The connected service functionality adds all the needed references and connectio
2728

2829
> [!NOTE]
2930
> This topic applies to Visual Studio on Windows. For Visual Studio for Mac, see [Connected services in Visual Studio for Mac](/visualstudio/mac/connected-services).
31+
3032
## Prerequisites
3133

3234
- Visual Studio with the Azure workload installed.
3335
- A project of one of the supported types
3436
- [!INCLUDE [prerequisites-azure-subscription](includes/prerequisites-azure-subscription.md)]
3537

3638
## Connect to Azure Cosmos DB using Connected Services
39+
3740
:::moniker range="vs-2019"
3841
1. Open your project in Visual Studio.
3942

@@ -47,7 +50,7 @@ The connected service functionality adds all the needed references and connectio
4750

4851
![Screenshot showing "Add Dependency" screen, selecting the "Add Azure Cosmos DB" option.](./media/azure-cosmosdb-add-connected-service/azure-cosmos-db.png)
4952

50-
If you aren't signed in already, sign into your Azure account. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
53+
If you aren't signed in already, sign in to your Azure account. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
5154

5255
1. In the **Azure Cosmos DB** screen, select an existing Azure Cosmos DB, and select **Next**.
5356

@@ -95,7 +98,7 @@ The connected service functionality adds all the needed references and connectio
9598

9699
If you choose to use the Azure Cosmos DB Emulator, click **Next** to see the **Summary of changes** screen, which shows how your project is being modified. A NuGet package reference is added to your project and the connection code for the local emulator is added to your project. Once you click **Finish** on the last screen, the container for the emulator is created; you'll see the image download status in the output window.
97100

98-
If you want to connect to the Azure service, continue to the next step, or if you aren't signed in already, sign into your Azure account before continuing. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
101+
If you want to connect to the Azure service, continue to the next step, or if you aren't signed in already, sign in to your Azure account before continuing. If you don't have an Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/).
99102

100103
1. In the **Azure Cosmos DB** screen, select an existing Azure Cosmos DB, and select **Next**.
101104

@@ -129,7 +132,7 @@ The connected service functionality adds all the needed references and connectio
129132

130133
If you click on the three dots next to the dependency you added, you can see various options such as **Connect** to reopen the wizard and change the connection. You can also click the three dots at the top right of the window to see options to start local dependencies, change settings, and more.
131134

132-
1. By default, the memory limit in the container is set to 2G, but normally, more memory is required to run CosmosDB. To fix this, navigate to the `.vs/sd/<GUID>/local` folder under your solution folder. In Windows Explorer, you might have to enable hidden files to see the `.vs` folder. Find and open the file *cosmosdb1.docker-compose.yml*. Set a 4G or higher memory limit.
135+
1. By default, the memory limit in the container is set to 2G, but normally, more memory is required to run Azure Cosmos DB. To fix this, navigate to the `.vs/sd/<GUID>/local` folder under your solution folder. In Windows Explorer, you might have to enable hidden files to see the `.vs` folder. Find and open the file *cosmosdb1.docker-compose.yml*. Set a 4G or higher memory limit.
133136

134137
```yml
135138
mem_limit = 4G
@@ -140,7 +143,7 @@ The connected service functionality adds all the needed references and connectio
140143
:::moniker-end
141144

142145
> [!NOTE]
143-
> The local emulator for CosmosDB might reference a base image that uses a temporary license for Azure CosmosDB. If the container doesn't start, check the **Logs** tab in the **Containers*** window for the Cosmos DB container. If it mentions a PAL expiration issue, you need to get the latest base image for the local container. Run the following command from the console prompt: `docker pull mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest`. The license is periodically updated, and when it expires, refreshing to the newest container should solve the issue. You can view and report issues for the Azure CosmosDB emulator at the [Azure CosmosDB emulator GitHub repo](https://github.com/Azure/azure-cosmos-db-emulator-docker/issues).
146+
> The local emulator for Azure Cosmos DB might reference a base image that uses a temporary license for Azure Cosmos DB. If the container doesn't start, check the **Logs** tab in the **Containers*** window for the Azure Cosmos DB container. If it mentions a PAL expiration issue, you need to get the latest base image for the local container. Run the following command from the console prompt: `docker pull mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest`. The license is periodically updated, and when it expires, refreshing to the newest container should solve the issue. You can view and report issues for the Azure Cosmos DB emulator at the [Azure Cosmos DB emulator GitHub repo](https://github.com/Azure/azure-cosmos-db-emulator-docker/issues).
144147
145148
## Next steps
146149

@@ -153,7 +156,7 @@ using CosmosClient client = new(
153156
);
154157
```
155158

156-
The `CosmosClient` provides access to Cosmos DB functionality through its various methods. Once you have an instance of `CosmosClient`, you can create a NoSQL database by following this guide: [Create a database in Azure Cosmos DB for NoSQL using .NET](/azure/cosmos-db/nosql/how-to-dotnet-create-database).
159+
The `CosmosClient` provides access to Azure Cosmos DB functionality through its various methods. Once you have an instance of `CosmosClient`, you can create a NoSQL database by following this guide: [Create a database in Azure Cosmos DB for NoSQL using .NET](/azure/cosmos-db/nosql/how-to-dotnet-create-database).
157160

158161
## Related content
159162

0 commit comments

Comments
 (0)