Skip to content

Commit 09010c3

Browse files
authored
Merge pull request #4838 from MicrosoftDocs/master637179268523507861
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents a2717e7 + bf2e9d4 commit 09010c3

File tree

33 files changed

+99
-184
lines changed

33 files changed

+99
-184
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4880,6 +4880,11 @@
48804880
"redirect_url": "/visualstudio/porting/port-migrate-and-upgrade-visual-studio-projects",
48814881
"redirect_document_id": false
48824882
},
4883+
{
4884+
"source_path": "docs/profiling/walkthrough-command-line-profiling-using-sampling.md",
4885+
"redirect_url": "/visualstudio/profiling/command-line-profiling-of-stand-alone-applications",
4886+
"redirect_document_id": false
4887+
},
48834888
{
48844889
"source_path": "docs/profiling/analyze-cpu-usage-in-a-windows-universal-app.md",
48854890
"redirect_url": "/visualstudio/profiling/beginners-guide-to-performance-profiling",

docs/debugger/graphics/getting-started-with-visual-studio-graphics-diagnostics.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ In this section you'll prepare to use Graphics Diagnostics for the first time, t
2929

3030
1. In Search, type **Apps and features** and then open the **Apps & features** settings.
3131

32-
2. On the right-hand side of the **Apps & features** dialog, choose **Manage optional features** (under **Apps & features**).
32+
2. On the right-hand side of the **Apps & features** settings, choose **Optional features** (under **Apps & features**).
3333

34-
The **Manage optional features** dialog appears.
34+
The **Optional features** settings appear.
3535

36-
3. In the **Manage optional features** dialog, choose **Add a feature**. A list of optional features you can install appears.
36+
3. In the **Optional features** settings, choose **Add a feature**. A list of optional features you can install appears.
3737

3838
4. Select **Graphics Tools** from the list of features, then choose **Install**.
3939

docs/debugger/how-to-debug-an-executable-not-part-of-a-visual-studio-solution.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: "Debug an app that isn't part of a Visual Studio solution"
33
titleSuffix: ""
4-
ms.custom: "seodec18"
5-
ms.date: "11/19/2018"
4+
ms.custom: ""
5+
ms.date: "02/21/2020"
66
ms.topic: "conceptual"
77
dev_langs:
88
- "CSharp"
@@ -23,13 +23,15 @@ ms.workload:
2323
---
2424
# Debug an app that isn't part of a Visual Studio solution (C++, C#, Visual Basic, F#)
2525

26-
You may want to debug an app (*.exe* file) that isn't part of a Visual Studio solution. You or someone else may have created the app outside of Visual Studio, or you got the app from somewhere else.
26+
You may want to debug an app (*.exe* file) that isn't part of a Visual Studio solution. It may be an [open folder](../ide/develop-code-in-visual-studio-without-projects-or-solutions.md) project, or you or someone else may have created the app outside of Visual Studio, or you got the app from somewhere else.
2727

28-
The usual way to debug an app that doesn't exist in Visual Studio is to start the app outside of Visual Studio, and then attach to it using **Attach to Process** in the Visual Studio debugger. For more information, see [Attach to running processes](../debugger/attach-to-running-processes-with-the-visual-studio-debugger.md).
28+
- For an open folder project in Visual Studio (which has no project or solution file), see [Run and debug your code](../ide/develop-code-in-visual-studio-without-projects-or-solutions.md#run-and-debug-your-code) or, for C++, [Configure debugging parameters with launch.vs.json](/cpp/build/open-folder-projects-cpp#configure-debugging-parameters-with-launchvsjson).
2929

30-
Attaching to an app requires manual steps that take a few seconds. Because of this delay, attaching won't help debug a startup issue, or an app that doesn't wait for user input and finishes quickly.
30+
- For an app that doesn't exist in Visual Studio, the usual way to debug is to start the app outside of Visual Studio, and then attach to it using **Attach to Process** in the Visual Studio debugger. For more information, see [Attach to running processes](../debugger/attach-to-running-processes-with-the-visual-studio-debugger.md).
3131

32-
In these situations, you can create a Visual Studio EXE project for the app, or import it into an existing C#, Visual Basic, or C++ solution. Not all programming languages support EXE projects.
32+
Attaching to an app requires manual steps that take a few seconds. Because of this delay, attaching won't help debug a startup issue, or an app that doesn't wait for user input and finishes quickly.
33+
34+
In these situations, you can create a Visual Studio EXE project for the app, or import it into an existing C#, Visual Basic, or C++ solution. Not all programming languages support EXE projects.
3335

3436
>[!IMPORTANT]
3537
>Debugging features for an app that wasn't built in Visual Studio are limited, whether you attach to the app or add it to a Visual Studio solution.

docs/deployment/how-to-include-prerequisites-with-a-clickonce-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ Before you can distribute prerequisite software with a [!INCLUDE[ndptecclick](..
2525

2626
3. In Notepad, open the *Package.xml* file.
2727

28-
4. Locate the **Name** element that contains **http://go.microsoft.com/fwlink**, and copy the URL. Include the **LinkID** portion.
28+
4. Locate the **Name** element that contains `http://go.microsoft.com/fwlink`, and copy the URL. Include the **LinkID** portion.
2929

3030
> [!NOTE]
31-
> If no **Name** element contains **http://go.microsoft.com/fwlink**, open the **Product.xml** file in the root folder for the prerequisite and locate the **fwlink** string.
31+
> If no **Name** element contains `http://go.microsoft.com/fwlink`, open the **Product.xml** file in the root folder for the prerequisite and locate the **fwlink** string.
3232
3333
> [!IMPORTANT]
3434
> Some prerequisites have multiple installer packages (for example, for 32-bit or 64-bit systems). If multiple **Name** elements contain **fwlink**, you must repeat the remaining steps for each of them.

docs/deployment/how-to-specify-the-location-where-end-users-will-install-from.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The `Installation URL` property can be set on the **Publish** page of the **Proj
3434

3535
2. Click the **Publish** tab.
3636

37-
3. In the Installation URL field, enter the installation location using a fully qualified URL using the format *http://www.microsoft.com/ApplicationName*, or a UNC path using the format *\\\Server\ApplicationName*.
37+
3. In the Installation URL field, enter the installation location using a fully qualified URL using the format `https://www.contoso.com/ApplicationName`, or a UNC path using the format `\Server\ApplicationName`.
3838

3939
## See also
4040
- [How to: Specify where Visual Studio copies the files](../deployment/how-to-specify-where-visual-studio-copies-the-files.md)

docs/deployment/server-and-client-configuration-issues-in-clickonce-deployments.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ If you use Internet Information Services (IIS) on Windows Server, and your deplo
4343
## ClickOnce and proxy authentication
4444
[!INCLUDE[ndptecclick](../deployment/includes/ndptecclick_md.md)] provides support for Windows Integrated proxy authentication starting in .NET Framework 3.5. No specific machine.config directives are required. [!INCLUDE[ndptecclick](../deployment/includes/ndptecclick_md.md)] does not provide support for other authentication protocols such as Basic or Digest.
4545

46-
You can also apply a hotfix to .NET Framework 2.0 to enable this feature. For more information, see http://go.microsoft.com/fwlink/?LinkId=158730.
46+
You can also apply a hotfix to .NET Framework 2.0 to enable this feature. For more information, see [FIX: Error message when you try to install a ClickOnce application that you created in the .NET Framework 2.0 onto a client computer that is configured to use a proxy server: "Proxy authentication required"](https://support.microsoft.com/help/917952/fix-error-message-when-you-try-to-install-a-clickonce-application-that).
4747

4848
For more information, see [\<defaultProxy> element (network settings)](/dotnet/framework/configure-apps/file-schema/network/defaultproxy-element-network-settings).
4949

@@ -112,7 +112,7 @@ If you use Internet Information Services (IIS) on Windows Server, and your deplo
112112

113113
- If you create a MIME type with extension "<em>" and the MIME type "application/octet-stream," it will allow files of unblocked file type to be downloaded. (However, blocked file types such as *.aspx</em> and *.asmx* cannot be downloaded.)
114114

115-
For specific instructions on configuring MIME types on Windows Server, refer to Microsoft Knowledge Base article KB326965, "IIS 6.0 does not serve unknown MIME types" at [http://support.microsoft.com/default.aspx?scid=kb;en-us;326965](http://support.microsoft.com/default.aspx?scid=kb;en-us;326965).
115+
For specific instructions on configuring MIME types on Windows Server, see [How to add a MIME type to a Web site or application](/iis/configuration/system.webserver/staticcontent/mimemap#how-to-add-a-mime-type-to-a-web-site-or-application).
116116

117117
## Content type mappings
118118
When publishing over HTTP, the content type (also known as MIME type) for the *.application* file should be "application/x-ms-application." If you have .NET Framework 2.0 installed on the server, this will be set for you automatically. If this is not installed, then you need to create a MIME type association for the [!INCLUDE[ndptecclick](../deployment/includes/ndptecclick_md.md)] application vroot (or entire server).

docs/extensibility/commandtable-element.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ CommandTable is the root element of the *.vsct* file. This is the file that defi
4040

4141
| Attribute | Description |
4242
|-----------| - |
43-
| xmlns | Required. XML namespaces:<br /><br /> xmlns="<http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable>"<br /><br /> xmlns:xs="<http://www.w3.org/2001/XMLSchema>" |
43+
| xmlns | Required. XML namespaces:<br /><br /> `xmlns=http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable`<br /><br /> xmlns:xs="<http://www.w3.org/2001/XMLSchema>" |
4444
| language | Optional. The language attribute may be used to specify the default language of all \<Strings> elements in the command table. If the language is not specified, the language of the current process will be used:<br /><br /> language="en-us" |
4545

4646
### Child Elements

docs/ide/editorconfig-code-style-settings-reference.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: .NET coding convention settings For EditorConfig
3-
ms.date: 06/14/2018
3+
ms.date: 02/21/2020
44
ms.topic: reference
55
helpviewer_keywords:
66
- coding conventions [EditorConfig]
@@ -16,7 +16,7 @@ ms.workload:
1616
---
1717
# .NET coding convention settings for EditorConfig
1818

19-
You can define and maintain consistent code style in your codebase with the use of an [EditorConfig](../ide/create-portable-custom-editor-options.md) file. EditorConfig includes several core formatting properties, such as `indent_style` and `indent_size`. In Visual Studio, .NET coding conventions settings can also be configured by using an EditorConfig file. You can enable or disable individual .NET coding conventions and configure the degree to which you want each rule enforced, via a severity level.
19+
You can define and maintain consistent code style in your codebase by using an [EditorConfig](../ide/create-portable-custom-editor-options.md) file. EditorConfig includes several core formatting properties, such as `indent_style` and `indent_size`. In Visual Studio, .NET coding conventions settings can also be configured by using an EditorConfig file. You can enable or disable individual .NET coding conventions and configure the degree to which you want each rule enforced, via a severity level.
2020

2121
> [!TIP]
2222
> - When you define coding conventions in an EditorConfig file, you're configuring how you want the [code style analyzers](../code-quality/roslyn-analyzers-overview.md) that are built into Visual Studio to analyze your code. The EditorConfig file is the configuration file for these analyzers.
@@ -40,7 +40,7 @@ There are three supported .NET coding convention categories:
4040

4141
## Example EditorConfig file
4242

43-
To help you get started, here is an example *.editorconfig* file with the default options:
43+
To help you get started, here is an example *.editorconfig* file with the default options. In Visual Studio, you can generate this file and save it to a project at **Tools** > **Options** > **Text Editor** > [**C#** or **Basic**] > **Code Style** > **General**. Then, click the **Generate .editorconfig file from settings** button. For more information, see [Code style preferences](code-styles-and-code-cleanup.md).
4444

4545
```ini
4646
###############################
@@ -64,9 +64,9 @@ charset = utf-8-bom
6464
###############################
6565

6666
[*.{cs,vb}]
67+
6768
# Organize usings
6869
dotnet_sort_system_directives_first = true
69-
dotnet_separate_import_directive_groups = false
7070

7171
# this. preferences
7272
dotnet_style_qualification_for_field = false:silent
@@ -107,8 +107,7 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
107107

108108
# Style Definitions
109109
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
110-
111-
# Use PascalCase for constant fields
110+
# Use PascalCase for constant fields
112111
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
113112
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
114113
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
@@ -117,10 +116,11 @@ dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
117116
dotnet_naming_symbols.constant_fields.required_modifiers = const
118117

119118
###############################
120-
# C# Code Style Rules #
119+
# C# Coding Conventions #
121120
###############################
122121

123122
[*.cs]
123+
124124
# var preferences
125125
csharp_style_var_for_built_in_types = true:silent
126126
csharp_style_var_when_type_is_apparent = true:silent
@@ -134,7 +134,7 @@ csharp_style_expression_bodied_properties = true:silent
134134
csharp_style_expression_bodied_indexers = true:silent
135135
csharp_style_expression_bodied_accessors = true:silent
136136

137-
# Pattern-matching preferences
137+
# Pattern matching preferences
138138
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
139139
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
140140

@@ -182,18 +182,17 @@ csharp_space_around_binary_operators = before_and_after
182182
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
183183
csharp_space_between_method_call_name_and_opening_parenthesis = false
184184
csharp_space_between_method_call_empty_parameter_list_parentheses = false
185-
csharp_space_after_comma = true
186-
csharp_space_after_dot = false
187185

188186
# Wrapping preferences
189187
csharp_preserve_single_line_statements = true
190188
csharp_preserve_single_line_blocks = true
191189

192-
##################################
193-
# Visual Basic Code Style Rules #
194-
##################################
190+
###############################
191+
# VB Coding Conventions #
192+
###############################
195193

196194
[*.vb]
195+
197196
# Modifier preferences
198197
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
199198
```
@@ -202,4 +201,5 @@ visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public
202201

203202
- [Quick Actions](../ide/quick-actions.md)
204203
- [Create portable custom editor options](../ide/create-portable-custom-editor-options.md)
205-
- [.NET Compiler Platform's .editorconfig file](https://github.com/dotnet/roslyn/blob/master/.editorconfig)
204+
- [.NET Compiler Platform "Roslyn" .editorconfig file](https://github.com/dotnet/roslyn/blob/master/.editorconfig)
205+
- [.NET Compiler Platform Runtime .editorconfig file](https://github.com/dotnet/runtime/blob/master/.editorconfig)

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,18 @@ The following table lists the LCIDs of the languages supported by Visual Studio.
4747
|--------------|----------|
4848
|Chinese (Simplified)|2052|
4949
|Chinese (Traditional)|1028|
50+
|Czech|1029|
5051
|English|1033|
5152
|French|1036|
5253
|German|1031|
5354
|Italian|1040|
5455
|Japanese|1041|
5556
|Korean|1042|
57+
|Polish|1045|
58+
|Portuguese (Brazil)|1046|
59+
|Russian|1049|
5660
|Spanish|3082|
61+
|Turkish|1055
5762

5863
## Example
5964

docs/msbuild/common-msbuild-project-properties.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ The following table lists frequently used properties that are defined in the Vis
6262
| FileAlignment | Specifies, in bytes, where to align the sections of the output file. Valid values are 512, 1024, 2048, 4096, 8192. This property is equivalent to the `/filealignment` compiler switch. |
6363
| FrameworkPathOverride | Specifies the location of *mscorlib.dll* and *microsoft.visualbasic.dll*. This parameter is equivalent to the `/sdkpath` switch of the *vbc.exe* compiler. |
6464
| GenerateDocumentation | (C#, Visual Basic) A boolean parameter that indicates whether documentation is generated by the build. If `true`, the build generates documentation information and puts it in an *.xml* file together with the name of the executable file or library that the build task created. |
65+
| GenerateFullPaths | (C#) Generate full paths for filenames in output by using the [-fullpaths](/dotnet/csharp/language-reference/compiler-options/fullpaths-compiler-option) compiler option. |
6566
| GenerateSerializationAssemblies | Indicates whether XML serialization assemblies should be generated by *SGen.exe*, which can be set to on, auto, or off. This property is used for assemblies that target .NET Framework only. To generate XML serialization assemblies for .NET Standard or .NET Core assemblies, reference the *Microsoft.XmlSerializer.Generator* NuGet package. |
6667
| IntermediateOutputPath | The full intermediate output path as derived from `BaseIntermediateOutputPath`, if no path is specified. For example, *\obj\debug\\*. |
6768
| KeyContainerName | The name of the strong-name key container. |

docs/msbuild/copy-task.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The following table describes the parameters of the `Copy` task.
3030

3131
|Parameter|Description|
3232
|---------------|-----------------|
33-
|`CopiedFiles`|Optional <xref:Microsoft.Build.Framework.ITaskItem>`[]` output parameter.<br /><br /> Contains the items that were successfully copied.|
33+
|`CopiedFiles`|Optional <xref:Microsoft.Build.Framework.ITaskItem>`[]` output parameter.<br /><br /> Contains the items that were successfully copied, *including* those that were not actually copied, but were skipped because they were already up-to-date and `SkipUnchangedFiles` was `true`.|
3434
|`DestinationFiles`|Optional <xref:Microsoft.Build.Framework.ITaskItem>`[]` parameter.<br /><br /> Specifies the list of files to copy the source files to. This list is expected to be a one-to-one mapping with the list specified in the `SourceFiles` parameter. That is, the first file specified in `SourceFiles` will be copied to the first location specified in `DestinationFiles`, and so forth.|
3535
|`DestinationFolder`|Optional <xref:Microsoft.Build.Framework.ITaskItem> parameter.<br /><br /> Specifies the directory to which you want to copy the files. This must be a directory, not a file. If the directory does not exist, it is created automatically.|
3636
|`OverwriteReadOnlyFiles`|Optional `Boolean` parameter.<br /><br /> Overwrite files even if they are marked as read only files|

docs/msbuild/delete-task.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ The following table describes the parameters of the `Delete` task.
3434
## Remarks
3535
In addition to the parameters listed above, this task inherits parameters from the <xref:Microsoft.Build.Tasks.TaskExtension> class, which itself inherits from the <xref:Microsoft.Build.Utilities.Task> class. For a list of these additional parameters and their descriptions, see [TaskExtension base class](../msbuild/taskextension-base-class.md).
3636

37+
> [!WARNING]
38+
> Be careful when you use wildcards with the `Delete` task. You can easily delete the wrong files with expressions like `$(SomeProperty)\**\*.*` or `$(SomeProperty)/**/*.*`, especially if the property evaluates to an empty string, in which case the `Files` parameter can evaluate to the root of your drive and delete much more than you wanted to delete.
39+
3740
## Example
3841
The following example deletes the file *MyApp.pdb*.
3942

0 commit comments

Comments
 (0)