Skip to content

Commit

Permalink
Merge pull request #10512 from MicrosoftDocs/main638681798493598508sy…
Browse files Browse the repository at this point in the history
…nc_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error
  • Loading branch information
learn-build-service-prod[bot] authored Nov 26, 2024
2 parents 0c754f5 + 0362997 commit 1ea4024
Show file tree
Hide file tree
Showing 24 changed files with 240 additions and 209 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ The following steps guide you through removing a web or worker role from an Azur

## Related content

- [Configure the Roles for an Azure Cloud Services (extended support) project with Visual Studio.](vs-azure-tools-configure-roles-for-cloud-service.md)
- [Configure the Roles for an Azure Cloud Services (extended support) project with Visual Studio](vs-azure-tools-configure-roles-for-cloud-service.md).
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ You can configure an Azure Cloud Services (extended support) project from Soluti

![Project properties page - development tab](./media/vs-azure-tools-configure-roles-for-cloud-service/project-properties-development-tab.png)

1. In the **Service Configuration** list, select the name of the service configuration that you want to edit.
1. In the **Service Configuration** list, select the name of the service configuration that you want to edit.

![Screenshot showing the Service Configuration list for an Azure Cloud Services (extended support) project.](./media/vs-azure-tools-configure-roles-for-cloud-service/cloud-service-service-configuration-property.png)

Expand Down
6 changes: 3 additions & 3 deletions docs/azure/vs-azure-tools-connected-services-storage.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ The connected service functionality adds all the needed references and connectio

## Understand authentication

After you run the previous procedure, your app is set up to use authentication to access the storage account. The connection information for this authentication are stored locally, if you chose the *secrets.json* method, or in your Azure Key Vault.
After you run the previous procedure, your app is set up to use authentication to access the storage account. The connection information for this authentication are stored locally, if you chose the *secrets.json* method, or in your Azure key vault.

If you used the *secrets.json* file, open the file by using the three dots next to **Secrets.json** on the **Connected Services** tab to open a menu, and choose **Manage user secrets**. With Visual Studio 2022 version 17.12 and later, this file contains settings that reference a Uri to obtain the secure connection string, rather than the connection string itself.
If you used the *secrets.json* file, open the file by using the three dots next to **Secrets.json** on the **Connected Services** tab to open a menu, and choose **Manage user secrets**. With Visual Studio 2022 version 17.12 and later, this file contains settings that reference a URI to obtain the secure connection string, rather than the connection string itself.

```json
{
Expand All @@ -141,7 +141,7 @@ If you used the *secrets.json* file, open the file by using the three dots next
}
```

With these settings in Visual Studio 17.12 and later, authentication is automatic and flexible. When you run or debug locally from Visual Studio, your Azure credentials saved by Visual Studio are used to access the Azure storage account. If you launch your app from the command-line, you first need to sign in using the Azure CLI, and those credentials are automatically detected and used. But when your app is deployed to Azure and runs in Azure, it uses managed identity, without any code changes. The authentication works in all hosting environments because the Azure Identity APIs check for all chained credentials in sequence and use them when they're found. See [DefaultAzureCredential](/dotnet/api/azure.identity.defaultazurecredential?view=azure-dotnet&preserve-view=true).
With these settings in Visual Studio 17.12 and later, authentication is automatic and flexible. When you run or debug locally from Visual Studio, your Azure credentials saved by Visual Studio are used to access the Azure Storage account. If you launch your app from the command-line, you first need to sign in using the Azure CLI, and those credentials are automatically detected and used. But when your app is deployed to Azure and runs in Azure, it uses managed identity, without any code changes. The authentication works in all hosting environments because the Azure Identity APIs check for all chained credentials in sequence and use them when they're found. See [DefaultAzureCredential](/dotnet/api/azure.identity.defaultazurecredential?view=azure-dotnet&preserve-view=true).

:::moniker-end

