Skip to content

Commit 20e44f9

Browse files
Merge pull request #10320 from MicrosoftDocs/main638573798977651828sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 323572a + f5b8d89 commit 20e44f9

16 files changed

+32
-32
lines changed

docs/containers/container-tools-react.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ ms.subservice: container-tools
99
ms.topic: quickstart
1010
---
1111

12-
# Quickstart: Use Docker with a React Single-page App in Visual Studio
12+
# Quickstart: Use Docker with a React Single-page application in Visual Studio
1313

14-
With Visual Studio, you can easily build, debug, and run containerized ASP.NET Core apps, including those with client-side JavaScript such as React.js single-page app, and publish them to Azure Container Registry, Docker Hub, Azure App Service, or your own Container Registry. In this article, we publish to Azure Container Registry.
14+
With Visual Studio, you can easily build, debug, and run containerized ASP.NET Core apps, including those with client-side JavaScript such as React.js single-page application (SPA), and publish them to Azure Container Registry, Docker Hub, Azure App Service, or your own Container Registry. In this article, we publish to Azure Container Registry.
1515

1616
## Prerequisites
1717

@@ -239,7 +239,7 @@ Use the following steps for Visual Studio 2022 version 17.0 to 17.7:
239239
## Debug
240240
241241
:::moniker range=">=vs-2022"
242-
With Visual Studio 2022 version 17.9 or later and the **React and ASP.NET Core** template that uses `vite.js`, the projects are already configured to start both the client and server projects with debugging support, but you need to set up the right port for the SPA proxy to use to access the ASP.NET Core server running in the container. You can get the host port from the **Containers** window in Visual Studio and set it in the React project as described in [Create a React app - Docker](../javascript/tutorial-asp-net-core-with-react.md#docker).
242+
With Visual Studio 2022 version 17.9 or later and the **React and ASP.NET Core** template that uses `vite.js`, the projects are already configured to start both the client and server projects with debugging support, but you need to set up the right port for the single-page application (SPA) proxy to use to access the ASP.NET Core server running in the container. You can get the host port from the **Containers** window in Visual Studio and set it in the React project as described in [Create a React app - Docker](../javascript/tutorial-asp-net-core-with-react.md#docker).
243243
244244
You can also disable the launch in the browser for the server, which is set up to open with Swagger, which is not required for this scenario. To disable the browser launch, open the **Properties** (**Alt**+**Enter**), go to the **Debug** tab, and click on the link **Open debug launch profiles UI**, and clear the **Launch browser** checkbox.
245245

docs/containers/container-tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ The **Container Tools** option in the **Output** window shows what actions are t
104104

105105
After the build completes, the browser opens and displays your app's home page. In the browser address bar, you can see the `localhost` URL and port number for debugging.
106106

107-
>[!NOTE]
107+
> [!NOTE]
108108
> If you need to change ports for debugging, you can do that in the `launchSettings.json` file. See [Container Launch Settings](container-launch-settings.md).
109109
110110
## Containers window

docs/containers/docker-compose-properties.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ services:
9393
9494
Typically *docker-compose.override.yml* is used to override certain settings in *docker-compose.yml*. Additionally, Visual Studio generates override files *docker-compose.vs.debug.g.yml* (for **Fast** mode) and *docker-compose.vs.release.g.yml* (for **Regular** mode) files with settings that are specific to running the application inside Visual Studio. You can override these Visual Studio settings by placing a file named *docker-compose.vs.debug.yml* (for **Fast** mode) or *docker-compose.vs.release.yml* (for **Regular** mode) in the same directory as your *docker-compose.yml* file. Right click the Docker Compose project and select **Open Folder in File Explorer** , then use **Add** > **Existing Item** to add the file to your Docker Compose project.
9595
96-
>[!TIP]
96+
> [!TIP]
9797
> To find out the default values for any of the Visual Studio settings, look in the intermediate output directory (for example, *obj/Docker*) for *docker-compose.vs.debug.g.yml* or *docker-compose.vs.release.g.yml*. These files are generated by Visual Studio and should not be modified.
9898
9999
### Docker Compose file labels
@@ -125,8 +125,8 @@ Use double quotes around the values, as in the preceding example, and use the ba
125125
|com.microsoft.visualstudio.debuggee.arguments|The arguments passed to the program when starting debugging. For .NET Core apps, these arguments are typically additional search paths for NuGet packages followed by the path to the project's output assembly.|
126126
|com.microsoft.visualstudio.debuggee.workingdirectory|The directory used as the starting directory when starting debugging. This setting is typically */app* for Linux containers, or *C:\app* for Windows containers.|
127127
|com.microsoft.visualstudio.debuggee.killprogram|This command is used to stop the debuggee program that's running inside of the container (when necessary).|
128-
|com.microsoft.visualstudio.debuggee.noattach.program|The program launched when you use **Start without debugging** (**Ctrl**+**F5**) in an Azure Functions project that runs in an [isolated process](/azure/azure-functions/dotnet-isolated-process-guide). Typically both **F5** and **Ctrl**+**F5** uses the same program, but if any project type like Azure Functions in an isolated process requires a different program than **F5**, then this will be used.|
129-
|com.microsoft.visualstudio.debuggee.noattach.arguments|The arguments passed to the program when you use **Start without debugging** (**Ctrl**+**F5**) in an Azure Functions project that runs in an isolated process.|
128+
|com.microsoft.visualstudio.debuggee.noattach.program|The program launched when you use **Start without debugging** (**Ctrl**+**F5**) in an Azure functions project that runs in an [isolated process](/azure/azure-functions/dotnet-isolated-process-guide). Typically both **F5** and **Ctrl**+**F5** uses the same program, but if any project type like Azure Functions in an isolated process requires a different program than **F5**, then this will be used.|
129+
|com.microsoft.visualstudio.debuggee.noattach.arguments|The arguments passed to the program when you use **Start without debugging** (**Ctrl**+**F5**) in an Azure functions project that runs in an isolated process.|
130130
:::moniker-end
131131
132132
### Customize the Docker build process

docs/containers/edit-and-refresh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you have a project and you've added Docker support as described in the [overv
4949

5050
### Edit your Razor pages and refresh
5151

52-
To quickly iterate changes in your Razor pages, you can start your application in a container. Then, continue to make changes, viewing them as you would with IIS Express.
52+
To quickly iterate changes in your Razor pages, you can start your application in a container. Then, continue to make changes, viewing them as you would with Internet Information Services (IIS) Express.
5353

5454
1. Make sure that Docker is set up to use the container type (Linux or Windows) that you are using. Right-click on the Docker icon on the Taskbar, and choose **Switch to Linux containers** or **Switch to Windows containers** as appropriate.
5555

docs/containers/includes/vs-2019/container-tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Select **Docker** from the debug dropdown list in the toolbar, and start debuggi
6969

7070
The **Container Tools** option in the **Output** window shows what actions are taking place. The first time, it might take a while to download the base image, but it's much faster on subsequent runs.
7171

72-
>[!NOTE]
72+
> [!NOTE]
7373
> If you need to change ports for debugging, you can do that in the *launchSettings.json* file. See [Container Launch Settings](../../container-launch-settings.md).
7474
7575
## Containers window

docs/containers/launch-profiles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ In the example below, the `web1` Compose profile is selected, which filters the
9090

9191
!["Screenshot of launch settings dialog box"](media/launch-settings/launch-settings-create-profile.png)
9292

93-
>[!NOTE]
93+
> [!NOTE]
9494
> The Docker Compose profiles section only appears if there are profiles defined in your *docker-compose.yml* files.
9595
9696
The next example demonstrates selecting between individual services instead of filtering to the services in a Compose profile. Here, we show how the dialog would look if you created a new launch profile named `test2` that only starts two out of the five services, `webapplication1` with debugging and `webapplication2` without debugging. This launch profile also launches a browser when the application starts and opens it to the home page of `webapplication1`.

docs/containers/view-and-diagnose-containers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ To open files in Visual Studio, browse to the file and double-click it, or right
141141
![Screenshot of file open for viewing in Visual Studio.](media/view-and-diagnose-containers/vs-2022/container-file-open.png)
142142
:::moniker-end
143143

144-
Using the **Files** tab, you can view application logs such as IIS logs, configuration files, and other content files in your container's filesystem.
144+
Using the **Files** tab, you can view application logs such as Internet Information Services (IIS) logs, configuration files, and other content files in your container's filesystem.
145145

146146
:::moniker range=">=vs-2022"
147147
In Visual Studio 2022 version 17.7 or later, when targeting .NET 8 or later, the Dockerfile might contain the `USER app` command, which specifies to run the app with normal user permissions. The **Files** tab uses those permissions as well, and so you might not be able to view some folders, if those folders are set to require elevated permissions to view.

docs/cross-platform/cross-platform-mobile-development-in-visual-studio.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Build cross-platform mobile applications for Android, iOS, and Wind
44
titleSuffix: ""
55
ms.date: 08/26/2022
66
ms.subservice: mobile-development
7-
ms.topic: "conceptual"
7+
ms.topic: conceptual
88
author: therealjohn
99
ms.author: johmil
1010
---
@@ -15,7 +15,7 @@ You can build apps for Android, iOS, and Windows devices by using Visual Studio.
1515

1616
Build your apps by using C# and the .NET Framework, HTML and JavaScript, or C++. Share code, strings, images, and in some cases even the user interface.
1717

18-
If you want to build a game or immersive graphical app, install Visual Studio tools for Unity and enjoy all of the powerful productivity features of Visual Studio with Unity, the popular cross-platform game/graphics engine and development environment for apps that run on iOS, Android, Windows, and other platforms.
18+
If you want to build a game or immersive graphical app, install Visual Studio Tools for Unity (VSTU) and enjoy all of the powerful productivity features of Visual Studio with Unity, the popular cross-platform game/graphics engine and development environment for apps that run on iOS, Android, Windows, and other platforms.
1919

2020
## Build an app for Android, iOS, and Windows (.NET Framework)
2121

@@ -110,9 +110,9 @@ As you write code in these libraries, you can use IntelliSense to explore the na
110110

111111
<a name="Unity"></a>
112112

113-
## Build a cross-platform game for Android, iOS, and Windows by using Visual Studio tools for Unity
113+
## Build a cross-platform game for Android, iOS, and Windows by using Visual Studio Tools for Unity
114114

115-
Visual Studio Tools for Unity is a free extension for Visual Studio that integrates Visual Studio's powerful code editing, productivity, and debugging tools with *Unity*, the popular cross-platform gaming/graphics engine and development environment for immersive apps that target Windows, iOS, Android, and other platforms including the web.
115+
Visual Studio Tools for Unity (VSTU) is a free extension for Visual Studio that integrates Visual Studio's powerful code editing, productivity, and debugging tools with *Unity*, the popular cross-platform gaming/graphics engine and development environment for immersive apps that target Windows, iOS, Android, and other platforms including the web.
116116

117117
:::image type="content" source="../cross-platform/media/vstu_overview.png" alt-text="Screenshot showing the overview of Visual Studio Tools for Unity and development environment.":::
118118

docs/data-tools/add-custom-controls-to-the-data-sources-window.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To add or remove controls from the list of available controls for items in the D
3434

3535
1. Make sure that the WPF Designer or the Windows Forms Designer is open.
3636

37-
2. In the **Data Sources** window, click an item that is part of a data source you added to the window, and then click the dropdown list menu for the item.
37+
2. In the **Data Sources** window, click an item that is part of a data source you added to the window, and then select the dropdown list menu for the item.
3838

3939
> [!TIP]
4040
> If the Data Sources window isn't open, open it by selecting **View** > **Other Windows** > **Data Sources**.
@@ -60,7 +60,7 @@ To add or remove controls from the list of available controls for items in the D
6060
6161
6. Click **OK**.
6262

63-
7. In the **Data Sources** window, click an item of the data type that you just associated one or more controls, and then click the dropdown list menu for the item.
63+
7. In the **Data Sources** window, click an item of the data type that you just associated one or more controls, and then select the dropdown list menu for the item.
6464

6565
The controls you selected in the **Associated controls** box now appear in the dropdown list menu for the item.
6666

docs/data-tools/bind-wpf-controls-to-a-dataset.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@ Before you can create data-bound controls, you must define a data model for your
7272

7373
The **Data Source Configuration** wizard opens.
7474

75-
3. On the **Choose a Data Source Type** page, select **Database**, and then click **Next**.
75+
3. On the **Choose a Data Source Type** page, select **Database**, and then select **Next**.
7676

77-
4. On the **Choose a Database Model** page, select **Dataset**, and then click **Next**.
77+
4. On the **Choose a Database Model** page, select **Dataset**, and then select **Next**.
7878

7979
5. On the **Choose Your Data Connection** page, select one of the following options:
8080

81-
- If a data connection to the AdventureWorksLT sample database is available in the dropdown list, select it and then click **Next**.
81+
- If a data connection to the AdventureWorksLT sample database is available in the dropdown list, select it, and then select **Next**.
8282

8383
- Click **New Connection**, and create a connection to the AdventureWorksLT database.
8484

85-
6. On the **Save the Connection String to the Application Configure File** page, select the **Yes, save the connection as** checkbox, and then click **Next**.
85+
6. On the **Save the Connection String to the Application Configure File** page, select the **Yes, save the connection as** checkbox, and then select **Next**.
8686

8787
7. On the **Choose Your Database Objects** page, expand **Tables**, and then select the **Product (SalesLT)** table.
8888

@@ -236,7 +236,7 @@ Build and run the application. Verify that you can view and update product recor
236236

237237
- You can click the **>** or **<** buttons to navigate through other product records.
238238

239-
2. In one of the product records, change the **Size** value, and then click **Save changes**.
239+
2. In one of the product records, change the **Size** value, and then select **Save changes**.
240240

241241
3. Close the application, and then restart the application by pressing **F5** in Visual Studio.
242242

docs/data-tools/bind-wpf-controls-to-a-wcf-data-service.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ To expose data to an application by using a WCF Data Service, you must define a
7878

7979
- Click **New Connection**, and create a connection to the AdventureWorksLT database.
8080

81-
6. On the **Choose Your Data Connection** page, make sure that the **Save entity connection settings in App.Config as** option is selected, and then click **Next**.
81+
6. On the **Choose Your Data Connection** page, make sure that the **Save entity connection settings in App.Config as** option is selected, and then select **Next**.
8282

8383
7. On the **Choose Your Database Objects** page, expand **Tables**, and then select the **SalesOrderHeader** table.
8484

@@ -135,15 +135,15 @@ To display the data from the WCF Data Service, create a new WPF application with
135135

136136
The **Data Source Configuration** wizard opens.
137137

138-
7. In the **Choose a Data Source Type** page of the wizard, select **Service**, and then click **Next**.
138+
7. In the **Choose a Data Source Type** page of the wizard, select **Service**, and then select **Next**.
139139

140140
8. In the **Add Service Reference** dialog box, click **Discover**.
141141

142142
Visual Studio searches the current solution for available services, and adds `AdventureWorksService.svc` to the list of available services in the **Services** box.
143143

144144
9. In the **Namespace** box, type **AdventureWorksService**.
145145

146-
10. In the **Services** box, click **AdventureWorksService.svc**, and then click **OK**.
146+
10. In the **Services** box, click **AdventureWorksService.svc**, and then select **OK**.
147147

148148
Visual Studio downloads the service information and then returns to the **Data Source Configuration** wizard.
149149

@@ -293,7 +293,7 @@ Build and run the application to verify that you can view and update customer re
293293

294294
- You can click the **>** or **<** buttons to navigate through other sales records.
295295

296-
5. In one of the sales records, type some text in the **Comment** box, and then click **Save changes**.
296+
5. In one of the sales records, type some text in the **Comment** box, and then select **Save changes**.
297297

298298
6. Close the application, and then start the application again from Visual Studio.
299299

docs/data-tools/connect-to-data-in-an-access-database-windows-forms.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Connect to databases created with Microsoft 365, Access 2016, Access 2013, Acces
7676

7777
8. Choose **Browse** next to **Database file name**, and then navigate to your `.accdb` file and choose **Open**.
7878

79-
>[!NOTE]
79+
> [!NOTE]
8080
> If the bitness (32-bit or 64-bit) of Microsoft Office and Visual Studio do not match, you will see an error while connecting to an Access database. In Visual Studio 2019, you will get an error that the database provider is not registered. In Visual Studio 2022, you will see an error that you can't connect to a 32-bit data provider. To resolve this error, make sure that if you are using a 32-bit version of Office, you are using Visual Studio 2019 or earlier; for a 64-bit version of Office, you need Visual Studio 2022 or later.
8181
8282
9. Enter a user name and password (if necessary), and then choose **OK**.
@@ -140,7 +140,7 @@ Connect to databases created with Microsoft 365, Access 2016, Access 2013, Acces
140140

141141
8. Choose **Browse** next to **Database file name**, and then navigate to your `.accdb` file and choose **Open**.
142142

143-
>[!NOTE]
143+
> [!NOTE]
144144
> If the bitness (32-bit or 64-bit) of Microsoft Office and Visual Studio do not match, you will see an error while connecting to an Access database. In Visual Studio 2019, you will get an error that the database provider is not registered. In Visual Studio 2022, you will see an error that you can't connect to a 32-bit data provider. To resolve this error, make sure that if you are using a 32-bit version of Office, you are using Visual Studio 2019 or earlier; for a 64-bit version of Office, you need Visual Studio 2022 or later.
145145
146146
9. Enter a user name and password (if necessary), and then choose **OK**.

docs/data-tools/could-not-retrieve-schema-information-for-database-object-object-name.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: mijacobs
99
ms.subservice: data-tools
1010
---
1111

12-
# Could not retrieve schema information for database object \<object name>
12+
# Could not retrieve schema information for database object
1313

1414
This message typically appears when an object in **Server Explorer** or **Database Explorer** is copied to the clipboard, deleted from the database, and then pasted onto the designer. Because the database object no longer exists, this message appears.
1515

docs/data-tools/create-a-simple-data-application-by-using-adonet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ To complete the NewCustomer form logic, follow these steps.
225225

226226
### FillOrCancel form
227227

228-
The FillOrCancel form runs a query to return an order when you enter an order ID and then click the **Find Order** button. The returned row appears in a read-only data grid. You can mark the order as canceled (X) if you select the **Cancel Order** button, or you can mark the order as filled (F) if you select the **Fill Order** button. If you select the **Find Order** button again, the updated row appears.
228+
The FillOrCancel form runs a query to return an order when you enter an order ID, and then select the **Find Order** button. The returned row appears in a read-only data grid. You can mark the order as canceled (X) if you select the **Cancel Order** button, or you can mark the order as filled (F) if you select the **Fill Order** button. If you select the **Find Order** button again, the updated row appears.
229229

230230
#### Create autogenerated event handlers
231231

0 commit comments

Comments
 (0)