Skip to content

Commit f368de3

Browse files
Merge pull request #10195 from MicrosoftDocs/main638485382744265074sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents fe57df5 + e912f0a commit f368de3

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

docs/deployment/access-clickonce-deployment-properties-dotnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if (Environment.GetEnvironmentVariable("ClickOnce_IsNetworkDeployed")?.ToLower()
5959

6060
Indirect usage of these properties requires the implementation of a new `ApplicationDeployment` class at the application level. This class abstracts the reading of environment variables and provides a similar experience to the old .NET Framework class.
6161

62-
For a sample implementation of this class, see [ApplicationDeployment.cs](https://github.com/dotnet/deployment-tools/blob/main/Documentation/dotnet-mage/ApplicationDeployment.cs).
62+
For a sample implementation of this class, see [ApplicationDeployment.cs](https://github.com/dotnet/deployment-tools/blob/main/docs/dotnet-mage/ApplicationDeployment.cs).
6363

6464
The following code snippet shows how to use this class:
6565

docs/deployment/clickonce-security-and-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ ClickOnce is a deployment technology that enables you to create self-updating Wi
9696
|[Security Page, Project Designer](../ide/reference/security-page-project-designer.md)|Signs the application and deployment manifests. For .NET Core and .NET 5+, these settings are in the Publish profile.|
9797
|[Publish Page, Project Designer](../ide/reference/publish-page-project-designer.md)|Generates and edits the application and deployment manifests for Visual Basic and Visual C# applications. For .NET Core and .NET 5+, these settings are in the Publish profile.|
9898
|[*Mage.exe* (Manifest Generation and Editing Tool)](/dotnet/framework/tools/mage-exe-manifest-generation-and-editing-tool)|Generates the application and deployment manifests for Visual Basic, Visual C#, and Visual C++ applications.<br /><br /> Signs and re-signs the application and deployment manifests.<br /><br /> Can be run from batch scripts and the command prompt.|
99-
|[*dotnetmage.exe* (Manifest Generation and Editing Tool)](https://github.com/dotnet/deployment-tools/blob/main/Documentation/dotnet-mage/README.md)|Generates the application and deployment manifests for .NET 5+ C# and Visual Basic applications. The usage is equivalent to *Mage.exe*.<br /><br /> Signs and re-signs the application and deployment manifests.<br /><br /> Can be run from batch scripts and the command prompt.|
99+
|[*dotnetmage.exe* (Manifest Generation and Editing Tool)](https://github.com/dotnet/deployment-tools/blob/main/docs/dotnet-mage/README.md)|Generates the application and deployment manifests for .NET 5+ C# and Visual Basic applications. The usage is equivalent to *Mage.exe*.<br /><br /> Signs and re-signs the application and deployment manifests.<br /><br /> Can be run from batch scripts and the command prompt.|
100100
|[*MageUI.exe* (Manifest Generation and Editing Tool, Graphical Client)](/dotnet/framework/tools/mageui-exe-manifest-generation-and-editing-tool-graphical-client)|Generates and edits the application and deployment manifests.<br /><br /> Signs and re-signs the application and deployment manifests.|
101101
|[GenerateApplicationManifest task](../msbuild/generateapplicationmanifest-task.md)|Generates the application manifest.<br /><br /> Can be run from MSBuild. For more information, see [MSBuild reference](../msbuild/msbuild-reference.md).|
102102
|[GenerateDeploymentManifest task](../msbuild/generatedeploymentmanifest-task.md)|Generates the deployment manifest.<br /><br /> Can be run from MSBuild. For more information, see [MSBuild reference](../msbuild/msbuild-reference.md).|

docs/ide/reference/debugexe-devenv-exe.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ devenv /DebugExe ExecutableFile
3333

3434
Any strings following the *ExecutableFile* parameter are passed to that file as arguments.
3535

36+
Visual Studio will parse any strings following the *ExecutableFile* parameter for matches in [Devenv command-line switches](../../ide/reference/devenv-command-line-switches.md). You can prevent Visual Studio from parsing a command-line switch by surrounding the switch with double quotes.
37+
3638
## Example
3739

3840
The following example opens the file `MyApplication.exe` for debugging.

0 commit comments

Comments
 (0)