Expand Down
2 changes: 1 addition & 1 deletion docs/azure/vs-azure-tools-publishing-a-cloud-service.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ When you publish your Azure application, you can do one of the following tasks:
1. On the shortcut menu for the Azure project, choose **Package**.

1. In the **Package Azure Application** dialog box, choose the service configuration for which you want to create a package, and then choose the build configuration.

1. (Optional) To turn on Remote Desktop for the cloud service after you publish it, select **Enable Remote Desktop for all Roles**, and then select **Settings** to configure Remote Desktop credentials. For more information, see [Enable Remote Desktop Connection for a Role in Azure Cloud Services using Visual Studio](/azure/cloud-services/cloud-services-role-enable-remote-desktop-visual-studio).

1. To create the package, choose the **Package** link.
Expand Down
2 changes: 1 addition & 1 deletion docs/azure/vs-key-vault-add-connected-service.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Before you begin, make sure that you're signed in to Visual Studio. Sign in with

![Screenshot showing Select your subscription.](./media/vs-key-vault-add-connected-service/key-vault-connected-service-select-vault.png)

1. If you don't have an existing Key Vault, or if you need a Key Vault that you can set with different permissions than an existing one, click on **Create new Key Vault**. You'll be asked to provide the resource group, location, and SKU.
1. If you don't have an existing Key Vault, or if you need a key vault that you can set with different permissions than an existing one, click on **Create new Key Vault**. You'll be asked to provide the resource group, location, and SKU.

![Screenshot of "Create Azure Key Vault" screen.](./media/vs-key-vault-add-connected-service/create-new-key-vault.png)

Expand Down
2 changes: 1 addition & 1 deletion docs/containers/container-build-from-command-line.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Build a containerized Visual Studio project from the command line
author: ghogen
description: Build a container project in Visual Studio using the command line, either with MSBuild.exe or using docker build, and learn how to enable detailed build logs.
description: Build a container project in Visual Studio using the command line, either with MSBuild.exe or using Docker build, and learn how to enable detailed build logs.
ms.author: ghogen
ms.date: 09/17/2024
ms.subservice: container-tools
Expand Down
2 changes: 1 addition & 1 deletion docs/containers/container-debug-customization.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,4 @@ You can use `aotstage` in the Dockerfile to customize the image used at debug ti
## Related content

