Merge pull request #10708 from MicrosoftDocs/main638798438273492961sync_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/msbuild/errors/media/msb3176/update-settings.png

@@ -1,7 +1,7 @@
 ---
 title: "MSB3176 diagnostic code"
-description: "Specified minimum required version is greater than the current publish version. Please specify a version less than or equal to the current publish version."
-ms.date: 12/06/2024
+description: Learn about the possible causes of the MSBuild MSB3176 error, and get troubleshooting tips.
+ms.date: 4/7/2025
 ms.topic: "error-reference"
 f1_keywords:
  - MSB3176
@@ -26,14 +26,29 @@ This article describes the MSB3176 error code.
 
 ## Message text
 
-```output
-MSB3176: Specified minimum required version is greater than the current publish version. Please specify a version less than or equal to the current publish version.
-```
+`MSB3176: Specified minimum required version is greater than the current publish version. Please specify a version less than or equal to the current publish version.`
 
 <!-- :::editable-content name="postOutputDescription"::: -->
-<!--
-{StrBegin="MSB3176: "}
--->
+## Description
+
+This error refers to the minimum required version property you specified for the ClickOnce manifest. See [Choose a ClickOnce update strategy - make updates required](../../deployment/choosing-a-clickonce-update-strategy.md#make-updates-required).
+
+This error occurs when the version you specified as the minimum required version is greater than the current version you're building.
+
+## Resolution
+
+Check the minimum required version property and change it so that it is less than or equal to the current version. If a user has a version below this version, they are required to update at least to the minimum required version. The minimum version requirement is optional. If you don't want to require a minimum version, you can turn off this setting.
+
+For .NET applications, in the Visual Studio **Publish** tool, you can change the minimum required version setting by choosing the **Update settings** link on the **Settings** screen.
+
+:::image type="content" source="./media/msb3176/update-settings.png" alt-text="Screenshot showing the Application Settings screen in Visual Studio, reached from the Update Settings link on the Settings page in the Publish wizard." :::
+
+For .NET Framework, Open the Project Properties (**Alt**+**Enter**) and navigate to the **Publish** property page, then select **Updates** to specify the minimum required version.
+
+Or, in the [deployment manifest](../../deployment/deployment-element-clickonce-deployment.md), you can find this property as an attribute of the `deployment` element:
+
+`<deployment install="true" minimumRequiredVersion="1.0.0.0">`
+
 <!-- :::editable-content-end::: -->
 <!-- :::ErrorDefinitionDescription-end::: -->
 

docs/msbuild/errors/msb3176.md

@@ -1,7 +1,7 @@
 ---
 title: "MSB3321 diagnostic code"
-description: "Importing key file 'value' was canceled."
-ms.date: 12/06/2024
+description: Learn about the possible causes of MSBuild error MSB3321 and get troubleshooting tips.
+ms.date: 4/7/2025
 ms.topic: "error-reference"
 f1_keywords:
  - MSB3321
@@ -26,14 +26,23 @@ This article describes the MSB3321 error code.
 
 ## Message text
 
-```output
-MSB3321: Importing key file 'value' was canceled.
-```
+`MSB3321: Importing key file 'filename' was canceled.`
 
 <!-- :::editable-content name="postOutputDescription"::: -->
-<!--
-{StrBegin="MSB3321: "}
--->
+## Description
+
+This error occurs when MSBuild tries to sign a ClickOnce assembly manifest with an Authenticode certificate, but fails to import the private key from the given key file.
+
+During the ClickOnce deployment process, or when running the `Publish` target in MSBuild, an assembly is signed with a strong name Authenticode certificate, either a temporary "devtest" certificate, which you typically use during development, or a trusted certificate issued by a Certificate Authority (CA). The scenario is described at [Build a ClickOnce application from the command line](../../deployment/building-clickonce-applications-from-the-command-line.md). 
+
+In order to use a certificate with a private key in a `.pfx` file, it needs to be verified with a password so the certificate is trusted; it can then be used by MSBuild. When you build and sign a manifest with Visual Studio, you provide the password in Visual Studio when you specify the key filename. However, when you build the same project on another machine, such as a build server, without installing or using Visual Studio, the key must be added to the build server's store of trusted certificates, and verified with the password. After that, it's available to MSBuild to sign a ClickOnce assembly.
+
+## Resolution
+
+If you are building on a machine without Visual Studio installed, such as when setting up a build server, add the Authenticode certificate and private key to the Windows [Trusted Publishers Certificate Store](/windows-hardware/drivers/install/trusted-publishers-certificate-store). You can use [certmgr](/windows-hardware/drivers/devtest/certmgr) to add a certificate to the system store. Once added, it is available to MSBuild when trying to sign an assembly until the certificate expires or is removed.
+
+You can also use *dotnet-mage.exe* for .NET projects, or *mage.exe* (Manifest Assembly Generation) for .NET Framework projects to generate and sign ClickOnce manifests. See [Manually deploy a ClickOnce application](../../deployment/walkthrough-manually-deploying-a-clickonce-application.md).
+
 <!-- :::editable-content-end::: -->
 <!-- :::ErrorDefinitionDescription-end::: -->