Skip to content

Commit b44778f

Browse files
authored
Merge pull request #3912 from MicrosoftDocs/master637038398118798027
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 81f8653 + b60a00a commit b44778f

13 files changed

+58
-36
lines changed

docs/ide/step-11-run-your-program-and-try-other-features.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: "Step 11: Run your app and try other features"
3-
ms.date: 08/30/2019
2+
title: "Step 11: Run your picture viewer app and try other features"
3+
ms.date: 09/11/2019
44
ms.assetid: 656614d0-4fe7-4a67-8edc-c10919377d09
55
ms.topic: tutorial
66
ms.prod: visual-studio-windows
@@ -14,9 +14,9 @@ manager: jillfra
1414
ms.workload:
1515
- "multiple"
1616
---
17-
# Step 11: Run your app and try other features
17+
# Step 11: Run your picture viewer app and try other features
1818

19-
Your app is finished and ready to run. You can run your app and set the background color of the <xref:System.Windows.Forms.PictureBox>. To learn more, try to improve the application by changing the color of the form, customizing the buttons and check box, and changing the properties of the form.
19+
Your picture viewer app is finished and ready to run. You can run your app and set the background color of the <xref:System.Windows.Forms.PictureBox>. To learn more, try to improve the application by changing the color of the form, customizing the buttons and check box, and changing the properties of the form.
2020

2121
## How to run your app and set the background color
2222

docs/ide/step-3-set-your-form-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Next, you use the **Properties** window to change the way your form looks.
7171

7272
* To go to the next tutorial step, see **[Step 4: Lay out your form with a TableLayoutPanel control](../ide/step-4-lay-out-your-form-with-a-tablelayoutpanel-control.md)**.
7373

