Merge pull request #7985 from MicrosoftDocs/main637874896201335077

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

Author: ghogen

docs/msbuild/errors/media/msb3325/sign-the-assembly.png

@@ -1,7 +1,7 @@
 ---
 title: "MSB3325: Cannot import the following key file"
 description: "."
-ms.date: "07/22/2021"
+ms.date: "05/05/2022"
 ms.topic: "error-reference"
 f1_keywords:
  - MSB3325
@@ -26,7 +26,7 @@ The full error text is similar to the following example:
 MSB3325: Cannot import the following key file: {0}. The key file may be password protected. To correct this, try to import the certificate again or manually install the certificate to the Strong Name CSP with the following key container name: 'name'
 ```
 
-You could get this error if you checked the **Sign the assembly** option in the **Signing** tab of **Project Properties** and chose a .pfx file for assembly signing. In this case, the strong name public key should get imported to the Cryptographic Service Provider (CSP) on the machine when the .pfx file is selected. When you publish an app, MSBuild tries to sign the assembly. If the signing code could not read the strong name public key from the strong name CSP for any reason, it gives this error.
+You could get this error if you checked the **Sign the assembly** option in the **Project Properties** and chose a .pfx file for assembly signing. In this case, the strong name public key should get imported to the Cryptographic Service Provider (CSP) on the machine when the .pfx file is selected. When you publish an app, MSBuild tries to sign the assembly. If the signing code could not read the strong name public key from the strong name CSP for any reason, it gives this error.
 
 When you get this error for any reason, the workaround is to manually install the .pfx in the strong name Cryptographic Service Provider (CSP) with the key container name specified in the error message.
 
@@ -38,6 +38,10 @@ sn.exe -i <pfx_file> <key_container_name_from_error_message>
 
 After that, the publish process should be able to read the strong name public key from the CSP and strong name sign the assembly.
 
-![Screenshot of Signing tab in Project Properties](media/msb3325/signing-sign-the-assembly.png)
+![Screenshot of Signing tab in Project Properties.](media/msb3325/signing-sign-the-assembly.png)
 
-See [How to: Sign application and deployment manifests](../../ide/how-to-sign-application-and-deployment-manifests.md).
+:::moniker range=">=vs-2022"
+For newer .NET projects, the strong name setting is in the **Build** section of the **Project Properties**:
+
+![Screenshot of the Build > Strong naming section of the Project Properties.](media/msb3325/sign-the-assembly.png)
+:::moniker-end

docs/msbuild/errors/msb3325.md

@@ -1,7 +1,7 @@
 ---
 title: "MSB3327"
 description: "Unable to find code signing certificate in the current user’s Windows certificate store."
-ms.date: "07/22/2021"
+ms.date: "05/05/2022"
 ms.topic: "error-reference"
 f1_keywords:
   - MSB3327
@@ -32,7 +32,13 @@ To resolve this error, try re-importing the .pfx file again in the certificate s
 
 ![Screenshot of signing tab](media/msb3327/signing-install-pfx.png)
 
+:::moniker range="vs-2017"
 See [How to: Sign application and deployment manifests](../../ide/how-to-sign-application-and-deployment-manifests.md).
+:::moniker-end
+
+:::moniker range=">=vs-2019"
+See [How to: Sign application and deployment manifests](../../ide/how-to-sign-application-and-deployment-manifests.md) or for newer .NET projects in Visual Studio 2019 or later, see [Deploy a .NET Windows Desktop application using ClickOnce](../../deployment/quickstart-deploy-using-clickonce-folder.md).
+:::moniker-end
 
 When running in a non-interactive environment, such as a script in a pipeline, use the command-line tool [certutil](/windows-server/administration/windows-commands/certutil).