- [Customize Docker containers in Visual Studio](container-build.md)
- [Build a container project from the command line](container-build-from-command-line.md)
- [Build a container project from the command line](container-build-from-command-line.md)
8 changes: 4 additions & 4 deletions docs/containers/container-launch-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ The following table shows the properties that can be set in this section:
|Container run arguments| containerRunArguments<br/>ContainerRunArguments|`"containerRunArguments": "-l mylabel=value"`| Additional arguments to pass to the [`docker run`](https://docs.docker.com/engine/reference/commandline/run/) command. <br><br/> (Use the lowercase version in Visual Studio 17.12 and later. The uppercase version was introduced in Visual Studio 17.9 and is provided for backward compatibility.) <br/><br/> You can use the following replacement tokens:<br/><br/> - `{ProjectDir}` - Full path to the project directory. <br/><br/> - `{OutDir}` - The value of the MSBuild property OutDir. |
|N/A|DockerfileRunArguments|`dockerfileRunArguments": "-l mylabel=value"`|Like `containerRunArguments`, but only for projects that use the Dockerfile build type. For Visual Studio 17.12 and later, it is recommended to use `containerRunArguments` instead.|
|Environment Variables| environmentVariables | `"environmentVariables":` {<br/> `"ASPNETCORE_URLS": "https://+:443;http://+:80"`, <br/> `"ASPNETCORE_HTTPS_PORT": "44381"` <br/> } | These environment variable values are passed to the process when it's launched in the container. |
|Container Name| containerName | `mycontainer` | (17.12 and later) A name for the container matching the regular expression `[a-zA-Z0-9][a-zA-Z0-9_.-]`.|
|Container Name| containerName | `mycontainer` | (17.12 and later) A name for the container matching the regular expression `[a-zA-Z0-9][a-zA-Z0-9_.-]`.|
|Container environment files| containerRunEnvironmentFiles | `"containerRunEnvironmentFiles": "abc.env;xyz.env"` | (17.12 and later) A list of environment variable files (`.env` files) separated by semicolons. See [.env file syntax](https://docs.docker.com/compose/how-tos/environment-variables/variable-interpolation/#env-file-syntax). |
|Http Port| httpPort | `"httpPort": 24051` | This port on the host is mapped to the container's port 80 when launching the container. |
|HTTP Port| httpPort | `"httpPort": 24051` | This port on the host is mapped to the container's port 80 when launching the container. |
|Launch Browser| launchBrowser | `"launchBrowser": true` | Indicates whether to launch the browser after successfully launching the project. |
|N/A| launchBrowserTimeout | `"launchBrowserTimeout": 1` | The maximum amount of time (in seconds) to wait for the app to be ready before launching the browser (Docker Compose only). |
|Url | launchUrl | `"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}"` | This URL is used when launching the browser. Supported replacement tokens for this string are: <br/><br/> - `{Scheme}` - Replaced with either `http` or `https`, depending on whether SSL is used. <br/><br/> - `{ServiceHost}` - Usually replaced with `localhost`. <br/> When you're targeting Windows containers on Windows 10 RS3 or older, though, it's replaced with the container's IP. <br/><br/> - `{ServicePort}` - Usually replaced with either sslPort or httpPort, depending on whether SSL is used. <br/> When you're targeting Windows containers on Windows 10 RS3 or older, though, it's replaced with either `443` or `80`, depending on whether SSL is used. |
|URL | launchUrl | `"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}"` | This URL is used when launching the browser. Supported replacement tokens for this string are: <br/><br/> - `{Scheme}` - Replaced with either `http` or `https`, depending on whether SSL is used. <br/><br/> - `{ServiceHost}` - Usually replaced with `localhost`. <br/> When you're targeting Windows containers on Windows 10 RS3 or older, though, it's replaced with the container's IP. <br/><br/> - `{ServicePort}` - Usually replaced with either sslPort or httpPort, depending on whether SSL is used. <br/> When you're targeting Windows containers on Windows 10 RS3 or older, though, it's replaced with either `443` or `80`, depending on whether SSL is used. |
| Publish all ports | publishAllPorts | `"publishAllPorts": true` | If true, pass `-P` to `docker run`, which publishes all exposed ports to a random port. See [Docker documentation](https://docs.docker.com/engine/reference/commandline/run/). However, when you specify `sslPort`, Visual Studio still passes `-p 5002:443`, so your service should still be listening on port 5002.|
| Ssl Port| sslPort | `"sslPort": 44381` | This port on the host is mapped to the container's port 443 when launching the container. |
| SSL Port| sslPort | `"sslPort": 44381` | This port on the host is mapped to the container's port 443 when launching the container. |
| N/A | useSSL | `"useSSL": true` | Indicates whether to use SSL when launching the project. If `useSSL` isn't specified, then SSL is used when `sslPort > 0`. |

Not all settings are available in the UI, for example, `useSSL`. To change those settings, edit `launchSettings.json` directly.
Expand Down
3 changes: 1 addition & 2 deletions docs/containers/container-volume-mapping.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ms.topic: how-to


#customer intent: As a developer, I want to customize the volumes on my application's container so that I can access the files from my running app.

---

# Customize container volume mapping
Expand All @@ -36,7 +35,7 @@ Here are the volumes that are mounted in your container:
:::moniker-end

::: moniker range=">=vs-2022"
Here are the volumes that are mounted in your container. What you see in your containers might differ depending on the minor version of Visual Studio 2022 you are using.
Here are the volumes that are mounted in your container. What you see in your containers might differ depending on the minor version of Visual Studio 2022 you are using.

|Volume|Description|
|-|-|
Expand Down
2 changes: 1 addition & 1 deletion docs/containers/edit-and-refresh.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ To quickly iterate changes in your Razor pages, you can start your application i
Application started. Press Ctrl+C to shut down.
```

Your changes have been applied!
Your changes have been applied!

### Debug with breakpoints

Expand Down
2 changes: 1 addition & 1 deletion docs/containers/tutorial-multicontainer.md
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ Congratulations, you're running a Docker Compose application with a custom Docke
> [!NOTE]
> In real-world code, you shouldn't dispose `HttpClient` after every request. For best practices, see [Use HttpClientFactory to implement resilient HTTP requests](/dotnet/architecture/microservices/implement-resilient-applications/use-httpclientfactory-to-implement-resilient-http-requests).

The Uri given references a service name defined in the *docker-compose.yml* file. Docker Compose sets up a default network for communication between containers using the listed service names as hosts.
The URI given references a service name defined in the *docker-compose.yml* file. Docker Compose sets up a default network for communication between containers using the listed service names as hosts.

The code shown here works with .NET 8 and later, which sets up a user account in the Dockerfile without administrator privileges, and exposes port 8080 because the HTTP default port 80 is not accessible without elevated privilege.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ You can create a typed <xref:System.Data.DataSet> class in Visual Studio at desi

- SQL Server Express LocalDB. If you don't have SQL Server Express LocalDB, you can install it from the [SQL Server download page](https://www.microsoft.com/sql-server/sql-server-downloads).


## Create a new dataset by using the Data Source Configuration Wizard

1. Open your project in Visual Studio, and then choose **Project** > **Add New Data Source** to start the **Data Source Configuration Wizard**.
Expand Down
2 changes: 1 addition & 1 deletion docs/debugger/autos-and-locals-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ To see the return values of the `sumVars()` and `subtractVars()` method calls in
1. Start debugging, and when execution pauses at the breakpoint, select **Step Over** or press **F10**. You should see the following return values in the **Autos** window:

::: moniker range=">= vs-2022"
[ ![Screenshot of Autos return value C#.](../debugger/media/vs-2022/autos-return-value-csharp-2.png "Autos return value C#") ](../debugger/media/vs-2022/autos-return-value-csharp-2.png#lightbox)
[ ![Screenshot of Autos return value C#.](../debugger/media/vs-2022/autos-return-value-csharp-2.png "Autos return value C#")](../debugger/media/vs-2022/autos-return-value-csharp-2.png#lightbox)
::: moniker-end
::: moniker range="vs-2019"
![Screenshot of Autos return value C#.](../debugger/media/autosreturnvaluecsharp2.png "Autos return value C#")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ A buffer that is filled in with the requested data. Can't be `NULL`.
## See also

- [`IDiaStackWalkHelper`](../../debugger/debug-interface-access/idiastackwalkhelper.md)
- [PE Format - The `.pdata` Section](/windows/win32/debug/pe-format#the-pdata-section)
- [PE Format - The `.pdata` Section](/windows/win32/debug/pe-format#the-pdata-section)
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ms.author: "mikejo"
manager: mijacobs
ms.subservice: debug-diagnostics
---

# IDiaSymbol::get_isCTypes

Retrieves a flag indicating whether the symbol file contains C types.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ms.author: "mikejo"
manager: mijacobs
ms.subservice: debug-diagnostics
---

# IDiaSymbol::get_isCVTCIL

Retrieves a flag indicating whether the module was converted from a Common Intermediate Language (CIL) module to a native module.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ ms.author: "grantri"
manager: twhitney
ms.subservice: debug-diagnostics
---

# IDiaSymbol::get_isCxxReturnUdt

Retrieves a flag indicating whether return C++ style UDT.

## Syntax

```C++
HRESULT get_isCxxReturnUdt ( 
HRESULT get_isCxxReturnUdt (
BOOL* pRetVal
);
```
Expand Down
Loading

0 comments on commit 1ea4024

Please sign in to comment.