Merge pull request MicrosoftDocs#10383 from MicrosoftDocs/main638612425881980715sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

docs/containers/docker-compose-properties.md

@@ -14,7 +14,7 @@ In addition to the properties that control individual Docker projects, described
 
 ## How to set the MSBuild properties
 
-To set the value of a property, edit the project file. For Docker Compose properties, this project file is the one with a .dcproj extension, unless otherwise indicated in the table in the next section. For example, suppose you want to specify to launch the browser when you start debugging. You can set the `DockerLaunchAction` property in the .dcproj project file as follows.
+To set the value of a property, edit the project file. For Docker Compose properties, this project file is the one with a `.dcproj` extension, unless otherwise indicated in the table in the next section. For example, suppose you want to specify to launch the browser when you start debugging. You can set the `DockerLaunchAction` property in the `.dcproj` project file as follows.
 
 ```xml
 <PropertyGroup>
@@ -34,7 +34,7 @@ The following table shows the MSBuild properties available for Docker Compose pr
 |DockerComposeBaseFilePath|dcproj|Specifies the first part of the filenames of the Docker Compose files, without the `.yml` extension. For example: <br>1. DockerComposeBaseFilePath = null/undefined: use the base file path `docker-compose`, and files will be named *docker-compose.yml* and *docker-compose.override.yml*.<br>2. DockerComposeBaseFilePath = *mydockercompose*: files will be named *mydockercompose.yml* and *mydockercompose.override.yml*.<br> 3. DockerComposeBaseFilePath = *..\mydockercompose*: files will be up one level. |`docker-compose`|
 |DockerComposeBuildArguments|dcproj|Specifies the extra parameters to pass to the `docker-compose build` command. For example, `--parallel --pull`. |
 |DockerComposeDownArguments|dcproj|Specifies the extra parameters to pass to the `docker-compose down` command. For example, `--timeout 500`.|-|
-| DockerComposeEnvFilePath | dcproj | The relative path to an .env file that will be passed to `docker compose` commands via `--env-file`. See [Substitute with a .env file](https://docs.docker.com/compose/environment-variables/set-environment-variables/#substitute-with-an-env-file). | Empty |
+| DockerComposeEnvFilePath | dcproj | The relative path to an .env file that's passed to `docker compose` commands via `--env-file`. See [Substitute with a .env file](https://docs.docker.com/compose/environment-variables/set-environment-variables/#substitute-with-an-env-file). | Empty |
 |DockerComposeProjectName| dcproj | If specified, overrides the project name for a Docker Compose project. | "dockercompose" + auto-generated hash |
 |DockerComposeProjectPath|csproj or vbproj|The relative path to the Docker Compose project (dcproj) file. Set this property when publishing the service project to find the associated image build settings stored in the docker-compose.yml file.|-|
 |DockerComposeProjectsToIgnore|dcproj| Specifies projects to be ignored by Docker Compose tools during debug. This property can be used for any project. File paths can be specified one of two ways: <br> 1. Relative to dcproj. For example, `<DockerComposeProjectsToIgnore>path\to\AngularProject1.csproj</DockerComposeProjectsToIgnore>`. <br> 2. Absolute paths.<br> **Note**: The paths should be separated by the delimiter character `;`.|-|
@@ -127,6 +127,7 @@ Use double quotes around the values, as in the preceding example, and use the ba
 |com.microsoft.visualstudio.debuggee.killprogram|This command is used to stop the debuggee program that's running inside of the container (when necessary).|
 |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.|
 |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.|
+|com.microsoft.visual-studio.project-name|The name of the project, which helps Visual Studio find the project if the project is not in the same folder as the Dockerfile.|
 :::moniker-end
 
 ### Customize the Docker build process

docs/msbuild/signfile-task.md

@@ -1,7 +1,7 @@
 ---
 title: "SignFile Task"
 description: Learn how MSBuild uses the SignFile task to sign the specified file using the specified certificate.
-ms.date: "05/27/2022"
+ms.date: "9/5/2024"
 ms.topic: "reference"
 f1_keywords:
   - "http://schemas.microsoft.com/developer/msbuild/2003#SignFile"
@@ -57,15 +57,15 @@ SignFile requires either Visual Studio or a Windows 8.1 SDK to be installed, in
     </PropertyGroup>
     <Target Name="Sign">
         <SignFile
-            CertificateThumbprint="$(CertificateThumbprint)"
+            CertificateThumbprint="$(CERTIFICATE_THUMBPRINT)"
             SigningTarget="@(FileToSign)"
             TargetFrameworkVersion="v4.5" />
     </Target>
 </Project>
 ```
 
 > [!NOTE]
-> The certificate thumbprint is the SHA-1 hash of the certificate. For more information, see [Obtain the SHA-1 hash of a trusted root CA certificate](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/cc733076\(v\=ws.10\)). If you copy and paste the thumbprint from the certificate details, make sure you do not include the extra (3F) invisible character, which may prevent `SignFile` from finding the certificate.
+> The certificate thumbprint is the SHA-1 hash of the certificate. The example here assumes an environment variable `CERTIFICATE_THUMBPRINT` that contains the thumbprint. For more information, see [Obtain the SHA-1 hash of a trusted root CA certificate](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/cc733076\(v\=ws.10\)). If you copy and paste the thumbprint from the certificate details, make sure you do not include the extra (3F) invisible character, which may prevent `SignFile` from finding the certificate.
 
 ## See also