74-
* To return to the previous tutorial step, see [Step 2: Run your picture viewer app(../ide/step-2-run-your-program.md).
74+
* To return to the previous tutorial step, see [Step 2: Run your picture viewer app](../ide/step-2-run-your-program.md).
7575

7676
## See also
7777

docs/ide/step-5-add-controls-to-your-form.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ In this step, you add controls, such as a <xref:System.Windows.Forms.PictureBox>
7979

8080
## To continue or review
8181

82-
* To go to the next tutorial step, see [Step 6: Name your button controls](../ide/step-6-name-your-button-controls.md).
82+
* To go to the next tutorial step, see **[Step 6: Name your button controls](../ide/step-6-name-your-button-controls.md)**.
8383

8484
* To return to the previous tutorial step, see [Step 4: Lay out your form with a TableLayoutPanel control](../ide/step-4-lay-out-your-form-with-a-tablelayoutpanel-control.md).
8585

docs/ide/tutorial-1-create-a-picture-viewer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ When you finish, your app should look similar to the following image:
4545

4646
|Title|Description|
4747
|-----------|-----------------|
48-
|[Step 1: Create a Windows Forms application project](../ide/step-1-create-a-windows-forms-application-project.md)|Begin by creating a Windows Forms App project.|
48+
|[Step 1: Create a Windows Forms App project](../ide/step-1-create-a-windows-forms-application-project.md)|Begin by creating a Windows Forms App project.|
4949
|[Step 2: Run your picture viewer app](../ide/step-2-run-your-program.md)|Run the Windows Forms App project that you created in the previous step.|
5050
|[Step 3: Set your form properties](../ide/step-3-set-your-form-properties.md)|Change the way your form looks using the **Properties** window.|
5151
|[Step 4: Lay out your form with a TableLayoutPanel control](../ide/step-4-lay-out-your-form-with-a-tablelayoutpanel-control.md)|Add a `TableLayoutPanel` control to your form.|

docs/install/troubleshooting-installation-issues.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ ms.technology: vs-installation
2323
2424
This troubleshooting guide includes step-by-step instructions that should resolve most installation issues.
2525

26-
## Troubleshoot an online installation
26+
## Online installations
2727

28-
The following steps are optimized for a typical online installation. For an issue that affects an offline installation, please see [How to troubleshoot an offline installation](#troubleshoot-an-offline-installation).
28+
The following steps are optimized for a typical online installation. For an issue that affects an offline installation, please see [How to troubleshoot an offline installation](#offline-installations).
2929

3030
### Step 1 - Check whether this problem is a known issue
3131

@@ -76,7 +76,7 @@ In some situations, such as those related to corrupted files, the problems might
7676

7777
::: moniker range="vs-2017"
7878

79-
1. Collect your setup logs. See [How to get the Visual Studio installation logs](#get-installation-logs) for details.
79+
1. Collect your setup logs. See [How to get the Visual Studio installation logs](#installation-logs) for details.
8080
2. Open the Visual Studio Installer, and then click **Report a problem** to open the Visual Studio Feedback tool.
8181
![You can tab to the Provide Feedback button to open the feedback tool](media/report-a-problem.png)
8282
3. Give your problem report a title, and provide relevant details. Click **Next** to go to the **Attachments** section, and then attach the generated log file (typically, the file is at `%TEMP%\vslogs.zip`).
@@ -86,7 +86,7 @@ In some situations, such as those related to corrupted files, the problems might
8686

8787
::: moniker range="vs-2019"
8888

89-
1. Collect your setup logs. See [How to get the Visual Studio installation logs](#get-installation-logs) for details.
89+
1. Collect your setup logs. See [How to get the Visual Studio installation logs](#installation-logs) for details.
9090
2. Open the Visual Studio Installer, and then click **Report a problem** to open the Visual Studio Feedback tool.
9191
![You can tab to the Provide Feedback button to open the feedback tool](media/vs-2019/vs-installer-report-problem.png)
9292
3. Give your problem report a title, and provide relevant details. Click **Next** to go to the **Attachments** section, and then attach the generated log file (typically, the file is at `%TEMP%\vslogs.zip`).
@@ -106,7 +106,7 @@ As a last resort, you can [remove Visual Studio](remove-visual-studio.md) to rem
106106

107107
If none of the previous steps help you successfully install or upgrade Visual Studio, contact us by using our [**live chat**](https://visualstudio.microsoft.com/vs/support/#talktous) support option (English only) for further assistance.
108108

109-
## Troubleshoot an offline installation
109+
## Offline installations
110110

111111
Here is a table of known issues and some workarounds that might help you when you install from a local layout.
112112

@@ -115,7 +115,7 @@ Here is a table of known issues and some workarounds that might help you when yo
115115
| Users do not have access to files. | permissions (ACLs) | Make sure that you adjust the permissions (ACLs) so that they grant Read access to other users *before* you share the offline install. |
116116
| New workloads, components, or languages fail to install. | `--layout` | Make sure that you have internet access if you install from a partial layout and select workloads, components, or languages that were not downloaded previously in that partial layout. |
117117

118-
## Get installation logs
118+
## Installation logs
119119

120120
Setup logs are needed to troubleshoot most installation issues. When you submit an issue by using [Report a Problem](../ide/how-to-report-a-problem-with-visual-studio.md) in the Visual Studio Installer, these logs are automatically included in your report.
121121

@@ -131,7 +131,7 @@ To collect the logs:
131131
> [!NOTE]
132132
> The tool must be run under the same user account that the failed installation was run under. If you are running the tool from a different user account, set the `–user:<name>` option to specify the user account under which the failed installation was run. Run `Collect.exe -?` from an administrator command prompt for additional options and usage information.
133133
134-
## Get live help
134+
## Live help
135135

136136
If the solutions listed in this troubleshooting guide do not help you to successfully install or upgrade Visual Studio, use our [**live chat**](https://visualstudio.microsoft.com/vs/support/#talktous) support option (English only) for further assistance.
137137

docs/install/use-command-line-parameters-to-install-visual-studio.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Use command-line parameters to install Visual Studio"
33
titleSuffix: ""
44
description: "Learn how to use command-line parameters to control or customize your Visual Studio installation."
5-
ms.date: 04/26/2019
5+
ms.date: 09/11/2019
66
ms.custom: "seodec18"
77
ms.topic: conceptual
88
f1_keywords:
@@ -50,7 +50,7 @@ The command-line options are used in conjunction with the setup bootstrapper, wh
5050

5151
> Syntax: `vs_enterprise.exe [command] <options>...`
5252
53-
(Replace `vs_enterprise.exe` as appropriate for the product edition you're installing.)
53+
Replace `vs_enterprise.exe` as appropriate for the product edition you're installing. (Alternatively, you can use `vs_installer.exe`.)
5454

5555
>[!TIP]
5656
> For more examples of how to use the command line to install Visual Studio, see the [Command-line parameter examples](command-line-parameter-examples.md) page.

docs/msbuild/how-to-extend-the-visual-studio-build-process.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@ ms.workload:
1818
# How to: Extend the Visual Studio build process
1919
The [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] build process is defined by a series of [!INCLUDE[vstecmsbuild](../extensibility/internals/includes/vstecmsbuild_md.md)] *.targets* files that are imported into your project file. One of these imported files, *Microsoft.Common.targets*, can be extended to allow you to run custom tasks at several points in the build process. This article explains two methods you can use to extend the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] build process:
2020

21-
- Overriding specific predefined targets defined in *Microsoft.Common.targets*.
21+
- Overriding specific predefined targets defined in the common targets (*Microsoft.Common.targets* or the files that it imports).
2222

23-
- Overriding the "DependsOn" properties defined in *Microsoft.Common.targets*.
23+
- Overriding the "DependsOn" properties defined in the common targets.
2424

2525
## Override predefined targets
26-
The *Microsoft.Common.targets* file contains a set of predefined empty targets that is called before and after some of the major targets in the build process. For example, [!INCLUDE[vstecmsbuild](../extensibility/internals/includes/vstecmsbuild_md.md)] calls the `BeforeBuild` target before the main `CoreBuild` target and the `AfterBuild` target after the `CoreBuild` target. By default, the empty targets in *Microsoft.Common.targets* do nothing, but you can override their default behavior by defining the targets you want in a project file that imports *Microsoft.Common.targets*. By overriding the predefined targets, you can use [!INCLUDE[vstecmsbuild](../extensibility/internals/includes/vstecmsbuild_md.md)] tasks to give you more control over the build process.
26+
The common targets contains a set of predefined empty targets that is called before and after some of the major targets in the build process. For example, [!INCLUDE[vstecmsbuild](../extensibility/internals/includes/vstecmsbuild_md.md)] calls the `BeforeBuild` target before the main `CoreBuild` target and the `AfterBuild` target after the `CoreBuild` target. By default, the empty targets in the common targets do nothing, but you can override their default behavior by defining the targets you want in a project file that imports the common targets. By overriding the predefined targets, you can use [!INCLUDE[vstecmsbuild](../extensibility/internals/includes/vstecmsbuild_md.md)] tasks to give you more control over the build process.
27+
28+
> [!NOTE]
29+
> SDK-style projects have an implicit import of targets *after the last line of the project file*. This means that you cannot override default targets unless you specify your imports manually as described in [How to: Use MSBuild project SDKs](how-to-use-project-sdk.md).
2730
2831
#### To override a predefined target
2932

30-
1. Identify a predefined target in *Microsoft.Common.targets* that you want to override. See the table below for the complete list of targets that you can safely override.
33+
1. Identify a predefined target in the common targets that you want to override. See the table below for the complete list of targets that you can safely override.
3134

3235
2. Define the target or targets at the end of your project file, immediately before the `</Project>` tag. For example:
3336

@@ -45,7 +48,7 @@ The *Microsoft.Common.targets* file contains a set of predefined empty targets t
4548

4649
3. Build the project file.
4750

48-
The following table shows all of the targets in *Microsoft.Common.targets* that you can safely override.
51+
The following table shows all of the targets in the common targets that you can safely override.
4952

5053
|Target name|Description|
5154
|-----------------|-----------------|
@@ -60,7 +63,7 @@ The following table shows all of the targets in *Microsoft.Common.targets* that
6063
## Override DependsOn properties
6164
Overriding predefined targets is an easy way to extend the build process, but, because [!INCLUDE[vstecmsbuild](../extensibility/internals/includes/vstecmsbuild_md.md)] evaluates the definition of targets sequentially, there is no way to prevent another project that imports your project from overriding the targets you already have overridden. So, for example, the last `AfterBuild` target defined in the project file, after all other projects have been imported, will be the one that is used during the build.
6265

63-
You can guard against unintended overrides of targets by overriding the DependsOn properties that are used in `DependsOnTargets` attributes throughout the *Microsoft.Common.targets* file. For example, the `Build` target contains a `DependsOnTargets` attribute value of `"$(BuildDependsOn)"`. Consider:
66+
You can guard against unintended overrides of targets by overriding the DependsOn properties that are used in `DependsOnTargets` attributes throughout the common targets. For example, the `Build` target contains a `DependsOnTargets` attribute value of `"$(BuildDependsOn)"`. Consider:
6467

6568
```xml
6669
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)"/>
@@ -101,7 +104,7 @@ Projects that import your project files can override these properties without ov
101104

102105
#### To override a DependsOn property
103106

104-
1. Identify a predefined DependsOn property in *Microsoft.Common.targets* that you want to override. See the table below for a list of the commonly overridden DependsOn properties.
107+
1. Identify a predefined DependsOn property in the common targets that you want to override. See the table below for a list of the commonly overridden DependsOn properties.
105108

106109
2. Define another instance of the property or properties at the end of your project file. Include the original property, for example `$(BuildDependsOn)`, in the new property.
107110

docs/msbuild/msbuild-target-framework-and-target-platform.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ The target framework is specified in the `TargetFrameworkVersion` property in th
5252

5353
A *target profile* is a subset of a target framework. For example, the .NET Framework 4 Client profile does not include references to the MSBuild assemblies.
5454

55-
The target profile is specified in the `TargetFrameworkProfile` property in a project file. You can change the target profile by using the target-framework control in the project property pages in the IDE. For more information, see [How to: Target a version of the .NET Framework](../ide/how-to-target-a-version-of-the-dotnet-framework.md).
55+
> [!NOTE]
56+
> Target profiles apply only to [portable class libraries](/dotnet/standard/cross-platform/cross-platform-development-with-the-portable-class-library).
57+
58+
The target profile is specified in the `TargetFrameworkProfile` property in a project file. You can change the target profile by using the target-framework control in the project property pages in the IDE.
5659

5760
```xml
5861
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

docs/msbuild/visual-studio-integration-msbuild.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Condition=" '$(Something)|$(Configuration)|$(SomethingElse)' == 'xxx|Debug|yyy'
170170
The project system calls a target with the well-known name `ResolveNativeReferences`. This target should produce items with the item type name `NativeReferenceFile`. The items should have all the metadata from the input items passed through, in addition to a new piece of metadata named `OriginalItemSpec`, containing the original item specification of the reference.
171171

172172
## Performance shortcuts
173-
If you start debugging in the Visual Studio UI (either by choosing the F5 key or by choosing **Debug** > **Start Debugging** on the menu bar), the build process uses a fast update check to improve performance. In some cases where customized builds create files that get built in turn, the fast update check does not correctly identify the changed files. Projects that need more thorough update checks can turn off the fast checking by setting the environment variable `DISABLEFASTUPTODATECHECK=1`. Alternatively, projects can set this as an MSBuild property in the project or in a file the project imports.
173+
If you use the Visual Studio IDE to start debugging (either by choosing the F5 key or by choosing **Debug** > **Start Debugging** on the menu bar) or to build your project (for example, **Build** > **Build Solution**), the build process uses a fast update check to improve performance. In some cases where customized builds create files that get built in turn, the fast update check does not correctly identify the changed files. Projects that need more thorough update checks can turn off the fast checking by setting the environment variable `DISABLEFASTUPTODATECHECK=1`. Alternatively, projects can set this as an MSBuild property in the project or in a file the project imports.
174174

175175
For regular builds in Visual Studio, the fast update check doesn't apply, and the project will build as if you invoked the build at a command prompt.
176176

docs/msbuild/what-s-new-in-msbuild-15-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.author: mikejo
88
manager: jillfra
99
ms.workload:
1010
- "multiple"
11-
monikerRange: "vs-2017"
11+
monikerRange: ">=vs-2017"
1212
---
1313
# What's new in MSBuild 15
1414

Loading
Loading

0 commit comments

Comments
 (0)